diff --git a/kde/src/AccountListModel.cpp b/kde/src/AccountListModel.cpp
index 7d3a74c0ba07ff56932855103573031ad8dba351..12f1d06e835d15dfdbeda73973d97c1e3f1146a8 100755
--- a/kde/src/AccountListModel.cpp
+++ b/kde/src/AccountListModel.cpp
@@ -18,11 +18,18 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
**************************************************************************/
+
+//Parent
#include "AccountListModel.h"
+//SFLPhone library
#include "lib/sflphone_const.h"
+
+//SFLPhone
#include "conf/ConfigAccountList.h"
-#include <QDebug>
+
+//Qt
+#include <QtCore/QDebug>
///Constructor
AccountListModel::AccountListModel(QObject *parent)
diff --git a/kde/src/AccountView.cpp b/kde/src/AccountView.cpp
index d34177925551f954331cce4ed59ed3f033f735c0..5e7970143bb0173e98f083378c3bfacc87f00cd8 100644
--- a/kde/src/AccountView.cpp
+++ b/kde/src/AccountView.cpp
@@ -1,7 +1,32 @@
+/***************************************************************************
+ * Copyright (C) 2009-2010 by Savoir-Faire Linux *
+ * Author : Emmanuel Lepage Valle <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 "AccountView.h"
-#include <QDebug>
+
+//Qt
+#include <QtCore/QDebug>
#include <QtGui/QListWidgetItem>
+
+//SFLPhone library
#include "lib/sflphone_const.h"
#include "lib/configurationmanager_interface_singleton.h"
diff --git a/kde/src/AccountView.h b/kde/src/AccountView.h
index c0d46c64de7852b1b9ca58e11b8e26c938fdb0f8..bb0e9a0fdf8b7fe7d0f506b90495ab160264c099 100644
--- a/kde/src/AccountView.h
+++ b/kde/src/AccountView.h
@@ -1,3 +1,22 @@
+/***************************************************************************
+ * Copyright (C) 2009-2010 by Savoir-Faire Linux *
+ * Author : Emmanuel Lepage Valle <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 ACCOUNT_VIEW_H
#define ACCOUNT_VIEW_H
diff --git a/kde/src/ActionSetAccountFirst.cpp b/kde/src/ActionSetAccountFirst.cpp
index dc57a71e10964355e20ceb395ff09689355dc996..bebea980599896576fc574de160a200678dc7119 100755
--- a/kde/src/ActionSetAccountFirst.cpp
+++ b/kde/src/ActionSetAccountFirst.cpp
@@ -18,9 +18,12 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
-
+
+//Parent
#include "ActionSetAccountFirst.h"
-#include <klocale.h>
+
+//KDE
+#include <KLocale>
///Constrctor
ActionSetAccountFirst::ActionSetAccountFirst(Account* account, QObject *parent)
diff --git a/kde/src/AkonadiBackend.cpp b/kde/src/AkonadiBackend.cpp
index c0573663b28b1f4b2dbcb85fe06ef7e4a61bc9ea..3935cd68071b9ff3c3c78ef2b9c0946e5a53097b 100644
--- a/kde/src/AkonadiBackend.cpp
+++ b/kde/src/AkonadiBackend.cpp
@@ -1,23 +1,50 @@
+/***************************************************************************
+ * Copyright (C) 2009-2010 by Savoir-Faire Linux *
+ * Author : Emmanuel Lepage Valle <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 "AkonadiBackend.h"
+
+//Qt
#include <QtCore/QTimer>
+#include <QtCore/QObject>
+
+//KDE
+#include <kdialog.h>
#include <akonadi/control.h>
#include <akonadi/collectionfilterproxymodel.h>
#include <akonadi/kmime/messagemodel.h>
-#include <kabc/contactgroup.h>
-#include <kabc/phonenumber.h>
#include <akonadi/recursiveitemfetchjob.h>
#include <akonadi/itemfetchscope.h>
#include <akonadi/collectionfetchjob.h>
#include <akonadi/collectionfetchscope.h>
#include <akonadi/contact/contacteditor.h>
-#include <kdialog.h>
-
-#include <QObject>
#include <akonadi/session.h>
#include <kabc/addressee.h>
#include <kabc/addresseelist.h>
+#include <kabc/contactgroup.h>
+#include <kabc/phonenumber.h>
+//SFLPhone library
#include "lib/Contact.h"
+
+//SFLPhone
#include "SFLPhone.h"
#include "SFLPhoneView.h"
diff --git a/kde/src/AkonadiBackend.h b/kde/src/AkonadiBackend.h
index fdc97e6305c1603608f0002bde74d953c3a4bac3..b016a993c757fcfd4c7a2ad4cef1c32b7a5afe53 100644
--- a/kde/src/AkonadiBackend.h
+++ b/kde/src/AkonadiBackend.h
@@ -1,6 +1,25 @@
#ifndef AKONADI_BACKEND_H
#define AKONADI_BACKEND_H
+/***************************************************************************
+ * Copyright (C) 2009-2010 by Savoir-Faire Linux *
+ * Author : Emmanuel Lepage Valle <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. *
+ **************************************************************************/
#include <lib/ContactBackend.h>
#include <akonadi/collectionmodel.h>
diff --git a/kde/src/CallView.cpp b/kde/src/CallView.cpp
index 1162520b1f24433dc77c40e87358eb35dc2aae30..db183dc5549877542a90626c2ce813cf028e0a40 100644
--- a/kde/src/CallView.cpp
+++ b/kde/src/CallView.cpp
@@ -1,16 +1,43 @@
+/***************************************************************************
+ * Copyright (C) 2009-2010 by Savoir-Faire Linux *
+ * Author : Emmanuel Lepage Valle <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 "CallView.h"
-#include "AkonadiBackend.h"
+
+//Qt
+#include <QtGui/QInputDialog>
+#include <QtGui/QTreeWidget>
+#include <QtGui/QTreeWidgetItem>
+
+
+//SFLPhone library
#include "lib/Contact.h"
#include "lib/sflphone_const.h"
#include "lib/callmanager_interface_singleton.h"
-#include "widgets/CallTreeItem.h"
+//SFLPhone
+#include "widgets/CallTreeItem.h"
#include "SFLPhone.h"
#include "SFLPhoneView.h"
+#include "AkonadiBackend.h"
-#include <QtGui/QInputDialog>
-#include <QtGui/QTreeWidget>
-#include <QtGui/QTreeWidgetItem>
///Retrieve current and older calls from the daemon, fill history and the calls TreeView and enable drag n' drop
CallView::CallView(QWidget* parent) : QTreeWidget(parent)
diff --git a/kde/src/CallView.h b/kde/src/CallView.h
index f2fb282935953d19d0453c2115886f15327dfbb7..228ba09abae08243d4e343b02e8f401977ea454b 100644
--- a/kde/src/CallView.h
+++ b/kde/src/CallView.h
@@ -1,5 +1,24 @@
#ifndef CALL_VIEW
#define CALL_VIEW
+/***************************************************************************
+ * Copyright (C) 2009-2010 by Savoir-Faire Linux *
+ * Author : Emmanuel Lepage Valle <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. *
+ **************************************************************************/
#include <QtGui/QItemDelegate>
#include <QtGui/QTreeWidget>
diff --git a/kde/src/Codec.cpp b/kde/src/Codec.cpp
index c736aa52c00435ed32db89317b731326e6a71a71..b9cc5e62b879b1604e836bafdcdeb9f73c449568 100755
--- a/kde/src/Codec.cpp
+++ b/kde/src/Codec.cpp
@@ -18,9 +18,14 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
**************************************************************************/
+
+//Parent
#include "Codec.h"
+//Qt
#include <QtCore/QString>
+
+//SFLPhone library
#include "lib/configurationmanager_interface_singleton.h"
#include "lib/sflphone_const.h"
diff --git a/kde/src/SFLPhone.cpp b/kde/src/SFLPhone.cpp
index 2e1134a05929bd9f3ea874b984205f042c0e0500..3fb6a4830328ac4572762611e485cbef5a05c5bf 100755
--- a/kde/src/SFLPhone.cpp
+++ b/kde/src/SFLPhone.cpp
@@ -18,33 +18,42 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
**************************************************************************/
-#include <unistd.h>
+
+//Parent
#include "SFLPhone.h"
+//System
#include <unistd.h>
+
+//Qt
+#include <QtCore/QString>
+#include <QtGui/QActionGroup>
+#include <QtGui/QLabel>
+#include <QtGui/QCursor>
+
+//KDE
#include <KStandardAction>
#include <KAction>
#include <KStatusBar>
-#include <QtGui/QCursor>
#include <KActionCollection>
-#include <QtCore/QString>
#include <KNotification>
-#include <QActionGroup>
-#include <QLabel>
-#include <kshortcutsdialog.h>
+#include <KShortcutsDialog>
+//SFLPhone library
#include "lib/sflphone_const.h"
#include "lib/instance_interface_singleton.h"
#include "lib/configurationmanager_interface_singleton.h"
#include "lib/Contact.h"
+
+//SFLPhone
#include "AkonadiBackend.h"
-#include "conf/ConfigurationSkeleton.h"
-#include "widgets/ContactDock.h"
#include "AccountWizard.h"
-#include "widgets/HistoryDock.h"
-#include "widgets/BookmarkDock.h"
#include "SFLPhoneView.h"
#include "widgets/SFLPhoneTray.h"
+#include "widgets/ContactDock.h"
+#include "widgets/HistoryDock.h"
+#include "widgets/BookmarkDock.h"
+#include "conf/ConfigurationSkeleton.h"
SFLPhone* SFLPhone::m_sApp = NULL;
TreeWidgetCallModel* SFLPhone::m_pModel = NULL;
diff --git a/kde/src/SFLPhoneView.cpp b/kde/src/SFLPhoneView.cpp
index 8569449006ec5e3fd1cd69461e33c830692e8efa..4f1a26058b1041cb7bcb377b5dcac03da11ffb16 100755
--- a/kde/src/SFLPhoneView.cpp
+++ b/kde/src/SFLPhoneView.cpp
@@ -19,35 +19,36 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
**************************************************************************/
+//Parent
#include "SFLPhoneView.h"
+//Qt
+#include <QtCore/QString>
#include <QtGui/QContextMenuEvent>
#include <QtGui/QPalette>
#include <QtGui/QInputDialog>
#include <QtGui/QWidget>
-#include <QtCore/QString>
#include <QErrorMessage>
-#include "conf/ConfigurationDialog.h"
-#include "AccountWizard.h"
-
-#include <klocale.h>
-#include <kaction.h>
-#include <kmenu.h>
-
+//KDE
+#include <KLocale>
+#include <KAction>
+#include <KMenu>
#include <kabc/addressbook.h>
-#include "lib/sflphone_const.h"
+//SFLPhone
+#include "conf/ConfigurationDialog.h"
#include "conf/ConfigurationSkeleton.h"
-#include "lib/configurationmanager_interface_singleton.h"
-#include "lib/callmanager_interface_singleton.h"
-#include "lib/instance_interface_singleton.h"
+#include "AccountWizard.h"
#include "ActionSetAccountFirst.h"
#include "SFLPhone.h"
-#include "lib/typedefs.h"
-
-using namespace KABC;
+//SFLPhone library
+#include "lib/typedefs.h"
+#include "lib/configurationmanager_interface_singleton.h"
+#include "lib/callmanager_interface_singleton.h"
+#include "lib/instance_interface_singleton.h"
+#include "lib/sflphone_const.h"
//ConfigurationDialog* SFLPhoneView::configDialog;
@@ -353,15 +354,15 @@ int SFLPhoneView::phoneNumberTypesDisplayed()
MapStringInt addressBookSettings = configurationManager.getAddressbookSettings().value();
int typesDisplayed = 0;
if(addressBookSettings[ADDRESSBOOK_DISPLAY_BUSINESS]) {
- typesDisplayed = typesDisplayed | PhoneNumber::Work;
+ typesDisplayed = typesDisplayed | KABC::PhoneNumber::Work;
}
if(addressBookSettings[ADDRESSBOOK_DISPLAY_MOBILE]) {
- typesDisplayed = typesDisplayed | PhoneNumber::Cell;
+ typesDisplayed = typesDisplayed | KABC::PhoneNumber::Cell;
}
if(addressBookSettings[ADDRESSBOOK_DISPLAY_HOME]) {
- typesDisplayed = typesDisplayed | PhoneNumber::Home;
+ typesDisplayed = typesDisplayed | KABC::PhoneNumber::Home;
}
return typesDisplayed;
diff --git a/kde/src/SFLPhoneapplication.cpp b/kde/src/SFLPhoneapplication.cpp
index d6e156e1dd355e68ac95923c4c7dc9882d36a925..57c8ef7846cfd57b4240ea6e22ae3a8cee466690 100755
--- a/kde/src/SFLPhoneapplication.cpp
+++ b/kde/src/SFLPhoneapplication.cpp
@@ -1,15 +1,40 @@
+/***************************************************************************
+ * Copyright (C) 2009-2010 by Savoir-Faire Linux *
+ * Author : Emmanuel Lepage Valle <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 "SFLPhoneapplication.h"
-
+//KDE
#include <KCmdLineArgs>
#include <KIconLoader>
#include <KStandardDirs>
#include <KNotification>
#include <KSystemTrayIcon>
#include <KMainWindow>
+
+//SFLPhone library
#include "lib/instance_interface_singleton.h"
#include "lib/configurationmanager_interface_singleton.h"
#include "lib/callmanager_interface_singleton.h"
+
+//SFLPhone
#include "SFLPhone.h"
diff --git a/kde/src/lib/Account.cpp b/kde/src/lib/Account.cpp
index 913811145dfee08522ee522c39419ed3611d706d..449ea381fec539095ddd550a83594453918ce332 100644
--- a/kde/src/lib/Account.cpp
+++ b/kde/src/lib/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/kde/src/lib/AccountList.cpp b/kde/src/lib/AccountList.cpp
index be54288e7e3948e8209b2a5416f04acef6b7da52..e97a34c6e95cd71d8502bd80e26df318d611936f 100644
--- a/kde/src/lib/AccountList.cpp
+++ b/kde/src/lib/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/kde/src/lib/Call.cpp b/kde/src/lib/Call.cpp
index eaf51ffdfd44883bfef395d40cec3dabf0e3fb5a..3e3e8dd3744769e3e1257b7712672a6278785940 100644
--- a/kde/src/lib/Call.cpp
+++ b/kde/src/lib/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/kde/src/lib/CallModel.cpp b/kde/src/lib/CallModel.cpp
index 39c87e3395e206d2b07105d980a0c5ab3cdfbd37..61e057ac52696c43971ce45c0a78ccd60d6040f5 100644
--- a/kde/src/lib/CallModel.cpp
+++ b/kde/src/lib/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/kde/src/lib/CallModel.hpp b/kde/src/lib/CallModel.hpp
index 352b2b46e8900eee16363b306f9d2c63ffef340d..973c8dac9707290d95f92a5f579369baa7699cba 100644
--- a/kde/src/lib/CallModel.hpp
+++ b/kde/src/lib/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/kde/src/lib/Contact.cpp b/kde/src/lib/Contact.cpp
index 774e6dea4ffbdd6ac7dc37d59b387f8dd3154b88..5764a94632373c2197f9b8cc972de9d201821605 100644
--- a/kde/src/lib/Contact.cpp
+++ b/kde/src/lib/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/kde/src/lib/ContactBackend.cpp b/kde/src/lib/ContactBackend.cpp
index f95c0284ea31cc1d7b034d66b2d650430af615df..cedbd31dc4bb17c41cbc183288371e1eef24db1d 100644
--- a/kde/src/lib/ContactBackend.cpp
+++ b/kde/src/lib/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/kde/src/lib/ContactBackend.h b/kde/src/lib/ContactBackend.h
index 1a3cc57a0c92c5f950b4d929d1117262c779ddb4..a4a1180676a667fb61a653c1dd4a2794f4cb9844 100644
--- a/kde/src/lib/ContactBackend.h
+++ b/kde/src/lib/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/kde/src/lib/Item.cpp b/kde/src/lib/Item.cpp
index 7f2b2a40a87872591c03ee333d5f8744297eba2e..4875cf965897763c6970666b7dc4886982abc13a 100644
--- a/kde/src/lib/Item.cpp
+++ b/kde/src/lib/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>
diff --git a/kde/src/widgets/AccountItemWidget.cpp b/kde/src/widgets/AccountItemWidget.cpp
index 1d5af8408d793f11203234945327a02710312757..9da618766d087704098d1d8d1029344a719c774a 100755
--- a/kde/src/widgets/AccountItemWidget.cpp
+++ b/kde/src/widgets/AccountItemWidget.cpp
@@ -18,12 +18,15 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
**************************************************************************/
-
+
+//Parent
#include "AccountItemWidget.h"
+//Qt
#include <QtGui/QHBoxLayout>
-#include <QDebug>
+#include <QtCore/QDebug>
+//SFLPhone library
#include "lib/sflphone_const.h"
///Constructor
diff --git a/kde/src/widgets/BookmarkDock.cpp b/kde/src/widgets/BookmarkDock.cpp
index 10ec7b023a0457f666b9f57d8a521e706b59c529..0460d3ab31e882a2359cbd8a6ffcd00ccd61d1af 100644
--- a/kde/src/widgets/BookmarkDock.cpp
+++ b/kde/src/widgets/BookmarkDock.cpp
@@ -1,12 +1,38 @@
+/***************************************************************************
+ * Copyright (C) 2009-2010 by Savoir-Faire Linux *
+ * Author : Emmanuel Lepage Valle <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 "BookmarkDock.h"
+//Qt
#include <QtGui/QVBoxLayout>
#include <QtGui/QTreeWidgetItem>
-#include <KLocalizedString>
-#include <kicon.h>
-#include <klineedit.h>
#include <QtGui/QTreeWidget>
#include <QtGui/QSplitter>
+
+//KDE
+#include <KLocalizedString>
+#include <KIcon>
+#include <KLineEdit>
+
+//SFLPhone
#include "conf/ConfigurationSkeleton.h"
#include "widgets/HistoryTreeItem.h"
diff --git a/kde/src/widgets/BookmarkDock.h b/kde/src/widgets/BookmarkDock.h
index 3ed683b4948a2697f80d5ea608477b39fee1763f..77b47a6757253f23df32e5a25db785e5da2ce124 100644
--- a/kde/src/widgets/BookmarkDock.h
+++ b/kde/src/widgets/BookmarkDock.h
@@ -1,3 +1,22 @@
+/***************************************************************************
+ * Copyright (C) 2009-2010 by Savoir-Faire Linux *
+ * Author : Emmanuel Lepage Valle <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 BOOKMARK_DOCK_H
#define BOOKMARK_DOCK_H
diff --git a/kde/src/widgets/CallTreeItem.cpp b/kde/src/widgets/CallTreeItem.cpp
index 3598de053147110b51caadbcde00f938f11813d7..f23174dfe1159ce4e81308900324b31f0bfe4556 100644
--- a/kde/src/widgets/CallTreeItem.cpp
+++ b/kde/src/widgets/CallTreeItem.cpp
@@ -18,24 +18,31 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
**************************************************************************/
-#include <QtCore/QStringList>
-
-#include <klocale.h>
-#include <kdebug.h>
-
-#include "lib/sflphone_const.h"
+//Parent
#include "CallTreeItem.h"
-#include "lib/Contact.h"
-#include "lib/Call.h"
-#include "AkonadiBackend.h"
+//Qt
+#include <QtCore/QStringList>
#include <QtGui/QWidget>
#include <QtGui/QLabel>
#include <QtGui/QSpacerItem>
#include <QtGui/QHBoxLayout>
#include <QtGui/QVBoxLayout>
+
+//KDE
+#include <KLocale>
+#include <KDebug>
#include <KIcon>
+//SFLPhone library
+#include "lib/sflphone_const.h"
+#include "lib/Contact.h"
+#include "lib/Call.h"
+
+//SFLPhone
+#include "AkonadiBackend.h"
+
+
///Constant
const char * CallTreeItem::callStateIcons[12] = {ICON_INCOMING, ICON_RINGING, ICON_CURRENT, ICON_DIALING, ICON_HOLD, ICON_FAILURE, ICON_BUSY, ICON_TRANSFER, ICON_TRANSF_HOLD, "", "", ICON_CONFERENCE};
diff --git a/kde/src/widgets/ContactDock.cpp b/kde/src/widgets/ContactDock.cpp
index 81291d2f9f22bc0a34c6a270db7c63514cac5bdc..ad66089108b0ab1569228c2e247c67f9da133376 100644
--- a/kde/src/widgets/ContactDock.cpp
+++ b/kde/src/widgets/ContactDock.cpp
@@ -1,24 +1,50 @@
-
+/***************************************************************************
+ * Copyright (C) 2009-2010 by Savoir-Faire Linux *
+ * Author : Emmanuel Lepage Valle <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 "ContactDock.h"
+//Qt
+#include <QtCore/QDateTime>
#include <QtGui/QVBoxLayout>
#include <QtGui/QListWidget>
#include <QtGui/QTreeWidget>
#include <QtGui/QHeaderView>
#include <QtGui/QCheckBox>
-#include <QtCore/QDateTime>
-#include <QSplitter>
-#include <klineedit.h>
-#include <KLocalizedString>
+#include <QtGui/QSplitter>
#include <QtGui/QLabel>
-#include <QComboBox>
+#include <QtGui/QComboBox>
-#include <kicon.h>
+//KDE
+#include <KLineEdit>
+#include <KLocalizedString>
+#include <KIcon>
+
+//SFLPhone
#include "AkonadiBackend.h"
#include "ContactItemWidget.h"
+#include "SFLPhone.h"
#include "conf/ConfigurationSkeleton.h"
+
+//SFLPhone library
#include "lib/Call.h"
-#include "SFLPhone.h"
#include "lib/Contact.h"
///@class QNumericTreeWidgetItem_hist TreeWidget using different sorting criterias
diff --git a/kde/src/widgets/ContactDock.h b/kde/src/widgets/ContactDock.h
index dbbfbc3d69aecfafea645b527d5eb928feb4bffd..5eccdf2e4df7a869dd7fe4c4aade6336d476671a 100644
--- a/kde/src/widgets/ContactDock.h
+++ b/kde/src/widgets/ContactDock.h
@@ -1,3 +1,22 @@
+/***************************************************************************
+ * Copyright (C) 2009-2010 by Savoir-Faire Linux *
+ * Author : Emmanuel Lepage Valle <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_DOCK_H
#define CONTACT_DOCK_H
diff --git a/kde/src/widgets/ContactItemWidget.cpp b/kde/src/widgets/ContactItemWidget.cpp
index 17d5d6c53cd45d4036bc37cbc7d3e91e26956e7c..ec05e1909b50670bd445ed2f939d3f3a896abb5f 100644
--- a/kde/src/widgets/ContactItemWidget.cpp
+++ b/kde/src/widgets/ContactItemWidget.cpp
@@ -18,29 +18,36 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
**************************************************************************/
+//Parent
+#include "ContactItemWidget.h"
+
+//Qt
#include <QtCore/QMimeData>
#include <QtGui/QApplication>
#include <QtGui/QClipboard>
#include <QtGui/QGridLayout>
#include <QtGui/QMenu>
-
#include <QtGui/QLabel>
#include <QtGui/QSpacerItem>
-#include <KIcon>
-#include <lib/Contact.h>
+//KDE
+#include <KIcon>
+#include <KLocale>
+#include <KDebug>
+#include <KAction>
-#include <klocale.h>
-#include <kdebug.h>
+//System
#include <unistd.h>
-#include <kaction.h>
-#include "lib/sflphone_const.h"
-#include "ContactItemWidget.h"
+//SFLPhone
#include "AkonadiBackend.h"
#include "widgets/BookmarkDock.h"
#include "SFLPhone.h"
+//SFLPhone library
+#include "lib/Contact.h"
+#include "lib/sflphone_const.h"
+
///Constructor
ContactItemWidget::ContactItemWidget(QWidget *parent)
: QWidget(parent), m_pMenu(0),init(false)
diff --git a/kde/src/widgets/Dialpad.cpp b/kde/src/widgets/Dialpad.cpp
index a23bf72978f38934e6fb58cce81bd46c2835048c..920cfb302c48f7a84adb6f175cdba7c5b2773ecb 100755
--- a/kde/src/widgets/Dialpad.cpp
+++ b/kde/src/widgets/Dialpad.cpp
@@ -18,12 +18,15 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
+
+//Parent
#include "Dialpad.h"
-#include <QLabel>
-#include <QDebug>
-#include <QPushButton>
-#include <QGridLayout>
+//Qt
+#include <QtCore/QDebug>
+#include <QtGui/QLabel>
+#include <QtGui/QPushButton>
+#include <QtGui/QGridLayout>
///Constructor
Dialpad::Dialpad(QWidget *parent)
diff --git a/kde/src/widgets/HistoryDock.cpp b/kde/src/widgets/HistoryDock.cpp
index 7fd7e0f2d730595b8063e94557afe8927e967889..4b5da6b75a3668b17c6a49edb1eb3e55fb0f7a75 100644
--- a/kde/src/widgets/HistoryDock.cpp
+++ b/kde/src/widgets/HistoryDock.cpp
@@ -1,23 +1,51 @@
+/***************************************************************************
+ * Copyright (C) 2009-2010 by Savoir-Faire Linux *
+ * Author : Emmanuel Lepage Valle <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 "HistoryDock.h"
-#include <kicon.h>
-#include <klineedit.h>
+//Qt
+#include <QtCore/QDebug>
+#include <QtCore/QString>
+#include <QtCore/QDate>
#include <QtGui/QTreeWidget>
#include <QtGui/QComboBox>
#include <QtGui/QPushButton>
#include <QtGui/QLabel>
-#include <QDebug>
#include <QtGui/QTreeWidgetItem>
-#include <QtCore/QString>
-#include <kdatewidget.h>
-#include <QHeaderView>
#include <QtGui/QCheckBox>
#include <QtGui/QGridLayout>
-#include <QDate>
+#include <QtGui/QHeaderView>
+
+//KDE
+#include <KIcon>
+#include <KLineEdit>
+#include <KDateWidget>
+
+//SFLPhone
#include "SFLPhone.h"
#include "widgets/HistoryTreeItem.h"
-#include "conf/ConfigurationSkeleton.h"
#include "AkonadiBackend.h"
+#include "conf/ConfigurationSkeleton.h"
+
+//SFLPhone library
#include "lib/sflphone_const.h"
///Qt lack official functional sorting algo, so this hack around it
diff --git a/kde/src/widgets/HistoryDock.h b/kde/src/widgets/HistoryDock.h
index 3348c959b4c9960f82bb9a73e57deafb1a8689bd..f114270e8b83db0b3a87fefbe8d1f803a8ce3a54 100644
--- a/kde/src/widgets/HistoryDock.h
+++ b/kde/src/widgets/HistoryDock.h
@@ -1,3 +1,22 @@
+/***************************************************************************
+ * Copyright (C) 2009-2010 by Savoir-Faire Linux *
+ * Author : Emmanuel Lepage Valle <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 HISTORY_DOCK_H
#define HISTORY_DOCK_H
@@ -13,6 +32,7 @@ class QComboBox;
class QLabel;
class QCheckBox;
class QPushButton;
+class QDate;
//KDE
class KLineEdit;
diff --git a/kde/src/widgets/HistoryTreeItem.cpp b/kde/src/widgets/HistoryTreeItem.cpp
index 12f4b053860d32030718a32e64901210c66ed65b..d53cc9a76a5b0b2ffcc2b24bbafeaf92335d3748 100644
--- a/kde/src/widgets/HistoryTreeItem.cpp
+++ b/kde/src/widgets/HistoryTreeItem.cpp
@@ -18,24 +18,31 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
**************************************************************************/
+//Parent
+#include "HistoryTreeItem.h"
+
+//Qt
#include <QtCore/QStringList>
#include <QtGui/QGridLayout>
#include <QtGui/QMenu>
+#include <QtGui/QLabel>
+#include <QtGui/QSpacerItem>
+//KDE
#include <KLocale>
#include <KDebug>
#include <KAction>
-#include <QtGui/QLabel>
-#include <QtGui/QSpacerItem>
#include <KIcon>
+//SFLPhone library
#include "lib/sflphone_const.h"
-#include "HistoryTreeItem.h"
-#include "AkonadiBackend.h"
#include "lib/Contact.h"
+#include "lib/Call.h"
+
+//SFLPhone
+#include "AkonadiBackend.h"
#include "SFLPhone.h"
#include "widgets/BookmarkDock.h"
-#include "lib/Call.h"
const char * HistoryTreeItem::callStateIcons[12] = {ICON_INCOMING, ICON_RINGING, ICON_CURRENT, ICON_DIALING, ICON_HOLD, ICON_FAILURE, ICON_BUSY, ICON_TRANSFER, ICON_TRANSF_HOLD, "", "", ICON_CONFERENCE};
diff --git a/kde/src/widgets/HistoryTreeItem.h b/kde/src/widgets/HistoryTreeItem.h
index 518e6a8abaac07f89f5c0d5df4fd2344d971372f..7a125f8d0937758f2299c6a163cd14fc8926abc3 100644
--- a/kde/src/widgets/HistoryTreeItem.h
+++ b/kde/src/widgets/HistoryTreeItem.h
@@ -29,9 +29,6 @@
#define HISTORYTREE_ITEM_H
#include <QtGui/QWidget>
-#include <QtCore/QList>
-#include <QtCore/QVariant>
-#include <QtCore/QVector>
//SFLPhone
class Call;
diff --git a/kde/src/widgets/SFLPhoneTray.cpp b/kde/src/widgets/SFLPhoneTray.cpp
index a14cbe51a0d439e7d697ded7b3686cacdc38bb7b..95951fe946fcfe1d6bab549b4c4a2f91019cb36d 100755
--- a/kde/src/widgets/SFLPhoneTray.cpp
+++ b/kde/src/widgets/SFLPhoneTray.cpp
@@ -19,13 +19,17 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
**************************************************************************/
-#include <QDebug>
-#include <KAction>
-#include <QMenu>
-#include <QIcon>
-
+//Parent
#include "SFLPhoneTray.h"
+//Qt
+#include <QtCore/QDebug>
+#include <QtGui/QMenu>
+#include <QtGui/QIcon>
+
+//KDE
+#include <KAction>
+
///Constructor
SFLPhoneTray::SFLPhoneTray(QIcon icon, QWidget *parent)
: KSystemTrayIcon(icon, parent),