From 46ff1e09a230d1ff9a34e1bc1b4d67e52ea027ad Mon Sep 17 00:00:00 2001
From: Emmanuel Lepage <emmanuel.lepage@savoirfairelinux.com>
Date: Mon, 12 Dec 2011 17:20:48 -0500
Subject: [PATCH] [ #7876 ] Sort include by owner, fix license issues
---
src/Account.cpp | 7 ++++++-
src/AccountList.cpp | 6 +++++-
src/Call.cpp | 4 +++-
src/CallModel.cpp | 1 +
src/CallModel.hpp | 34 ++++++++++++++++++++++++++++++----
src/Contact.cpp | 9 +++++----
src/ContactBackend.cpp | 27 ++++++++++++++++++++++++++-
src/ContactBackend.h | 21 +++++++++++++++++++++
src/Item.cpp | 6 +++++-
9 files changed, 102 insertions(+), 13 deletions(-)
diff --git a/src/Account.cpp b/src/Account.cpp
index 91381114..449ea381 100644
--- a/src/Account.cpp
+++ b/src/Account.cpp
@@ -19,12 +19,17 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
+//Parent
#include "Account.h"
-#include <QDebug>
+//Qt
+#include <QtCore/QDebug>
#include <QtCore/QString>
+//SFLPhone
#include "sflphone_const.h"
+
+//SFLPhone lib
#include "configurationmanager_interface_singleton.h"
///Match state name to user readable string
diff --git a/src/AccountList.cpp b/src/AccountList.cpp
index be54288e..e97a34c6 100644
--- a/src/AccountList.cpp
+++ b/src/AccountList.cpp
@@ -19,10 +19,14 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
**************************************************************************/
+//Parent
#include "AccountList.h"
+
+//SFLPhone
#include "sflphone_const.h"
-#include "configurationmanager_interface_singleton.h"
+//SFLPhone library
+#include "configurationmanager_interface_singleton.h"
///Constructors
diff --git a/src/Call.cpp b/src/Call.cpp
index eaf51ffd..3e3e8dd3 100644
--- a/src/Call.cpp
+++ b/src/Call.cpp
@@ -18,10 +18,12 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
**************************************************************************/
+
+//Parent
#include "Call.h"
+//SFLPhone library
#include "CallModel.h"
-
#include "callmanager_interface_singleton.h"
#include "configurationmanager_interface_singleton.h"
#include "ContactBackend.h"
diff --git a/src/CallModel.cpp b/src/CallModel.cpp
index 39c87e33..61e057ac 100644
--- a/src/CallModel.cpp
+++ b/src/CallModel.cpp
@@ -17,6 +17,7 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
**************************************************************************/
+//Parent
#include <CallModel.h>
bool CallModelBase::dbusInit = false;
diff --git a/src/CallModel.hpp b/src/CallModel.hpp
index 352b2b46..973c8dac 100644
--- a/src/CallModel.hpp
+++ b/src/CallModel.hpp
@@ -1,6 +1,30 @@
-#include <QHash>
-#include <QDragEnterEvent>
-#include <QDebug>
+/***************************************************************************
+ * Copyright (C) 2009 by Savoir-Faire Linux *
+ * Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com> *
+ * Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>*
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 3 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, write to the *
+ * Free Software Foundation, Inc., *
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ **************************************************************************/
+
+//Qt
+#include <QtCore/QHash>
+#include <QtCore/QDebug>
+#include <QtGui/QDragEnterEvent>
+
+//SFLPhone library
#include "Call.h"
#include "AccountList.h"
#include "dbus/metatypes.h"
@@ -8,10 +32,12 @@
#include "configurationmanager_interface_singleton.h"
#include "instance_interface_singleton.h"
#include "sflphone_const.h"
-#include "unistd.h"
#include "typedefs.h"
#include "ContactBackend.h"
+//System
+#include "unistd.h"
+
//Static member
template <typename CallWidget, typename Index> QString CallModel<CallWidget,Index>::m_pPriorAccountId = "" ;
template <typename CallWidget, typename Index> AccountList* CallModel<CallWidget,Index>::m_pAccountList = 0 ;
diff --git a/src/Contact.cpp b/src/Contact.cpp
index 774e6dea..5764a946 100644
--- a/src/Contact.cpp
+++ b/src/Contact.cpp
@@ -18,14 +18,15 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
**************************************************************************/
+
+//Parent
#include "Contact.h"
+//Qt
#include <QtCore/QDebug>
-#include <kabc/addressee.h>
-#include <kabc/picture.h>
-#include <kabc/phonenumber.h>
-#include <QPixmap>
+#include <QtGui/QPixmap>
+//SFLPhone library
#include "sflphone_const.h"
///Constructor
diff --git a/src/ContactBackend.cpp b/src/ContactBackend.cpp
index f95c0284..cedbd31d 100644
--- a/src/ContactBackend.cpp
+++ b/src/ContactBackend.cpp
@@ -1,7 +1,32 @@
+/***************************************************************************
+ * Copyright (C) 2009 by Savoir-Faire Linux *
+ * Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com> *
+ * Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>*
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 3 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, write to the *
+ * Free Software Foundation, Inc., *
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ ***************************************************************************/
+
+//Parent
#include "ContactBackend.h"
+//SFLPhone library
#include "Contact.h"
-#include <QHash>
+
+//Qt
+#include <QtCore/QHash>
ContactBackend::ContactBackend(QObject* parent) : QObject(parent)
{
diff --git a/src/ContactBackend.h b/src/ContactBackend.h
index 1a3cc57a..a4a11806 100644
--- a/src/ContactBackend.h
+++ b/src/ContactBackend.h
@@ -1,3 +1,24 @@
+/***************************************************************************
+ * Copyright (C) 2009 by Savoir-Faire Linux *
+ * Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com> *
+ * Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>*
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 3 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, write to the *
+ * Free Software Foundation, Inc., *
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ ***************************************************************************/
+
#ifndef CONTACT_BACKEND_H
#define CONTACT_BACKEND_H
diff --git a/src/Item.cpp b/src/Item.cpp
index 7f2b2a40..4875cf96 100644
--- a/src/Item.cpp
+++ b/src/Item.cpp
@@ -18,6 +18,10 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
+
+//Parent
#include "Item.h"
-#include <QListWidgetItem>
+
+//Qt
+#include <QtGui/QListWidgetItem>
--
GitLab