diff -Nru kopete-4.12.3/debian/changelog kopete-4.12.90/debian/changelog --- kopete-4.12.3/debian/changelog 2014-03-04 19:57:30.000000000 +0000 +++ kopete-4.12.90/debian/changelog 2014-03-19 11:07:50.000000000 +0000 @@ -1,3 +1,9 @@ +kopete (4:4.12.90-0ubuntu1) trusty; urgency=medium + + * New upstream beta release + + -- Jonathan Riddell Wed, 19 Mar 2014 11:07:47 +0000 + kopete (4:4.12.3-0ubuntu1) trusty; urgency=medium * New upstream bugfix release diff -Nru kopete-4.12.3/debian/control kopete-4.12.90/debian/control --- kopete-4.12.3/debian/control 2014-03-04 19:57:30.000000000 +0000 +++ kopete-4.12.90/debian/control 2014-03-19 11:07:50.000000000 +0000 @@ -4,7 +4,7 @@ Maintainer: Kubuntu Developers Build-Depends: kde-sc-dev-latest (>= 4:4.10.2), cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.12), - kdepimlibs5-dev (>= 4:4.12.3), libsqlite3-dev, + kdepimlibs5-dev (>= 4:4.12.90), libsqlite3-dev, libortp-dev, libspeex-dev, libqimageblitz-dev (>= 1:0.0.4), libqca2-dev (>= 2.0.0), libidn11-dev, libxml2-dev, libxslt1-dev, libmsn-dev (>= 4.1), @@ -13,7 +13,7 @@ libmediastreamer-dev, libmeanwhile-dev, libgadu-dev, libjasper-dev, libgif-dev, libotr5-dev, libjsoncpp-dev, libboost1.54-dev, libv4l-dev, libexpat1-dev, libsrtp0-dev, - libasound2-dev, kdepim-dev (>= 4:4.12.3) + libasound2-dev, kdepim-dev (>= 4:4.12.90) Build-Conflicts: libmediastreamer-dev (= 3.3.0-1) [amd64] Standards-Version: 3.9.4 Homepage: http://www.kde.org/ diff -Nru kopete-4.12.3/kopete/chatwindow/chatmemberslistview.cpp kopete-4.12.90/kopete/chatwindow/chatmemberslistview.cpp --- kopete-4.12.3/kopete/chatwindow/chatmemberslistview.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/kopete/chatwindow/chatmemberslistview.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -15,6 +15,8 @@ ************************************************************************* */ +#include "chatmemberslistview.h" + #include #include #include @@ -23,7 +25,6 @@ #include "kdebug.h" #include "kmenu.h" #include "kopetecontact.h" -#include "chatmemberslistview.h" #include "chatsessionmemberslistmodel.h" using namespace Kopete; diff -Nru kopete-4.12.3/kopete/chatwindow/kopetechatwindow.cpp kopete-4.12.90/kopete/chatwindow/kopetechatwindow.cpp --- kopete-4.12.3/kopete/chatwindow/kopetechatwindow.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/kopete/chatwindow/kopetechatwindow.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -21,6 +21,8 @@ ************************************************************************* */ +#include "kopetechatwindow.h" + #include #include #include @@ -70,7 +72,6 @@ #include "chatview.h" #include "kopeteapplication.h" #include "kopetebehaviorsettings.h" -#include "kopetechatwindow.h" #include "kopeteemoticonaction.h" #include "kopetegroup.h" #include "kopetechatsession.h" diff -Nru kopete-4.12.3/kopete/chatwindow/tests/chatwindowstyle_test.cpp kopete-4.12.90/kopete/chatwindow/tests/chatwindowstyle_test.cpp --- kopete-4.12.3/kopete/chatwindow/tests/chatwindowstyle_test.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/kopete/chatwindow/tests/chatwindowstyle_test.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -15,8 +15,8 @@ ************************************************************************* */ -#include #include "chatwindowstyle_test.h" +#include #include diff -Nru kopete-4.12.3/kopete/config/avdevice/IdGuiElements.h kopete-4.12.90/kopete/config/avdevice/IdGuiElements.h --- kopete-4.12.3/kopete/config/avdevice/IdGuiElements.h 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/kopete/config/avdevice/IdGuiElements.h 2014-03-04 05:59:24.000000000 +0000 @@ -86,4 +86,5 @@ }; -#endif \ No newline at end of file +#endif + diff -Nru kopete-4.12.3/kopete/contactlist/customnotificationprops.cpp kopete-4.12.90/kopete/contactlist/customnotificationprops.cpp --- kopete-4.12.3/kopete/contactlist/customnotificationprops.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/kopete/contactlist/customnotificationprops.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -18,6 +18,8 @@ ************************************************************************* */ +#include "customnotificationprops.h" + #include #include #include @@ -28,8 +30,6 @@ #include -#include "customnotificationprops.h" - #include #include diff -Nru kopete-4.12.3/kopete/contactlist/customnotificationprops.h kopete-4.12.90/kopete/contactlist/customnotificationprops.h --- kopete-4.12.3/kopete/contactlist/customnotificationprops.h 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/kopete/contactlist/customnotificationprops.h 2014-03-04 05:59:24.000000000 +0000 @@ -20,6 +20,9 @@ #ifndef KOPETE_CUSTOM_NOTIFICATION_PROPS_H #define KOPETE_CUSTOM_NOTIFICATION_PROPS_H +#include +#include + class KNotifyConfigWidget; class QBoxLayout; diff -Nru kopete-4.12.3/kopete/contactlist/kabcexport.cpp kopete-4.12.90/kopete/contactlist/kabcexport.cpp --- kopete-4.12.3/kopete/contactlist/kabcexport.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/kopete/contactlist/kabcexport.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -19,6 +19,8 @@ ************************************************************************* */ +#include "kabcexport.h" + #include #include @@ -39,8 +41,6 @@ #include #include -#include "kabcexport.h" - class ContactLVI : public QListWidgetItem { public: diff -Nru kopete-4.12.3/kopete/contactlist/kabcexport.h kopete-4.12.90/kopete/contactlist/kabcexport.h --- kopete-4.12.3/kopete/contactlist/kabcexport.h 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/kopete/contactlist/kabcexport.h 2014-03-04 05:59:24.000000000 +0000 @@ -21,6 +21,7 @@ #include #include +#include #include "ui_kabcexport_page1.h" #include "ui_kabcexport_page2.h" diff -Nru kopete-4.12.3/kopete/contactlist/kopeteaddrbookexport.cpp kopete-4.12.90/kopete/contactlist/kopeteaddrbookexport.cpp --- kopete-4.12.3/kopete/contactlist/kopeteaddrbookexport.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/kopete/contactlist/kopeteaddrbookexport.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -18,6 +18,8 @@ ************************************************************************* */ +#include "kopeteaddrbookexport.h" + #include #include #include @@ -33,8 +35,6 @@ #include "kopetemetacontact.h" #include "kopetecontact.h" -#include "kopeteaddrbookexport.h" - KopeteAddressBookExport::KopeteAddressBookExport( QWidget *parent, Kopete::MetaContact *mc ) : QObject( parent ), Ui::AddressBookExportUI() { // instantiate dialog and populate widgets diff -Nru kopete-4.12.3/kopete/contactlist/kopetestatusgroupviewitem.cpp kopete-4.12.90/kopete/contactlist/kopetestatusgroupviewitem.cpp --- kopete-4.12.3/kopete/contactlist/kopetestatusgroupviewitem.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/kopete/contactlist/kopetestatusgroupviewitem.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -17,8 +17,8 @@ ************************************************************************* */ -#include #include "kopetestatusgroupviewitem.h" +#include KopeteStatusGroupViewItem::KopeteStatusGroupViewItem( Kopete::OnlineStatus::StatusType status_ , Q3ListView *parent) : Q3ListViewItem(parent) diff -Nru kopete-4.12.3/libkopete/avdevice/videodevice.cpp kopete-4.12.90/libkopete/avdevice/videodevice.cpp --- kopete-4.12.3/libkopete/avdevice/videodevice.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/libkopete/avdevice/videodevice.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -18,6 +18,8 @@ #define ENABLE_AV +#include "videodevice.h" + #include #include #include @@ -25,7 +27,6 @@ #include #include "videoinput.h" -#include "videodevice.h" #include "bayer.h" #include "sonix_compress.h" diff -Nru kopete-4.12.3/libkopete/avdevice/videodevicepool.cpp kopete-4.12.90/libkopete/avdevice/videodevicepool.cpp --- kopete-4.12.3/libkopete/avdevice/videodevicepool.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/libkopete/avdevice/videodevicepool.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -18,6 +18,8 @@ #define ENABLE_AV +#include "videodevicepool.h" + #include #include #include @@ -37,7 +39,6 @@ #include "videodevice.h" -#include "videodevicepool.h" #define CLEAR(x) memset (&(x), 0, sizeof (x)) diff -Nru kopete-4.12.3/libkopete/chatsessionmemberslistmodel.cpp kopete-4.12.90/libkopete/chatsessionmemberslistmodel.cpp --- kopete-4.12.3/libkopete/chatsessionmemberslistmodel.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/libkopete/chatsessionmemberslistmodel.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -15,9 +15,9 @@ ************************************************************************* */ +#include "chatsessionmemberslistmodel.h" #include "kopetecontact.h" #include "kopeteonlinestatus.h" -#include "chatsessionmemberslistmodel.h" #include "kdebug.h" //own contact comparator, needs sessions contact-online-status weight diff -Nru kopete-4.12.3/libkopete/connectionmanager.cpp kopete-4.12.90/libkopete/connectionmanager.cpp --- kopete-4.12.3/libkopete/connectionmanager.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/libkopete/connectionmanager.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -16,6 +16,8 @@ */ +#include "connectionmanager.h" + #include #include #include @@ -23,8 +25,6 @@ #include "clientiface_stub.h" #include "networkstatuscommon.h" -#include "connectionmanager.h" - // ConnectionManager's private parts class ConnectionManagerPrivate { diff -Nru kopete-4.12.3/libkopete/contactlist/xmlcontactstorage.cpp kopete-4.12.90/libkopete/contactlist/xmlcontactstorage.cpp --- kopete-4.12.3/libkopete/contactlist/xmlcontactstorage.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/libkopete/contactlist/xmlcontactstorage.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -16,10 +16,10 @@ * * ************************************************************************* */ +#include "xmlcontactstorage.h" #ifdef Q_WS_X11 #include #endif -#include "xmlcontactstorage.h" // Qt includes #include diff -Nru kopete-4.12.3/libkopete/kabcpersistence.cpp kopete-4.12.90/libkopete/kabcpersistence.cpp --- kopete-4.12.3/libkopete/kabcpersistence.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/libkopete/kabcpersistence.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -15,6 +15,8 @@ ************************************************************************* */ +#include "kabcpersistence.h" + #include #include @@ -37,8 +39,6 @@ #include "kopetepluginmanager.h" #include "kopeteprotocol.h" -#include "kabcpersistence.h" - namespace Kopete { diff -Nru kopete-4.12.3/libkopete/kabcpersistence.h kopete-4.12.90/libkopete/kabcpersistence.h --- kopete-4.12.3/libkopete/kabcpersistence.h 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/libkopete/kabcpersistence.h 2014-03-04 05:59:24.000000000 +0000 @@ -18,6 +18,8 @@ #ifndef KABCPERSISTENCE_H #define KABCPERSISTENCE_H +#include + #include "kopete_export.h" // Goal is to have all the address book modifying code in one place diff -Nru kopete-4.12.3/libkopete/kopeteaccount.cpp kopete-4.12.90/libkopete/kopeteaccount.cpp --- kopete-4.12.3/libkopete/kopeteaccount.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/libkopete/kopeteaccount.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -18,6 +18,8 @@ ************************************************************************* */ +#include "kopeteaccount.h" + #include #include #include @@ -38,7 +40,6 @@ #include #include -#include "kopeteaccount.h" #include "kopeteidentity.h" #include "kopeteidentitymanager.h" #include "kabcpersistence.h" diff -Nru kopete-4.12.3/libkopete/kopeteidentity.cpp kopete-4.12.90/libkopete/kopeteidentity.cpp --- kopete-4.12.3/libkopete/kopeteidentity.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/libkopete/kopeteidentity.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -16,8 +16,8 @@ ************************************************************************* */ -#include "kopetepropertycontainer.h" #include "kopeteidentity.h" +#include "kopetepropertycontainer.h" #include "kopeteaccount.h" #include "kopetecontact.h" #include "kopeteprotocol.h" diff -Nru kopete-4.12.3/libkopete/kopetemessage.cpp kopete-4.12.90/libkopete/kopetemessage.cpp --- kopete-4.12.3/libkopete/kopetemessage.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/libkopete/kopetemessage.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -19,6 +19,8 @@ ************************************************************************* */ +#include "kopetemessage.h" + #include #include @@ -32,7 +34,6 @@ #include #include -#include "kopetemessage.h" #include "kopetemetacontact.h" #include "kopeteprotocol.h" #include "kopetechatsession.h" diff -Nru kopete-4.12.3/libkopete/kopetemessageevent.cpp kopete-4.12.90/libkopete/kopetemessageevent.cpp --- kopete-4.12.3/libkopete/kopetemessageevent.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/libkopete/kopetemessageevent.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -19,9 +19,10 @@ ************************************************************************* */ +#include "kopetemessageevent.h" + #include -#include "kopetemessageevent.h" #include "kopetemetacontact.h" #include "kopetecontactlist.h" #include "kopetecontact.h" diff -Nru kopete-4.12.3/libkopete/kopetepassword.cpp kopete-4.12.90/libkopete/kopetepassword.cpp --- kopete-4.12.3/libkopete/kopetepassword.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/libkopete/kopetepassword.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -14,8 +14,8 @@ ************************************************************************* */ -#include "kopeteuiglobal.h" #include "kopetepassword.h" +#include "kopeteuiglobal.h" #include "kopetewalletmanager.h" #include diff -Nru kopete-4.12.3/libkopete/kopetetransfermanager.cpp kopete-4.12.90/libkopete/kopetetransfermanager.cpp --- kopete-4.12.3/libkopete/kopetetransfermanager.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/libkopete/kopetetransfermanager.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -17,6 +17,8 @@ ************************************************************************* */ +#include "kopetetransfermanager.h" + #include #include @@ -34,8 +36,6 @@ #include "kopetechatsession.h" #include "kopeteuiglobal.h" -#include "kopetetransfermanager.h" - /*************************** * Kopete::FileTransferInfo * ***************************/ diff -Nru kopete-4.12.3/libkopete/kopeteutils.cpp kopete-4.12.90/libkopete/kopeteutils.cpp --- kopete-4.12.3/libkopete/kopeteutils.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/libkopete/kopeteutils.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -17,6 +17,8 @@ ************************************************************************* */ +#include "kopeteutils.h" + #include #include #include @@ -30,7 +32,6 @@ #include "kopeteaccount.h" #include "knotification.h" #include "kopeteutils_private.h" -#include "kopeteutils.h" #include "kopeteuiglobal.h" #include "kopetestatusmanager.h" diff -Nru kopete-4.12.3/libkopete/kopeteversion.h kopete-4.12.90/libkopete/kopeteversion.h --- kopete-4.12.3/libkopete/kopeteversion.h 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/libkopete/kopeteversion.h 2014-03-04 05:59:24.000000000 +0000 @@ -14,10 +14,10 @@ #ifndef _KOPETE_VERSION_H_ #define _KOPETE_VERSION_H_ -#define KOPETE_VERSION_STRING "1.6.2" +#define KOPETE_VERSION_STRING "1.6.60" #define KOPETE_VERSION_MAJOR 1 #define KOPETE_VERSION_MINOR 6 -#define KOPETE_VERSION_RELEASE 2 +#define KOPETE_VERSION_RELEASE 60 #define KOPETE_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c)) #define KOPETE_VERSION \ diff -Nru kopete-4.12.3/libkopete/managedconnectionaccount.cpp kopete-4.12.90/libkopete/managedconnectionaccount.cpp --- kopete-4.12.3/libkopete/managedconnectionaccount.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/libkopete/managedconnectionaccount.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -15,11 +15,11 @@ ************************************************************************* */ +#include "managedconnectionaccount.h" + #include "connectionmanager.h" #include "kopeteuiglobal.h" -#include "managedconnectionaccount.h" - namespace Kopete { diff -Nru kopete-4.12.3/libkopete/private/kopeteutils_private.cpp kopete-4.12.90/libkopete/private/kopeteutils_private.cpp --- kopete-4.12.3/libkopete/private/kopeteutils_private.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/libkopete/private/kopeteutils_private.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -13,6 +13,7 @@ * * ************************************************************************* */ +#include "kopeteutils_private.h" #include #include @@ -22,7 +23,6 @@ #include #include "knotification.h" -#include "kopeteutils_private.h" #include "kopeteuiglobal.h" namespace Kopete diff -Nru kopete-4.12.3/libkopete/private/kopeteutils_private.h kopete-4.12.90/libkopete/private/kopeteutils_private.h --- kopete-4.12.3/libkopete/private/kopeteutils_private.h 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/libkopete/private/kopeteutils_private.h 2014-03-04 05:59:24.000000000 +0000 @@ -18,6 +18,7 @@ #ifndef KOPETE_UTILS_PRIVATE_H #define KOPETE_UTILS_PRIVATE_H +#include #include "qobject.h" #include "qstring.h" #include "qpixmap.h" diff -Nru kopete-4.12.3/libkopete/tests/kopetecontactlist_test.cpp kopete-4.12.90/libkopete/tests/kopetecontactlist_test.cpp --- kopete-4.12.3/libkopete/tests/kopetecontactlist_test.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/libkopete/tests/kopetecontactlist_test.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -15,11 +15,11 @@ ************************************************************************* */ +#include "kopetecontactlist_test.h" #include #include #include #include -#include "kopetecontactlist_test.h" using namespace KUnitTest; diff -Nru kopete-4.12.3/libkopete/tests/kopetemessage_test.cpp kopete-4.12.90/libkopete/tests/kopetemessage_test.cpp --- kopete-4.12.3/libkopete/tests/kopetemessage_test.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/libkopete/tests/kopetemessage_test.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -17,6 +17,8 @@ ************************************************************************* */ +#include "kopetemessage_test.h" + // QTestLib for KDE #include #include @@ -31,7 +33,6 @@ #include #include -#include "kopetemessage_test.h" #include "kopetemessage_test.moc" #include "kopeteaccount_mock.h" #include "kopeteprotocol_mock.h" diff -Nru kopete-4.12.3/libkopete/tests/kopetepropertiestest.cpp kopete-4.12.90/libkopete/tests/kopetepropertiestest.cpp --- kopete-4.12.3/libkopete/tests/kopetepropertiestest.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/libkopete/tests/kopetepropertiestest.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -16,6 +16,8 @@ ************************************************************************* */ +#include "kopetepropertiestest.h" + #include #include "kopeteproperties.h" @@ -27,8 +29,6 @@ #include #include -#include "kopetepropertiestest.h" - using namespace KUnitTest; KUNITTEST_MODULE( kunittest_kopetepropertiestest, "KopeteSuite"); diff -Nru kopete-4.12.3/libkopete/tests/kopetetask_test.cpp kopete-4.12.90/libkopete/tests/kopetetask_test.cpp --- kopete-4.12.3/libkopete/tests/kopetetask_test.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/libkopete/tests/kopetetask_test.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -14,12 +14,12 @@ * * ************************************************************************* */ +#include "kopetetask_test.h" #include #include #include -#include "kopetetask_test.h" #include "kopetetask_test.moc" #include diff -Nru kopete-4.12.3/libkopete/tests/kopetewallettest_program.cpp kopete-4.12.90/libkopete/tests/kopetewallettest_program.cpp --- kopete-4.12.3/libkopete/tests/kopetewallettest_program.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/libkopete/tests/kopetewallettest_program.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -14,6 +14,8 @@ ************************************************************************* */ +#include "kopetewallettest_program.h" + #include #include @@ -26,7 +28,6 @@ #include #include "kopetewalletmanager.h" -#include "kopetewallettest_program.h" static QTextStream _out( stdout, QIODevice::WriteOnly ); diff -Nru kopete-4.12.3/libkopete/tests/template_test.cpp kopete-4.12.90/libkopete/tests/template_test.cpp --- kopete-4.12.3/libkopete/tests/template_test.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/libkopete/tests/template_test.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -15,8 +15,8 @@ ************************************************************************* */ -#include #include "template_test.h" +#include using namespace KUnitTest; diff -Nru kopete-4.12.3/libkopete/ui/addressbooklinkwidget.cpp kopete-4.12.90/libkopete/ui/addressbooklinkwidget.cpp --- kopete-4.12.3/libkopete/ui/addressbooklinkwidget.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/libkopete/ui/addressbooklinkwidget.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -21,6 +21,8 @@ ************************************************************************* */ +#include "addressbooklinkwidget.h" + #include #include #include @@ -30,7 +32,6 @@ #include -#include "addressbooklinkwidget.h" #include "addressbookselectordialog.h" #include "addressbookselectorwidget.h" diff -Nru kopete-4.12.3/libkopete/ui/addressbookselectorwidget.cpp kopete-4.12.90/libkopete/ui/addressbookselectorwidget.cpp --- kopete-4.12.3/libkopete/ui/addressbookselectorwidget.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/libkopete/ui/addressbookselectorwidget.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -24,6 +24,7 @@ * * ************************************************************************* */ +#include "addressbookselectorwidget.h" #include #include @@ -41,7 +42,6 @@ #include -#include "addressbookselectorwidget.h" #include #include "kabcpersistence.h" diff -Nru kopete-4.12.3/libkopete/ui/addresseeitem.cpp kopete-4.12.90/libkopete/ui/addresseeitem.cpp --- kopete-4.12.3/libkopete/ui/addresseeitem.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/libkopete/ui/addresseeitem.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -17,6 +17,8 @@ Boston, MA 02110-1301, USA. */ +#include "addresseeitem.h" + #include #include #include @@ -26,8 +28,6 @@ #include #include -#include "addresseeitem.h" - AddresseeItem::AddresseeItem( Q3ListView *parent, const KABC::Addressee &addressee) : K3ListViewItem( parent ), mAddressee( addressee ) diff -Nru kopete-4.12.3/libkopete/ui/avatarwebcamdialog.h kopete-4.12.90/libkopete/ui/avatarwebcamdialog.h --- kopete-4.12.3/libkopete/ui/avatarwebcamdialog.h 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/libkopete/ui/avatarwebcamdialog.h 2014-03-04 05:59:24.000000000 +0000 @@ -85,4 +85,5 @@ } // namespace UI } // namespace Kopete -#endif \ No newline at end of file +#endif + diff -Nru kopete-4.12.3/libkopete/ui/collapsiblewidget.cpp kopete-4.12.90/libkopete/ui/collapsiblewidget.cpp --- kopete-4.12.3/libkopete/ui/collapsiblewidget.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/libkopete/ui/collapsiblewidget.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -17,9 +17,9 @@ Boston, MA 02110-1301, USA. */ +#include #include #include -#include /****************************************************************** * Helper classes diff -Nru kopete-4.12.3/libkopete/ui/kopetelistviewitem.cpp kopete-4.12.90/libkopete/ui/kopetelistviewitem.cpp --- kopete-4.12.3/libkopete/ui/kopetelistviewitem.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/libkopete/ui/kopetelistviewitem.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -16,8 +16,8 @@ ************************************************************************* */ -#include "kopetecontact.h" #include "kopetelistviewitem.h" +#include "kopetecontact.h" #include "kopeteemoticons.h" #include "kopeteonlinestatus.h" diff -Nru kopete-4.12.3/libkopete/ui/metacontactselectorwidget.cpp kopete-4.12.90/libkopete/ui/metacontactselectorwidget.cpp --- kopete-4.12.3/libkopete/ui/metacontactselectorwidget.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/libkopete/ui/metacontactselectorwidget.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -15,6 +15,8 @@ ************************************************************************* */ +#include "metacontactselectorwidget.h" + #include #include @@ -43,7 +45,6 @@ #include "kopetemetacontact.h" #include "kopetepicture.h" #include "ui_addressbookselectorwidget_base.h" -#include "metacontactselectorwidget.h" #include "ui_metacontactselectorwidget_base.h" using namespace Kopete::UI::ListView; diff -Nru kopete-4.12.3/plugins/addbookmarks/addbookmarksplugin.cpp kopete-4.12.90/plugins/addbookmarks/addbookmarksplugin.cpp --- kopete-4.12.3/plugins/addbookmarks/addbookmarksplugin.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/addbookmarks/addbookmarksplugin.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -10,13 +10,14 @@ // // +#include "addbookmarksplugin.h" + #include #include #include #include #include -#include "addbookmarksplugin.h" #include "kopetecontact.h" #include "kopetechatsessionmanager.h" #include "kopeteglobal.h" diff -Nru kopete-4.12.3/plugins/addbookmarks/addbookmarksprefssettings.cpp kopete-4.12.90/plugins/addbookmarks/addbookmarksprefssettings.cpp --- kopete-4.12.3/plugins/addbookmarks/addbookmarksprefssettings.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/addbookmarks/addbookmarksprefssettings.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -9,13 +9,13 @@ // License: GPL v2 // // +#include "addbookmarksprefssettings.h" + #include #include #include #include -#include "addbookmarksprefssettings.h" - BookmarksPrefsSettings::BookmarksPrefsSettings(QObject *parent) : QObject(parent) { diff -Nru kopete-4.12.3/plugins/alias/aliasplugin.cpp kopete-4.12.90/plugins/alias/aliasplugin.cpp --- kopete-4.12.3/plugins/alias/aliasplugin.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/alias/aliasplugin.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -7,12 +7,12 @@ * * ***************************************************************************/ +#include "aliasplugin.h" + #include #include "kopetechatsessionmanager.h" -#include "aliasplugin.h" - K_PLUGIN_FACTORY( AliasPluginFactory, registerPlugin(); ) K_EXPORT_PLUGIN( AliasPluginFactory( "kopete_alias" ) ) diff -Nru kopete-4.12.3/plugins/alias/aliaspreferences.cpp kopete-4.12.90/plugins/alias/aliaspreferences.cpp --- kopete-4.12.3/plugins/alias/aliaspreferences.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/alias/aliaspreferences.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -14,6 +14,9 @@ */ #define QT3_SUPPORT + +#include "aliaspreferences.h" + #include #include #include @@ -36,7 +39,6 @@ #include "ui_aliasdialogbase.h" #include "editaliasdialog.h" -#include "aliaspreferences.h" K_PLUGIN_FACTORY( AliasPreferencesFactory, registerPlugin(); ) K_EXPORT_PLUGIN( AliasPreferencesFactory( "kcm_kopete_alias" ) ) diff -Nru kopete-4.12.3/plugins/autoreplace/autoreplaceplugin.cpp kopete-4.12.90/plugins/autoreplace/autoreplaceplugin.cpp --- kopete-4.12.3/plugins/autoreplace/autoreplaceplugin.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/autoreplace/autoreplaceplugin.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -15,6 +15,8 @@ * * ***************************************************************************/ +#include "autoreplaceplugin.h" + #include #include @@ -22,7 +24,6 @@ #include "kopetechatsessionmanager.h" #include "kopetesimplemessagehandler.h" -#include "autoreplaceplugin.h" #include "autoreplaceconfig.h" K_PLUGIN_FACTORY(AutoReplacePluginFactory, registerPlugin();) diff -Nru kopete-4.12.3/plugins/autoreplace/autoreplaceplugin.h kopete-4.12.90/plugins/autoreplace/autoreplaceplugin.h --- kopete-4.12.3/plugins/autoreplace/autoreplaceplugin.h 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/autoreplace/autoreplaceplugin.h 2014-03-04 05:59:24.000000000 +0000 @@ -18,6 +18,7 @@ #ifndef AutoReplacePLUGIN_H #define AutoReplacePLUGIN_H +#include #include #include #include diff -Nru kopete-4.12.3/plugins/autoreplace/autoreplacepreferences.cpp kopete-4.12.90/plugins/autoreplace/autoreplacepreferences.cpp --- kopete-4.12.3/plugins/autoreplace/autoreplacepreferences.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/autoreplace/autoreplacepreferences.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -16,6 +16,9 @@ ***************************************************************************/ #define QT3_SUPPORT + +#include "autoreplacepreferences.h" + #include #include #include @@ -27,7 +30,6 @@ #include #include "ui_autoreplaceprefs.h" -#include "autoreplacepreferences.h" #include "autoreplaceconfig.h" K_PLUGIN_FACTORY(AutoReplacePreferencesFactory, registerPlugin();) diff -Nru kopete-4.12.3/plugins/contactnotes/contactnotesedit.cpp kopete-4.12.90/plugins/contactnotes/contactnotesedit.cpp --- kopete-4.12.3/plugins/contactnotes/contactnotesedit.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/contactnotes/contactnotesedit.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -15,6 +15,8 @@ *************************************************************************** */ +#include "contactnotesedit.h" + #include #include @@ -25,7 +27,6 @@ #include "kopetemetacontact.h" #include "contactnotesplugin.h" -#include "contactnotesedit.h" ContactNotesEdit::ContactNotesEdit(Kopete::MetaContact *m,ContactNotesPlugin *p) : KDialog() diff -Nru kopete-4.12.3/plugins/contactnotes/contactnotesplugin.cpp kopete-4.12.90/plugins/contactnotes/contactnotesplugin.cpp --- kopete-4.12.3/plugins/contactnotes/contactnotesplugin.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/contactnotes/contactnotesplugin.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -15,6 +15,8 @@ *************************************************************************** */ +#include "contactnotesplugin.h" + #include #include #include @@ -25,7 +27,6 @@ #include "contactnotesedit.h" -#include "contactnotesplugin.h" #include K_PLUGIN_FACTORY(ContactNotesPluginFactory, registerPlugin();) diff -Nru kopete-4.12.3/plugins/contactnotes/contactnotesplugin.h kopete-4.12.90/plugins/contactnotes/contactnotesplugin.h --- kopete-4.12.3/plugins/contactnotes/contactnotesplugin.h 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/contactnotes/contactnotesplugin.h 2014-03-04 05:59:24.000000000 +0000 @@ -18,6 +18,7 @@ #ifndef CONTACTNOTESPLUGIN_H #define CONTACTNOTESPLUGIN_H +#include #include #include #include diff -Nru kopete-4.12.3/plugins/cryptography/kopete_cryptography_config.desktop kopete-4.12.90/plugins/cryptography/kopete_cryptography_config.desktop --- kopete-4.12.3/plugins/cryptography/kopete_cryptography_config.desktop 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/cryptography/kopete_cryptography_config.desktop 2014-03-04 05:59:24.000000000 +0000 @@ -39,6 +39,7 @@ Name[ja]=暗号化 Name[kk]=Шифрлау Name[km]=ការ​គ្រីប +Name[ko]=암호화 Name[lt]=Šifravimas Name[lv]=Kriptogrāfija Name[mk]=Криптографија @@ -98,6 +99,7 @@ Comment[ja]=OpenPGP によるメッセージの暗号化と署名 Comment[kk]=OpenPGP көмегімен хабарларды шифрлау және қолтаңбалау Comment[km]=អ៊ីនគ្រិប និង​ចុះហត្ថលេខា​សារ​ដោយ​ប្រើ OpenPGP +Comment[ko]=OpenPGP를 사용하여 메시지 암호화 및 서명 Comment[lt]=Užšifruoti ir pasirašyti žinutes su OpenPGP Comment[lv]=Šifrā un paraksta ziņojumus, izmantojot OpenPGP Comment[mr]=ओपनपीजीपी वापरून संदेश कुटलिपीबद्ध व हस्ताक्षरित करतो diff -Nru kopete-4.12.3/plugins/cryptography/kopete_cryptography.desktop kopete-4.12.90/plugins/cryptography/kopete_cryptography.desktop --- kopete-4.12.3/plugins/cryptography/kopete_cryptography.desktop 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/cryptography/kopete_cryptography.desktop 2014-03-04 05:59:24.000000000 +0000 @@ -44,6 +44,7 @@ Name[ja]=暗号化 Name[kk]=Шифрлау Name[km]=ការ​គ្រីប +Name[ko]=암호화 Name[lt]=Šifravimas Name[lv]=Kriptogrāfija Name[mk]=Криптографија @@ -103,6 +104,7 @@ Comment[ja]=OpenPGP によるメッセージの暗号化と署名 Comment[kk]=OpenPGP көмегімен хабарларды шифрлау және қолтаңбалау Comment[km]=អ៊ីនគ្រិប និង​ចុះហត្ថលេខា​សារ​ដោយ​ប្រើ OpenPGP +Comment[ko]=OpenPGP를 사용하여 메시지 암호화 및 서명 Comment[lt]=Užšifruoti ir pasirašyti žinutes su OpenPGP Comment[lv]=Šifrā un paraksta ziņojumus, izmantojot OpenPGP Comment[mr]=ओपनपीजीपी वापरून संदेश कुटलिपीबद्ध व हस्ताक्षरित करतो diff -Nru kopete-4.12.3/plugins/highlight/highlightconfig.cpp kopete-4.12.90/plugins/highlight/highlightconfig.cpp --- kopete-4.12.3/plugins/highlight/highlightconfig.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/highlight/highlightconfig.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -16,6 +16,8 @@ ************************************************************************* */ +#include "highlightconfig.h" + #include #include #include @@ -29,7 +31,6 @@ #include #include "filter.h" -#include "highlightconfig.h" HighlightConfig::HighlightConfig() diff -Nru kopete-4.12.3/plugins/highlight/highlightplugin.cpp kopete-4.12.90/plugins/highlight/highlightplugin.cpp --- kopete-4.12.3/plugins/highlight/highlightplugin.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/highlight/highlightplugin.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -13,6 +13,8 @@ *************************************************************************** */ +#include "highlightplugin.h" + #include #include @@ -21,7 +23,6 @@ #include "kopeteview.h" #include "filter.h" -#include "highlightplugin.h" #include "highlightconfig.h" K_PLUGIN_FACTORY(HighlightPluginFactory, registerPlugin();) diff -Nru kopete-4.12.3/plugins/highlight/highlightplugin.h kopete-4.12.90/plugins/highlight/highlightplugin.h --- kopete-4.12.3/plugins/highlight/highlightplugin.h 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/highlight/highlightplugin.h 2014-03-04 05:59:24.000000000 +0000 @@ -18,6 +18,7 @@ #ifndef HighlightPLUGIN_H #define HighlightPLUGIN_H +#include #include #include #include diff -Nru kopete-4.12.3/plugins/highlight/highlightpreferences.cpp kopete-4.12.90/plugins/highlight/highlightpreferences.cpp --- kopete-4.12.3/plugins/highlight/highlightpreferences.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/highlight/highlightpreferences.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -15,6 +15,8 @@ *************************************************************************** */ +#include "highlightpreferences.h" + #include #include #include @@ -38,7 +40,6 @@ #include "highlightplugin.h" #include "highlightconfig.h" #include "ui_highlightprefsbase.h" -#include "highlightpreferences.h" K_PLUGIN_FACTORY(HighlightPreferencesFactory, registerPlugin();) K_EXPORT_PLUGIN(HighlightPreferencesFactory( "kcm_kopete_highlight" )) diff -Nru kopete-4.12.3/plugins/highlight/highlightpreferences.h kopete-4.12.90/plugins/highlight/highlightpreferences.h --- kopete-4.12.3/plugins/highlight/highlightpreferences.h 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/highlight/highlightpreferences.h 2014-03-04 05:59:24.000000000 +0000 @@ -20,6 +20,8 @@ #include #include +#include "highlightconfig.h" +#include "ui_highlightprefsbase.h" namespace Ui { class HighlightPrefsUI; } class Filter; diff -Nru kopete-4.12.3/plugins/latex/latexguiclient.cpp kopete-4.12.90/plugins/latex/latexguiclient.cpp --- kopete-4.12.3/plugins/latex/latexguiclient.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/latex/latexguiclient.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -15,6 +15,8 @@ ************************************************************************* */ +#include "latexguiclient.h" + #include #include @@ -29,7 +31,6 @@ #include "kopetemessage.h" #include "latexplugin.h" -#include "latexguiclient.h" #include LatexGUIClient::LatexGUIClient( Kopete::ChatSession *parent ) diff -Nru kopete-4.12.3/plugins/latex/latexplugin.cpp kopete-4.12.90/plugins/latex/latexplugin.cpp --- kopete-4.12.3/plugins/latex/latexplugin.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/latex/latexplugin.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -16,6 +16,8 @@ ************************************************************************* */ +#include "latexplugin.h" + #include #include #include @@ -32,7 +34,6 @@ #include "kopetechatsessionmanager.h" #include "kopeteuiglobal.h" -#include "latexplugin.h" #include "latexconfig.h" #include "latexguiclient.h" diff -Nru kopete-4.12.3/plugins/latex/latexplugin.h kopete-4.12.90/plugins/latex/latexplugin.h --- kopete-4.12.3/plugins/latex/latexplugin.h 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/latex/latexplugin.h 2014-03-04 05:59:24.000000000 +0000 @@ -22,6 +22,7 @@ #ifndef LATEXPLUGIN_H #define LATEXPLUGIN_H +#include #include #include diff -Nru kopete-4.12.3/plugins/latex/latexpreferences.cpp kopete-4.12.90/plugins/latex/latexpreferences.cpp --- kopete-4.12.3/plugins/latex/latexpreferences.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/latex/latexpreferences.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -15,6 +15,8 @@ ************************************************************************* */ +#include "latexpreferences.h" + #include #include @@ -26,7 +28,6 @@ #include "latexplugin.h" #include "latexconfig.h" #include "ui_latexprefsbase.h" -#include "latexpreferences.h" K_PLUGIN_FACTORY(LatexPreferencesFactory, registerPlugin();) K_EXPORT_PLUGIN(LatexPreferencesFactory( "kcm_kopete_latex" )) diff -Nru kopete-4.12.3/plugins/nowlistening/nlamarok.cpp kopete-4.12.90/plugins/nowlistening/nlamarok.cpp --- kopete-4.12.3/plugins/nowlistening/nlamarok.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/nowlistening/nlamarok.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -21,13 +21,14 @@ ************************************************************************* */ +#include "nlamarok.h" + #include #include #include "nlmediaplayer.h" -#include "nlamarok.h" // from kvirc mpris interface struct MPRISPlayerStatus diff -Nru kopete-4.12.3/plugins/nowlistening/nlamarok.h kopete-4.12.90/plugins/nowlistening/nlamarok.h --- kopete-4.12.3/plugins/nowlistening/nlamarok.h 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/nowlistening/nlamarok.h 2014-03-04 05:59:24.000000000 +0000 @@ -25,6 +25,9 @@ #ifndef NLAMAROK_H #define NLAMAROK_H +#include +#include "nlmediaplayer.h" + class QDBusInterface; class NLamaroK : public NLMediaPlayer diff -Nru kopete-4.12.3/plugins/nowlistening/nlaudacious.cpp kopete-4.12.90/plugins/nowlistening/nlaudacious.cpp --- kopete-4.12.3/plugins/nowlistening/nlaudacious.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/nowlistening/nlaudacious.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -22,13 +22,13 @@ ************************************************************************* */ +#include "nlaudacious.h" + #include #include -#include "nlaudacious.h" - struct audaciousPlayerStatus { int state; // 0 = Playing, 1 = Paused, 2 = Stopped. diff -Nru kopete-4.12.3/plugins/nowlistening/nljuk.cpp kopete-4.12.90/plugins/nowlistening/nljuk.cpp --- kopete-4.12.3/plugins/nowlistening/nljuk.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/nowlistening/nljuk.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -21,13 +21,14 @@ ************************************************************************* */ +#include "nljuk.h" + #include #include #include "nlmediaplayer.h" -#include "nljuk.h" NLJuk::NLJuk() : NLMediaPlayer() { diff -Nru kopete-4.12.3/plugins/nowlistening/nljuk.h kopete-4.12.90/plugins/nowlistening/nljuk.h --- kopete-4.12.3/plugins/nowlistening/nljuk.h 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/nowlistening/nljuk.h 2014-03-04 05:59:24.000000000 +0000 @@ -26,6 +26,9 @@ #ifndef NLJUK_H #define NLJUK_H +#include +#include "nlmediaplayer.h" + class QDBusInterface; class NLJuk : public NLMediaPlayer diff -Nru kopete-4.12.3/plugins/nowlistening/nlkaffeine.cpp kopete-4.12.90/plugins/nowlistening/nlkaffeine.cpp --- kopete-4.12.3/plugins/nowlistening/nlkaffeine.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/nowlistening/nlkaffeine.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -21,13 +21,14 @@ ************************************************************************* */ +#include "nlkaffeine.h" + #include #include #include "nlmediaplayer.h" -#include "nlkaffeine.h" NLKaffeine::NLKaffeine() : NLMediaPlayer() { diff -Nru kopete-4.12.3/plugins/nowlistening/nlkaffeine.h kopete-4.12.90/plugins/nowlistening/nlkaffeine.h --- kopete-4.12.3/plugins/nowlistening/nlkaffeine.h 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/nowlistening/nlkaffeine.h 2014-03-04 05:59:24.000000000 +0000 @@ -25,6 +25,9 @@ #ifndef NLKAFFEINE_H #define NLKAFFEINE_H +#include +#include "nlmediaplayer.h" + class QDBusInterface; class NLKaffeine : public NLMediaPlayer diff -Nru kopete-4.12.3/plugins/nowlistening/nlkscd.cpp kopete-4.12.90/plugins/nowlistening/nlkscd.cpp --- kopete-4.12.3/plugins/nowlistening/nlkscd.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/nowlistening/nlkscd.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -21,6 +21,8 @@ ************************************************************************* */ +#include "nlkscd.h" + #include #include @@ -28,8 +30,6 @@ #include "nlmediaplayer.h" -#include "nlkscd.h" - NLKscd::NLKscd() : NLMediaPlayer() { m_client = new QDBusInterface("org.kde.kscd", "/CDPlayer"); diff -Nru kopete-4.12.3/plugins/nowlistening/nlkscd.h kopete-4.12.90/plugins/nowlistening/nlkscd.h --- kopete-4.12.3/plugins/nowlistening/nlkscd.h 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/nowlistening/nlkscd.h 2014-03-04 05:59:24.000000000 +0000 @@ -24,6 +24,9 @@ #ifndef NLKSCD_H #define NLKSCD_H +#include +#include "nlmediaplayer.h" + class QDBusInterface; class NLKscd : public NLMediaPlayer diff -Nru kopete-4.12.3/plugins/nowlistening/nlmediaplayer.h kopete-4.12.90/plugins/nowlistening/nlmediaplayer.h --- kopete-4.12.3/plugins/nowlistening/nlmediaplayer.h 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/nowlistening/nlmediaplayer.h 2014-03-04 05:59:24.000000000 +0000 @@ -25,6 +25,8 @@ #ifndef NLMEDIAPLAYER_H #define NLMEDIAPLAYER_H +#include + class NLMediaPlayer { public: diff -Nru kopete-4.12.3/plugins/nowlistening/nlmpris2.cpp kopete-4.12.90/plugins/nowlistening/nlmpris2.cpp --- kopete-4.12.3/plugins/nowlistening/nlmpris2.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/nowlistening/nlmpris2.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -21,13 +21,13 @@ ************************************************************************* */ +#include "nlmpris2.h" + #include #include -#include "nlmpris2.h" - NLmpris2::NLmpris2() : NLMediaPlayer() { diff -Nru kopete-4.12.3/plugins/nowlistening/nlmpris2.h kopete-4.12.90/plugins/nowlistening/nlmpris2.h --- kopete-4.12.3/plugins/nowlistening/nlmpris2.h 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/nowlistening/nlmpris2.h 2014-03-04 05:59:24.000000000 +0000 @@ -25,6 +25,7 @@ #ifndef NLMPRIS2_H #define NLMPRIS2_H +#include #include "nlmediaplayer.h" class QDBusInterface; diff -Nru kopete-4.12.3/plugins/nowlistening/nlmpris.cpp kopete-4.12.90/plugins/nowlistening/nlmpris.cpp --- kopete-4.12.3/plugins/nowlistening/nlmpris.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/nowlistening/nlmpris.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -21,13 +21,13 @@ ************************************************************************* */ +#include "nlmpris.h" + #include #include -#include "nlmpris.h" - struct mprisPlayerStatus { int state; // 0 = Playing, 1 = Paused, 2 = Stopped. diff -Nru kopete-4.12.3/plugins/nowlistening/nlmpris.h kopete-4.12.90/plugins/nowlistening/nlmpris.h --- kopete-4.12.3/plugins/nowlistening/nlmpris.h 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/nowlistening/nlmpris.h 2014-03-04 05:59:24.000000000 +0000 @@ -25,6 +25,7 @@ #ifndef NLMPRIS_H #define NLMPRIS_H +#include #include "nlmediaplayer.h" class QDBusInterface; diff -Nru kopete-4.12.3/plugins/nowlistening/nlqmmp.cpp kopete-4.12.90/plugins/nowlistening/nlqmmp.cpp --- kopete-4.12.3/plugins/nowlistening/nlqmmp.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/nowlistening/nlqmmp.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -22,13 +22,14 @@ ************************************************************************* */ +#include "nlqmmp.h" + #include #include #include "nlmediaplayer.h" -#include "nlqmmp.h" struct qmmpPlayerStatus { diff -Nru kopete-4.12.3/plugins/nowlistening/nlxmms.cpp kopete-4.12.90/plugins/nowlistening/nlxmms.cpp --- kopete-4.12.3/plugins/nowlistening/nlxmms.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/nowlistening/nlxmms.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -23,10 +23,10 @@ #ifdef HAVE_XMMS +#include "nlxmms.h" #include #include // need to fix Makefile.am for this? #include "nlmediaplayer.h" -#include "nlxmms.h" NLXmms::NLXmms() : NLMediaPlayer() { diff -Nru kopete-4.12.3/plugins/nowlistening/nlxmms.h kopete-4.12.90/plugins/nowlistening/nlxmms.h --- kopete-4.12.3/plugins/nowlistening/nlxmms.h 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/nowlistening/nlxmms.h 2014-03-04 05:59:24.000000000 +0000 @@ -26,6 +26,8 @@ #ifdef HAVE_XMMS +#include "nlmediaplayer.h" + class NLXmms : public NLMediaPlayer { public: diff -Nru kopete-4.12.3/plugins/nowlistening/nowlisteningplugin.cpp kopete-4.12.90/plugins/nowlistening/nowlisteningplugin.cpp --- kopete-4.12.3/plugins/nowlistening/nowlisteningplugin.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/nowlistening/nowlisteningplugin.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -18,6 +18,8 @@ ************************************************************************* */ +#include "nowlisteningplugin.h" + #include #include #include @@ -37,7 +39,6 @@ #include "kopetestatusmessage.h" #include "nowlisteningconfig.h" -#include "nowlisteningplugin.h" #include "nlmediaplayer.h" #include "nlkscd.h" #include "nljuk.h" diff -Nru kopete-4.12.3/plugins/nowlistening/nowlisteningpreferences.cpp kopete-4.12.90/plugins/nowlistening/nowlisteningpreferences.cpp --- kopete-4.12.3/plugins/nowlistening/nowlisteningpreferences.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/nowlistening/nowlisteningpreferences.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -17,6 +17,9 @@ * * ************************************************************************* */ + +#include "nowlisteningpreferences.h" + #include #include #include @@ -29,7 +32,6 @@ #include "ui_nowlisteningprefs.h" #include "nowlisteningconfig.h" -#include "nowlisteningpreferences.h" #include "nowlisteningpreferences.moc" K_PLUGIN_FACTORY( NowListeningPreferencesFactory, registerPlugin(); ) diff -Nru kopete-4.12.3/plugins/privacy/contactselectorwidget.cpp kopete-4.12.90/plugins/privacy/contactselectorwidget.cpp --- kopete-4.12.3/plugins/privacy/contactselectorwidget.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/privacy/contactselectorwidget.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -14,6 +14,7 @@ ************************************************************************* */ +#include "contactselectorwidget.h" #include #include #include @@ -22,7 +23,6 @@ #include #include #include "ui_contactselectorwidget_base.h" -#include "contactselectorwidget.h" ContactSelectorWidget::ContactSelectorWidget( QWidget *parent ) : QWidget(parent) diff -Nru kopete-4.12.3/plugins/privacy/privacyaccountlistmodel.cpp kopete-4.12.90/plugins/privacy/privacyaccountlistmodel.cpp --- kopete-4.12.3/plugins/privacy/privacyaccountlistmodel.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/privacy/privacyaccountlistmodel.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -14,6 +14,8 @@ ************************************************************************* */ +#include "privacyaccountlistmodel.h" + #include #include @@ -22,7 +24,6 @@ #include "kopeteprotocol.h" #include "kopetepluginmanager.h" -#include "privacyaccountlistmodel.h" PrivacyAccountListModel::PrivacyAccountListModel( QObject *parent ) : QAbstractTableModel(parent) diff -Nru kopete-4.12.3/plugins/privacy/privacyplugin.cpp kopete-4.12.90/plugins/privacy/privacyplugin.cpp --- kopete-4.12.3/plugins/privacy/privacyplugin.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/privacy/privacyplugin.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -14,6 +14,8 @@ ************************************************************************* */ +#include "privacyplugin.h" + #include #include #include @@ -35,7 +37,6 @@ #include "privacyconfig.h" #include "privacyguiclient.h" -#include "privacyplugin.h" #include K_PLUGIN_FACTORY( PrivacyPluginFactory, registerPlugin(); ) diff -Nru kopete-4.12.3/plugins/privacy/privacypreferences.cpp kopete-4.12.90/plugins/privacy/privacypreferences.cpp --- kopete-4.12.3/plugins/privacy/privacypreferences.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/privacy/privacypreferences.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -14,6 +14,8 @@ ************************************************************************* */ +#include "privacypreferences.h" + #include #include #include @@ -32,7 +34,6 @@ #include "privacyconfig.h" #include "ui_privacydialog.h" #include "privacyaccountlistmodel.h" -#include "privacypreferences.h" K_PLUGIN_FACTORY( PrivacyPreferencesFactory, registerPlugin(); ) K_EXPORT_PLUGIN( PrivacyPreferencesFactory( "kcm_kopete_privacy" ) ) diff -Nru kopete-4.12.3/plugins/statistics/statisticscontact.cpp kopete-4.12.90/plugins/statistics/statisticscontact.cpp --- kopete-4.12.3/plugins/statistics/statisticscontact.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/statistics/statisticscontact.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -15,6 +15,8 @@ ************************************************************************* */ +#include "statisticscontact.h" + #include #include @@ -25,7 +27,6 @@ #include "kopetemetacontact.h" #include "kopeteonlinestatus.h" -#include "statisticscontact.h" #include "statisticsdb.h" StatisticsContact::StatisticsContact(Kopete::MetaContact *mc, StatisticsDB *db) : m_metaContact(mc), m_metaContactId(mc->metaContactId()), m_db(db), m_oldStatus(Kopete::OnlineStatus::Unknown) diff -Nru kopete-4.12.3/plugins/statistics/statisticscontact.h kopete-4.12.90/plugins/statistics/statisticscontact.h --- kopete-4.12.3/plugins/statistics/statisticscontact.h 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/statistics/statisticscontact.h 2014-03-04 05:59:24.000000000 +0000 @@ -20,6 +20,7 @@ #include "kopeteonlinestatus.h" #include "kopetemessage.h" +#include "kopetemetacontact.h" #include #include #include diff -Nru kopete-4.12.3/plugins/statistics/statisticsdb.cpp kopete-4.12.90/plugins/statistics/statisticsdb.cpp --- kopete-4.12.3/plugins/statistics/statisticsdb.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/statistics/statisticsdb.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -15,6 +15,8 @@ ************************************************************************* */ +#include "statisticsdb.h" + #include #include #include @@ -27,8 +29,6 @@ #include #include -#include "statisticsdb.h" - #include StatisticsDB::StatisticsDB() diff -Nru kopete-4.12.3/plugins/statistics/statisticsdialog.cpp kopete-4.12.90/plugins/statistics/statisticsdialog.cpp --- kopete-4.12.3/plugins/statistics/statisticsdialog.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/statistics/statisticsdialog.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -15,6 +15,7 @@ ************************************************************************* */ +#include "statisticsdialog.h" #include #include @@ -36,7 +37,6 @@ #include "kopetemetacontact.h" #include "kopeteonlinestatus.h" -#include "statisticsdialog.h" #include "statisticscontact.h" #include "ui_statisticswidgetbase.h" #include "statisticsplugin.h" diff -Nru kopete-4.12.3/plugins/statistics/statisticsplugin.cpp kopete-4.12.90/plugins/statistics/statisticsplugin.cpp --- kopete-4.12.3/plugins/statistics/statisticsplugin.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/statistics/statisticsplugin.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -15,6 +15,8 @@ ************************************************************************* */ +#include "statisticsplugin.h" + #include #include @@ -43,7 +45,6 @@ #include "statisticscontact.h" #include "statisticsdialog.h" -#include "statisticsplugin.h" #include "statisticsadaptor.h" #include "statisticsdb.h" diff -Nru kopete-4.12.3/plugins/statistics/statisticsplugin.h kopete-4.12.90/plugins/statistics/statisticsplugin.h --- kopete-4.12.3/plugins/statistics/statisticsplugin.h 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/statistics/statisticsplugin.h 2014-03-04 05:59:24.000000000 +0000 @@ -19,6 +19,7 @@ #define STATISTICSPLUGIN_H #include +#include #include "kopeteplugin.h" diff -Nru kopete-4.12.3/plugins/texteffect/texteffectconfig.cpp kopete-4.12.90/plugins/texteffect/texteffectconfig.cpp --- kopete-4.12.3/plugins/texteffect/texteffectconfig.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/texteffect/texteffectconfig.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -16,14 +16,14 @@ ************************************************************************* */ +#include "texteffectconfig.h" + #include #include #include #include -#include "texteffectconfig.h" - TextEffectConfig::TextEffectConfig() { } diff -Nru kopete-4.12.3/plugins/texteffect/texteffectplugin.cpp kopete-4.12.90/plugins/texteffect/texteffectplugin.cpp --- kopete-4.12.3/plugins/texteffect/texteffectplugin.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/texteffect/texteffectplugin.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -15,6 +15,8 @@ *************************************************************************** */ +#include "texteffectplugin.h" + #include #include @@ -23,7 +25,6 @@ #include "kopetechatsessionmanager.h" -#include "texteffectplugin.h" #include "texteffectconfig.h" K_PLUGIN_FACTORY(TextEffectPluginFactory, registerPlugin();) diff -Nru kopete-4.12.3/plugins/texteffect/texteffectplugin.h kopete-4.12.90/plugins/texteffect/texteffectplugin.h --- kopete-4.12.3/plugins/texteffect/texteffectplugin.h 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/texteffect/texteffectplugin.h 2014-03-04 05:59:24.000000000 +0000 @@ -18,6 +18,7 @@ #ifndef TextEffectPLUGIN_H #define TextEffectPLUGIN_H +#include #include #include #include diff -Nru kopete-4.12.3/plugins/texteffect/texteffectpreferences.cpp kopete-4.12.90/plugins/texteffect/texteffectpreferences.cpp --- kopete-4.12.3/plugins/texteffect/texteffectpreferences.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/texteffect/texteffectpreferences.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -15,6 +15,8 @@ *************************************************************************** */ +#include "texteffectpreferences.h" + #include #include #include @@ -29,7 +31,6 @@ #include #include "ui_texteffectprefs.h" -#include "texteffectpreferences.h" #include "texteffectconfig.h" K_PLUGIN_FACTORY(TextEffectPreferencesFactory, registerPlugin();) diff -Nru kopete-4.12.3/plugins/translator/translatordialog.cpp kopete-4.12.90/plugins/translator/translatordialog.cpp --- kopete-4.12.3/plugins/translator/translatordialog.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/translator/translatordialog.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -15,11 +15,11 @@ *************************************************************************** */ +#include "translatordialog.h" + #include #include -#include "translatordialog.h" - TranslatorDialog::TranslatorDialog(const QString &text, QWidget *parent) : KDialog(parent) diff -Nru kopete-4.12.3/plugins/translator/translatorguiclient.cpp kopete-4.12.90/plugins/translator/translatorguiclient.cpp --- kopete-4.12.3/plugins/translator/translatorguiclient.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/translator/translatorguiclient.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -17,6 +17,8 @@ ************************************************************************* */ +#include "translatorguiclient.h" + #include #include @@ -31,7 +33,6 @@ #include "kopetemessage.h" #include "translatorplugin.h" -#include "translatorguiclient.h" #include "translatorlanguages.h" #include diff -Nru kopete-4.12.3/plugins/translator/translatorlanguages.cpp kopete-4.12.90/plugins/translator/translatorlanguages.cpp --- kopete-4.12.3/plugins/translator/translatorlanguages.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/translator/translatorlanguages.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -17,12 +17,12 @@ ************************************************************************* */ +#include "translatorlanguages.h" + #include #include #include -#include "translatorlanguages.h" - TranslatorLanguages::TranslatorLanguages() { m_sc = 0; diff -Nru kopete-4.12.3/plugins/translator/translatorplugin.cpp kopete-4.12.90/plugins/translator/translatorplugin.cpp --- kopete-4.12.3/plugins/translator/translatorplugin.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/translator/translatorplugin.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -20,6 +20,8 @@ google translation page layout (13-sept-2007) */ +#include "translatorplugin.h" + #include #include #include @@ -41,7 +43,6 @@ #include "kopetechatsessionmanager.h" #include "kopetecontact.h" -#include "translatorplugin.h" #include "translatordialog.h" #include "translatorguiclient.h" #include "translatorlanguages.h" diff -Nru kopete-4.12.3/plugins/translator/translatorpreferences.cpp kopete-4.12.90/plugins/translator/translatorpreferences.cpp --- kopete-4.12.3/plugins/translator/translatorpreferences.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/translator/translatorpreferences.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -17,6 +17,8 @@ ************************************************************************* */ +#include "translatorpreferences.h" + #include #include #include @@ -25,7 +27,6 @@ #include #include "translatorplugin.h" -#include "translatorpreferences.h" #include "translatorconfig.h" #include "ui_translatorprefsbase.h" diff -Nru kopete-4.12.3/plugins/urlpicpreview/linkpreview.cpp kopete-4.12.90/plugins/urlpicpreview/linkpreview.cpp --- kopete-4.12.3/plugins/urlpicpreview/linkpreview.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/urlpicpreview/linkpreview.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -15,6 +15,8 @@ ************************************************************************** */ +#include "linkpreview.h" + //Qt #include @@ -26,7 +28,6 @@ // Kopete #include "urlpicpreviewplugin.h" -#include "linkpreview.h" LinkPreview * LinkPreview::m_self = NULL; diff -Nru kopete-4.12.3/plugins/urlpicpreview/urlpicpreviewplugin.cpp kopete-4.12.90/plugins/urlpicpreview/urlpicpreviewplugin.cpp --- kopete-4.12.3/plugins/urlpicpreview/urlpicpreviewplugin.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/urlpicpreview/urlpicpreviewplugin.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -15,6 +15,8 @@ ************************************************************************** */ +#include "urlpicpreviewplugin.h" + // Qt #include #include @@ -32,7 +34,6 @@ // Kopete #include "linkpreview.h" #include "kopeteuiglobal.h" -#include "urlpicpreviewplugin.h" #include "urlpicpreviewconfig.h" #include "kopetechatsessionmanager.h" diff -Nru kopete-4.12.3/plugins/urlpicpreview/urlpicpreviewpreferences.cpp kopete-4.12.90/plugins/urlpicpreview/urlpicpreviewpreferences.cpp --- kopete-4.12.3/plugins/urlpicpreview/urlpicpreviewpreferences.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/plugins/urlpicpreview/urlpicpreviewpreferences.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -15,6 +15,8 @@ ************************************************************************** */ +#include "urlpicpreviewpreferences.h" + // Qt #include #include @@ -28,7 +30,6 @@ // Kopete #include "urlpicpreviewconfig.h" #include "ui_urlpicpreviewprefsbase.h" -#include "urlpicpreviewpreferences.h" K_PLUGIN_FACTORY(URLPicPreviewPreferencesFactory, diff -Nru kopete-4.12.3/protocols/gadu/gaduaddcontactpage.cpp kopete-4.12.90/protocols/gadu/gaduaddcontactpage.cpp --- kopete-4.12.3/protocols/gadu/gaduaddcontactpage.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/gadu/gaduaddcontactpage.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -20,12 +20,13 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA // 02110-1301, USA. +#include "gaduaddcontactpage.h" + #include "kopetemetacontact.h" #include "ui_gaduadd.h" #include "gaduprotocol.h" #include "gaduaccount.h" -#include "gaduaddcontactpage.h" #include "gaducontact.h" #include "gaducontactlist.h" diff -Nru kopete-4.12.3/protocols/gadu/gaduaway.cpp kopete-4.12.90/protocols/gadu/gaduaway.cpp --- kopete-4.12.3/protocols/gadu/gaduaway.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/gadu/gaduaway.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -19,9 +19,9 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA // 02110-1301, USA. +#include "gaduaway.h" #include "gaduaccount.h" #include "gaduprotocol.h" -#include "gaduaway.h" #include "ui_gaduawayui.h" #include "kopeteonlinestatus.h" diff -Nru kopete-4.12.3/protocols/gadu/gaducontact.cpp kopete-4.12.90/protocols/gadu/gaducontact.cpp --- kopete-4.12.3/protocols/gadu/gaducontact.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/gadu/gaducontact.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -20,6 +20,8 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA // 02110-1301, USA. +#include "gaducontact.h" + #include #include #include @@ -29,7 +31,6 @@ #include "gaduaccount.h" #include "gaduprotocol.h" -#include "gaducontact.h" #include "gadupubdir.h" #include "gadueditcontact.h" #include "gaducontactlist.h" diff -Nru kopete-4.12.3/protocols/gadu/gadudcc.cpp kopete-4.12.90/protocols/gadu/gadudcc.cpp --- kopete-4.12.3/protocols/gadu/gadudcc.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/gadu/gadudcc.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -19,6 +19,8 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA // 02110-1301, USA. +#include "gadudcc.h" + #include #include #include @@ -29,7 +31,6 @@ #include #include "gadudccserver.h" -#include "gadudcc.h" #include "gadudcctransaction.h" #include "gaduaccount.h" diff -Nru kopete-4.12.3/protocols/gadu/gadudccserver.cpp kopete-4.12.90/protocols/gadu/gadudccserver.cpp --- kopete-4.12.3/protocols/gadu/gadudccserver.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/gadu/gadudccserver.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -19,6 +19,8 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA // 02110-1301, USA. +#include "gadudccserver.h" + #include #include #include @@ -28,7 +30,6 @@ #include -#include "gadudccserver.h" #include "libgadu.h" #include "gaduaccount.h" diff -Nru kopete-4.12.3/protocols/gadu/gadudcctransaction.cpp kopete-4.12.90/protocols/gadu/gadudcctransaction.cpp --- kopete-4.12.3/protocols/gadu/gadudcctransaction.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/gadu/gadudcctransaction.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -19,6 +19,8 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA // 02110-1301, USA. +#include "gadudcctransaction.h" + #include #include #include @@ -37,7 +39,6 @@ #include #include -#include "gadudcctransaction.h" #include "gaducontact.h" #include "gaduaccount.h" #include "gadudcc.h" diff -Nru kopete-4.12.3/protocols/gadu/gadueditcontact.cpp kopete-4.12.90/protocols/gadu/gadueditcontact.cpp --- kopete-4.12.3/protocols/gadu/gadueditcontact.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/gadu/gadueditcontact.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -19,9 +19,9 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA // 02110-1301, USA. +#include "gadueditcontact.h" #include "gaduaccount.h" #include "gaducontact.h" -#include "gadueditcontact.h" #include "kopeteonlinestatus.h" #include "gaducontactlist.h" diff -Nru kopete-4.12.3/protocols/gadu/gaduprotocol.cpp kopete-4.12.90/protocols/gadu/gaduprotocol.cpp --- kopete-4.12.3/protocols/gadu/gaduprotocol.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/gadu/gaduprotocol.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -20,6 +20,8 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA // 02110-1301, USA. +#include "gaduprotocol.h" + #include #include #include @@ -28,7 +30,6 @@ #include "gaduaccount.h" #include "gaducontact.h" -#include "gaduprotocol.h" #include "gadueditaccount.h" #include "gaduaddcontactpage.h" diff -Nru kopete-4.12.3/protocols/gadu/gaduregisteraccount.cpp kopete-4.12.90/protocols/gadu/gaduregisteraccount.cpp --- kopete-4.12.3/protocols/gadu/gaduregisteraccount.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/gadu/gaduregisteraccount.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -19,6 +19,8 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA // 02110-1301, USA. +#include "gaduregisteraccount.h" + #include #include #include @@ -33,7 +35,6 @@ #include #include "ui_gaduregisteraccountui.h" -#include "gaduregisteraccount.h" #include "gaducommands.h" GaduRegisterAccount::GaduRegisterAccount( QWidget* parent ) diff -Nru kopete-4.12.3/protocols/gadu/gadurichtextformat.cpp kopete-4.12.90/protocols/gadu/gadurichtextformat.cpp --- kopete-4.12.3/protocols/gadu/gadurichtextformat.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/gadu/gadurichtextformat.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -19,10 +19,11 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA // 02110-1301, USA. +#include "gadurichtextformat.h" + #include #include -#include "gadurichtextformat.h" #include "gadusession.h" #include diff -Nru kopete-4.12.3/protocols/gadu/gadusession.cpp kopete-4.12.90/protocols/gadu/gadusession.cpp --- kopete-4.12.3/protocols/gadu/gadusession.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/gadu/gadusession.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -22,10 +22,10 @@ // 02110-1301, USA. // -#include - #include "gadusession.h" +#include + #include #include #include "kopetemessage.h" diff -Nru kopete-4.12.3/protocols/groupwise/libgroupwise/chatroommanager.cpp kopete-4.12.90/protocols/groupwise/libgroupwise/chatroommanager.cpp --- kopete-4.12.3/protocols/groupwise/libgroupwise/chatroommanager.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/groupwise/libgroupwise/chatroommanager.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -16,6 +16,8 @@ ************************************************************************* */ +#include "chatroommanager.h" + #include #include @@ -26,8 +28,6 @@ #include "tasks/chatpropertiestask.h" #include "tasks/searchchattask.h" -#include "chatroommanager.h" - ChatroomManager::ChatroomManager( Client * parent) : QObject(parent), m_client( parent ), m_replace( false ) { diff -Nru kopete-4.12.3/protocols/groupwise/libgroupwise/client.cpp kopete-4.12.90/protocols/groupwise/libgroupwise/client.cpp --- kopete-4.12.3/protocols/groupwise/libgroupwise/client.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/groupwise/libgroupwise/client.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -19,6 +19,8 @@ ************************************************************************* */ +#include "client.h" + #include #include #include @@ -45,7 +47,6 @@ #include "tasks/statustask.h" #include "tasks/typingtask.h" #include "userdetailsmanager.h" -#include "client.h" namespace GroupWise { diff -Nru kopete-4.12.3/protocols/groupwise/libgroupwise/compress.cpp kopete-4.12.90/protocols/groupwise/libgroupwise/compress.cpp --- kopete-4.12.3/protocols/groupwise/libgroupwise/compress.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/groupwise/libgroupwise/compress.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -1,11 +1,11 @@ +#include "compress.h" + #include // for qWarning() #include #include #include #include -#include "compress.h" - #define CHUNK_SIZE 1024 Compressor::Compressor(QIODevice* device, int compression) : device_(device) diff -Nru kopete-4.12.3/protocols/groupwise/libgroupwise/compressionhandler.cpp kopete-4.12.90/protocols/groupwise/libgroupwise/compressionhandler.cpp --- kopete-4.12.3/protocols/groupwise/libgroupwise/compressionhandler.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/groupwise/libgroupwise/compressionhandler.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -1,7 +1,8 @@ +#include "compressionhandler.h" + #include #include -#include "compressionhandler.h" #include "compress.h" CompressionHandler::CompressionHandler() : errorCode_(0) diff -Nru kopete-4.12.3/protocols/groupwise/libgroupwise/coreprotocol.cpp kopete-4.12.90/protocols/groupwise/libgroupwise/coreprotocol.cpp --- kopete-4.12.3/protocols/groupwise/libgroupwise/coreprotocol.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/groupwise/libgroupwise/coreprotocol.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -20,6 +20,8 @@ ************************************************************************* */ +#include "coreprotocol.h" + #include #include #include @@ -41,8 +43,6 @@ #include "response.h" #include "responseprotocol.h" -#include "coreprotocol.h" - #define NO_ESCAPE(ch) ((ch == 0x20) || (ch >= 0x30 && ch <= 0x39) || (ch >= 0x41 && ch <= 0x5a) || (ch >= 0x61 && ch <= 0x7a)) #define GW_URLVAR_TAG "&tag=" #define GW_URLVAR_METHOD "&cmd=" diff -Nru kopete-4.12.3/protocols/groupwise/libgroupwise/eventprotocol.cpp kopete-4.12.90/protocols/groupwise/libgroupwise/eventprotocol.cpp --- kopete-4.12.3/protocols/groupwise/libgroupwise/eventprotocol.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/groupwise/libgroupwise/eventprotocol.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -16,12 +16,13 @@ ************************************************************************* */ +#include "eventprotocol.h" + #include #include "gwerror.h" #include "eventtransfer.h" -#include "eventprotocol.h" using namespace GroupWise; diff -Nru kopete-4.12.3/protocols/groupwise/libgroupwise/gwclientstream.cpp kopete-4.12.90/protocols/groupwise/libgroupwise/gwclientstream.cpp --- kopete-4.12.3/protocols/groupwise/libgroupwise/gwclientstream.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/groupwise/libgroupwise/gwclientstream.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -31,6 +31,8 @@ // #include"securestream.h" // #include"protocol.h" +#include "gwclientstream.h" + #include // for qdebug #include #include @@ -47,8 +49,6 @@ //#include "iostream.h" -#include "gwclientstream.h" - //#define LIBGW_DEBUG 1 void cs_dump( const QByteArray &bytes ); diff -Nru kopete-4.12.3/protocols/groupwise/libgroupwise/gwerror.cpp kopete-4.12.90/protocols/groupwise/libgroupwise/gwerror.cpp --- kopete-4.12.3/protocols/groupwise/libgroupwise/gwerror.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/groupwise/libgroupwise/gwerror.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -15,10 +15,10 @@ ************************************************************************* */ -#include - #include "gwerror.h" +#include + QString GroupWise::errorCodeToString( int errorCode ) { QString errorString; diff -Nru kopete-4.12.3/protocols/groupwise/libgroupwise/gwfield.cpp kopete-4.12.90/protocols/groupwise/libgroupwise/gwfield.cpp --- kopete-4.12.3/protocols/groupwise/libgroupwise/gwfield.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/groupwise/libgroupwise/gwfield.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -17,6 +17,8 @@ ************************************************************************* */ +#include "gwfield.h" + #include #include "gwerror.h" @@ -25,7 +27,6 @@ #include #endif -#include "gwfield.h" #include using namespace Field; diff -Nru kopete-4.12.3/protocols/groupwise/libgroupwise/inputprotocolbase.cpp kopete-4.12.90/protocols/groupwise/libgroupwise/inputprotocolbase.cpp --- kopete-4.12.3/protocols/groupwise/libgroupwise/inputprotocolbase.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/groupwise/libgroupwise/inputprotocolbase.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -16,14 +16,14 @@ ************************************************************************* */ +#include "inputprotocolbase.h" + #include #include #include "gwerror.h" - #include "gwfield.h" -#include "inputprotocolbase.h" InputProtocolBase::InputProtocolBase(QObject *parent) : QObject(parent) diff -Nru kopete-4.12.3/protocols/groupwise/libgroupwise/privacymanager.cpp kopete-4.12.90/protocols/groupwise/libgroupwise/privacymanager.cpp --- kopete-4.12.3/protocols/groupwise/libgroupwise/privacymanager.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/groupwise/libgroupwise/privacymanager.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -16,12 +16,12 @@ ************************************************************************* */ +#include "privacymanager.h" + #include "client.h" #include "tasks/privacyitemtask.h" #include "userdetailsmanager.h" -#include "privacymanager.h" - PrivacyManager::PrivacyManager( Client * client) : QObject(client), m_client( client ) { diff -Nru kopete-4.12.3/protocols/groupwise/libgroupwise/qcatlshandler.cpp kopete-4.12.90/protocols/groupwise/libgroupwise/qcatlshandler.cpp --- kopete-4.12.3/protocols/groupwise/libgroupwise/qcatlshandler.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/groupwise/libgroupwise/qcatlshandler.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -18,12 +18,12 @@ ************************************************************************* */ +#include "qcatlshandler.h" + #include #include -#include "qcatlshandler.h" - class QCATLSHandler::Private { public: diff -Nru kopete-4.12.3/protocols/groupwise/libgroupwise/requestfactory.cpp kopete-4.12.90/protocols/groupwise/libgroupwise/requestfactory.cpp --- kopete-4.12.3/protocols/groupwise/libgroupwise/requestfactory.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/groupwise/libgroupwise/requestfactory.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -15,10 +15,10 @@ ************************************************************************* */ -#include "request.h" - #include "requestfactory.h" +#include "request.h" + #define GW_REQUESTFACTORY_FIRST_TID 1 RequestFactory::RequestFactory() : m_nextTransaction( GW_REQUESTFACTORY_FIRST_TID ) diff -Nru kopete-4.12.3/protocols/groupwise/libgroupwise/response.cpp kopete-4.12.90/protocols/groupwise/libgroupwise/response.cpp --- kopete-4.12.3/protocols/groupwise/libgroupwise/response.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/groupwise/libgroupwise/response.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -14,10 +14,10 @@ * * ************************************************************************* */ -#include - #include "response.h" +#include + Response::Response( int transactionId, int resultCode, Field::FieldList fields ) : UserTransfer( transactionId ), m_resultCode( resultCode ) { diff -Nru kopete-4.12.3/protocols/groupwise/libgroupwise/responseprotocol.cpp kopete-4.12.90/protocols/groupwise/libgroupwise/responseprotocol.cpp --- kopete-4.12.3/protocols/groupwise/libgroupwise/responseprotocol.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/groupwise/libgroupwise/responseprotocol.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -16,6 +16,8 @@ ************************************************************************* */ +#include "responseprotocol.h" + #include #include #include @@ -23,8 +25,6 @@ #include "response.h" -#include "responseprotocol.h" - ResponseProtocol::ResponseProtocol(QObject* parent) : InputProtocolBase(parent) { diff -Nru kopete-4.12.3/protocols/groupwise/libgroupwise/securestream.cpp kopete-4.12.90/protocols/groupwise/libgroupwise/securestream.cpp --- kopete-4.12.3/protocols/groupwise/libgroupwise/securestream.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/groupwise/libgroupwise/securestream.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -27,12 +27,12 @@ but future layers might not. */ +#include "securestream.h" + #include #include #include -#include "securestream.h" - #include "compressionhandler.h" //---------------------------------------------------------------------------- // LayerTracker diff -Nru kopete-4.12.3/protocols/groupwise/libgroupwise/task.cpp kopete-4.12.90/protocols/groupwise/libgroupwise/task.cpp --- kopete-4.12.3/protocols/groupwise/libgroupwise/task.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/groupwise/libgroupwise/task.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -17,6 +17,8 @@ ************************************************************************* */ +#include "task.h" + #include #include "client.h" @@ -24,8 +26,6 @@ #include "request.h" #include "safedelete.h" -#include "task.h" - class Task::TaskPrivate { public: diff -Nru kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/chatcountstask.cpp kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/chatcountstask.cpp --- kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/chatcountstask.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/chatcountstask.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -16,14 +16,14 @@ ************************************************************************* */ +#include "chatcountstask.h" + #include #include #include "gwfield.h" #include "response.h" -#include "chatcountstask.h" - ChatCountsTask::ChatCountsTask(Task* parent): RequestTask(parent) { Field::FieldList lst; diff -Nru kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/chatpropertiestask.cpp kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/chatpropertiestask.cpp --- kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/chatpropertiestask.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/chatpropertiestask.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -16,13 +16,13 @@ ************************************************************************* */ +#include "chatpropertiestask.h" + #include #include "gwfield.h" #include "response.h" -#include "chatpropertiestask.h" - using namespace GroupWise; ChatPropertiesTask::ChatPropertiesTask(Task* parent): RequestTask(parent) diff -Nru kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp --- kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -18,11 +18,11 @@ ************************************************************************* */ +#include "conferencetask.h" + #include "client.h" #include "userdetailsmanager.h" -#include "conferencetask.h" - ConferenceTask::ConferenceTask( Task* parent ) : EventTask( parent ) { diff -Nru kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/connectiontask.cpp kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/connectiontask.cpp --- kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/connectiontask.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/connectiontask.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -17,10 +17,10 @@ * * ************************************************************************* */ -#include "client.h" - #include "connectiontask.h" +#include "client.h" + ConnectionTask::ConnectionTask(Task* parent): EventTask(parent) { registerEvent( GroupWise::UserDisconnect ); diff -Nru kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/createconferencetask.cpp kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/createconferencetask.cpp --- kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/createconferencetask.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/createconferencetask.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -18,12 +18,12 @@ ************************************************************************* */ +#include "createconferencetask.h" + #include "client.h" #include "response.h" -#include "createconferencetask.h" - CreateConferenceTask::CreateConferenceTask(Task* parent): RequestTask(parent), m_confId( 0 ), m_guid( BLANK_GUID ) { diff -Nru kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/createconferencetask.h kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/createconferencetask.h --- kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/createconferencetask.h 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/createconferencetask.h 2014-03-04 05:59:24.000000000 +0000 @@ -22,6 +22,7 @@ #define CREATECONFERENCETASK_H #include "requesttask.h" +#include "client.h" /** This task is responsible for creating a conference at the server, and confirming that the server allowed the conference to be created. diff -Nru kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.cpp kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.cpp --- kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -17,10 +17,10 @@ * * ************************************************************************* */ -#include "client.h" - #include "createcontactinstancetask.h" +#include "client.h" + CreateContactInstanceTask::CreateContactInstanceTask(Task* parent) : NeedFolderTask(parent) { // make the client tell the client app (Kopete) when we receive a contact diff -Nru kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp --- kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -18,12 +18,12 @@ ************************************************************************* */ +#include "createcontacttask.h" + #include "client.h" #include "createfoldertask.h" #include "createcontactinstancetask.h" -#include "createcontacttask.h" - CreateContactTask::CreateContactTask(Task* parent): Task(parent) { } diff -Nru kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/eventtask.cpp kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/eventtask.cpp --- kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/eventtask.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/eventtask.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -18,8 +18,8 @@ ************************************************************************* */ -#include "gwfield.h" #include "eventtask.h" +#include "gwfield.h" EventTask::EventTask( Task * parent ) : Task( parent ) diff -Nru kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.cpp kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.cpp --- kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/getchatsearchresultstask.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -18,6 +18,8 @@ ************************************************************************* */ +#include "getchatsearchresultstask.h" + #include #include "gwfield.h" @@ -25,8 +27,6 @@ #include "logintask.h" -#include "getchatsearchresultstask.h" - using namespace GroupWise; GetChatSearchResultsTask::GetChatSearchResultsTask(Task* parent): RequestTask(parent) diff -Nru kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/getdetailstask.cpp kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/getdetailstask.cpp --- kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/getdetailstask.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/getdetailstask.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -19,12 +19,12 @@ ************************************************************************* */ +#include "getdetailstask.h" + #include "client.h" #include "response.h" #include "userdetailsmanager.h" -#include "getdetailstask.h" - using namespace GroupWise; GetDetailsTask::GetDetailsTask( Task * parent ) diff -Nru kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/getstatustask.cpp kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/getstatustask.cpp --- kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/getstatustask.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/getstatustask.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -18,10 +18,10 @@ ************************************************************************* */ -#include "response.h" - #include "getstatustask.h" +#include "response.h" + GetStatusTask::GetStatusTask(Task* parent): RequestTask(parent) { } diff -Nru kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/joinchattask.cpp kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/joinchattask.cpp --- kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/joinchattask.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/joinchattask.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -18,13 +18,13 @@ ************************************************************************* */ +#include "joinchattask.h" + #include "gwerror.h" #include "client.h" #include "response.h" #include "userdetailsmanager.h" -#include "joinchattask.h" - JoinChatTask::JoinChatTask(Task* parent): RequestTask(parent) { } diff -Nru kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/joinchattask.h kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/joinchattask.h --- kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/joinchattask.h 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/joinchattask.h 2014-03-04 05:59:24.000000000 +0000 @@ -21,6 +21,7 @@ #ifndef JOINCHATTASK_H #define JOINCHATTASK_H +#include #include "requesttask.h" using namespace GroupWise; diff -Nru kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp --- kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -18,13 +18,13 @@ ************************************************************************* */ +#include "joinconferencetask.h" + #include "gwerror.h" #include "client.h" #include "response.h" #include "userdetailsmanager.h" -#include "joinconferencetask.h" - JoinConferenceTask::JoinConferenceTask(Task* parent): RequestTask(parent) { } diff -Nru kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/joinconferencetask.h kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/joinconferencetask.h --- kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/joinconferencetask.h 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/joinconferencetask.h 2014-03-04 05:59:24.000000000 +0000 @@ -21,6 +21,7 @@ #ifndef JOINCONFERENCETASK_H #define JOINCONFERENCETASK_H +#include #include "requesttask.h" using namespace GroupWise; diff -Nru kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/keepalivetask.cpp kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/keepalivetask.cpp --- kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/keepalivetask.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/keepalivetask.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -19,10 +19,10 @@ ************************************************************************* */ +#include "keepalivetask.h" #include "client.h" #include "request.h" #include "requestfactory.h" -#include "keepalivetask.h" KeepAliveTask::KeepAliveTask(Task* parent): RequestTask(parent) { diff -Nru kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/logintask.cpp kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/logintask.cpp --- kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/logintask.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/logintask.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -19,12 +19,12 @@ ************************************************************************* */ +#include "logintask.h" #include "client.h" #include "response.h" #include "privacymanager.h" #include "userdetailsmanager.h" -#include "logintask.h" #include LoginTask::LoginTask( Task * parent ) diff -Nru kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.cpp kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.cpp --- kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/modifycontactlisttask.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -18,10 +18,10 @@ ************************************************************************* */ +#include "modifycontactlisttask.h" #include "client.h" #include "response.h" #include "gwerror.h" -#include "modifycontactlisttask.h" ModifyContactListTask::ModifyContactListTask(Task* parent): RequestTask(parent) { diff -Nru kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/movecontacttask.cpp kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/movecontacttask.cpp --- kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/movecontacttask.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/movecontacttask.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -18,10 +18,10 @@ ************************************************************************* */ -#include "client.h" - #include "movecontacttask.h" +#include "client.h" + MoveContactTask::MoveContactTask(Task* parent): NeedFolderTask(parent) { // make the client tell the client app (Kopete) when we receive a contact diff -Nru kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp --- kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -9,12 +9,12 @@ // Copyright: See COPYING file that comes with this distribution // // +#include "needfoldertask.h" + #include "client.h" #include "tasks/createcontactinstancetask.h" #include "tasks/createfoldertask.h" -#include "needfoldertask.h" - NeedFolderTask::NeedFolderTask(Task* parent): ModifyContactListTask(parent) { } diff -Nru kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp --- kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/pollsearchresultstask.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -19,12 +19,12 @@ ************************************************************************* */ +#include "pollsearchresultstask.h" #include "gwfield.h" #include "response.h" #include "logintask.h" -#include "pollsearchresultstask.h" #include using namespace GroupWise; diff -Nru kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/requesttask.cpp kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/requesttask.cpp --- kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/requesttask.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/requesttask.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -18,14 +18,14 @@ ************************************************************************* */ +#include "requesttask.h" + #include "gwfield.h" #include "client.h" #include "request.h" #include "response.h" #include "requestfactory.h" -#include "requesttask.h" - RequestTask::RequestTask( Task * parent ) : Task( parent ) { diff -Nru kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp --- kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -18,6 +18,8 @@ ************************************************************************* */ +#include "searchchattask.h" + #include #include @@ -28,8 +30,6 @@ #include "getchatsearchresultstask.h" -#include "searchchattask.h" - // the delay we allow the server to initially do the search #define GW_POLL_INITIAL_DELAY 1000 diff -Nru kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/searchchattask.h kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/searchchattask.h --- kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/searchchattask.h 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/searchchattask.h 2014-03-04 05:59:24.000000000 +0000 @@ -25,6 +25,7 @@ #include "libgroupwise_export.h" #include "requesttask.h" +#include "getchatsearchresultstask.h" class QTimer; diff -Nru kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp --- kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -18,6 +18,8 @@ ************************************************************************* */ +#include "searchusertask.h" + #include #include @@ -28,8 +30,6 @@ #include "pollsearchresultstask.h" -#include "searchusertask.h" - // the delay we allow the server to initially do the search #define GW_POLL_INITIAL_DELAY 1000 // the maximum number of times to poll the server diff -Nru kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/sendinvitetask.cpp kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/sendinvitetask.cpp --- kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/sendinvitetask.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/sendinvitetask.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -17,8 +17,8 @@ * * ************************************************************************* */ -#include #include "sendinvitetask.h" +#include SendInviteTask::SendInviteTask(Task* parent): RequestTask(parent) { diff -Nru kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/statustask.cpp kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/statustask.cpp --- kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/statustask.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/statustask.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -18,10 +18,10 @@ ************************************************************************* */ -#include "client.h" - #include "statustask.h" +#include "client.h" + StatusTask::StatusTask(Task* parent): EventTask(parent) { registerEvent( GroupWise::StatusChange ); diff -Nru kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/updatecontacttask.cpp kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/updatecontacttask.cpp --- kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/updatecontacttask.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/updatecontacttask.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -18,9 +18,9 @@ ************************************************************************* */ +#include "updatecontacttask.h" #include "gwfield.h" -#include "updatecontacttask.h" #include using namespace GroupWise; diff -Nru kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/updatefoldertask.cpp kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/updatefoldertask.cpp --- kopete-4.12.3/protocols/groupwise/libgroupwise/tasks/updatefoldertask.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/groupwise/libgroupwise/tasks/updatefoldertask.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -17,10 +17,10 @@ * * ************************************************************************* */ -#include "gwfield.h" - #include "updatefoldertask.h" +#include "gwfield.h" + UpdateFolderTask::UpdateFolderTask(Task* parent): UpdateItemTask(parent) { } diff -Nru kopete-4.12.3/protocols/groupwise/libgroupwise/transfer.cpp kopete-4.12.90/protocols/groupwise/libgroupwise/transfer.cpp --- kopete-4.12.3/protocols/groupwise/libgroupwise/transfer.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/groupwise/libgroupwise/transfer.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -14,10 +14,10 @@ * * ************************************************************************* */ -#include - #include "transfer.h" +#include + Transfer::Transfer() { } diff -Nru kopete-4.12.3/protocols/groupwise/libgroupwise/userdetailsmanager.cpp kopete-4.12.90/protocols/groupwise/libgroupwise/userdetailsmanager.cpp --- kopete-4.12.3/protocols/groupwise/libgroupwise/userdetailsmanager.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/groupwise/libgroupwise/userdetailsmanager.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -15,11 +15,11 @@ ************************************************************************* */ +#include "userdetailsmanager.h" + #include "client.h" #include "tasks/getdetailstask.h" -#include "userdetailsmanager.h" - UserDetailsManager::UserDetailsManager( Client * parent) : QObject(parent), m_client( parent ) { diff -Nru kopete-4.12.3/protocols/groupwise/libgroupwise/userdetailsmanager.h kopete-4.12.90/protocols/groupwise/libgroupwise/userdetailsmanager.h --- kopete-4.12.3/protocols/groupwise/libgroupwise/userdetailsmanager.h 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/groupwise/libgroupwise/userdetailsmanager.h 2014-03-04 05:59:24.000000000 +0000 @@ -24,6 +24,7 @@ #include "gwerror.h" #include "libgroupwise_export.h" +#include "client.h" namespace GroupWise { class Client; diff -Nru kopete-4.12.3/protocols/jabber/googletalk/googletalkcalldialog.cpp kopete-4.12.90/protocols/jabber/googletalk/googletalkcalldialog.cpp --- kopete-4.12.3/protocols/jabber/googletalk/googletalkcalldialog.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/jabber/googletalk/googletalkcalldialog.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -13,10 +13,10 @@ ************************************************************************* */ -#include - #include "googletalkcalldialog.h" +#include + GoogleTalkCallDialog::GoogleTalkCallDialog(QWidget *parent): QDialog(parent) { setupUi(this); } diff -Nru kopete-4.12.3/protocols/meanwhile/meanwhileaccount.cpp kopete-4.12.90/protocols/meanwhile/meanwhileaccount.cpp --- kopete-4.12.3/protocols/meanwhile/meanwhileaccount.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/meanwhile/meanwhileaccount.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -15,10 +15,10 @@ * * ************************************************************************* */ +#include "meanwhileaccount.h" #include #include "meanwhileprotocol.h" #include "meanwhileplugin.h" -#include "meanwhileaccount.h" #include "meanwhilecontact.h" #include "meanwhilesession.h" #include "kopetechatsession.h" diff -Nru kopete-4.12.3/protocols/meanwhile/meanwhilecontact.cpp kopete-4.12.90/protocols/meanwhile/meanwhilecontact.cpp --- kopete-4.12.3/protocols/meanwhile/meanwhilecontact.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/meanwhile/meanwhilecontact.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -15,6 +15,8 @@ ************************************************************************* */ +#include "meanwhilecontact.h" + #include #include #include @@ -27,7 +29,6 @@ #include "meanwhileprotocol.h" #include "meanwhilesession.h" #include "meanwhileaccount.h" -#include "meanwhilecontact.h" #include "meanwhileplugin.h" MeanwhileContact::MeanwhileContact(QString userId, QString nickname, diff -Nru kopete-4.12.3/protocols/meanwhile/meanwhileeditaccountwidget.cpp kopete-4.12.90/protocols/meanwhile/meanwhileeditaccountwidget.cpp --- kopete-4.12.3/protocols/meanwhile/meanwhileeditaccountwidget.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/meanwhile/meanwhileeditaccountwidget.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -14,6 +14,8 @@ * * ************************************************************************* */ +#include "meanwhileeditaccountwidget.h" + #include #include #include @@ -22,7 +24,6 @@ #include "meanwhileprotocol.h" #include "meanwhileaccount.h" -#include "meanwhileeditaccountwidget.h" #include "meanwhilesession.h" #define DEFAULT_SERVER "messaging.opensource.ibm.com" diff -Nru kopete-4.12.3/protocols/meanwhile/meanwhileeditaccountwidget.h kopete-4.12.90/protocols/meanwhile/meanwhileeditaccountwidget.h --- kopete-4.12.3/protocols/meanwhile/meanwhileeditaccountwidget.h 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/meanwhile/meanwhileeditaccountwidget.h 2014-03-04 05:59:24.000000000 +0000 @@ -23,6 +23,8 @@ namespace Kopete { class Account; } +class MeanwhileProtocol; + class MeanwhileEditAccountWidget : public QWidget, public KopeteEditAccountWidget diff -Nru kopete-4.12.3/protocols/meanwhile/meanwhileplugin.cpp kopete-4.12.90/protocols/meanwhile/meanwhileplugin.cpp --- kopete-4.12.3/protocols/meanwhile/meanwhileplugin.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/meanwhile/meanwhileplugin.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -14,9 +14,9 @@ * * ************************************************************************* */ +#include "meanwhileplugin.h" #include #include -#include "meanwhileplugin.h" void MeanwhilePlugin::getMeanwhileId(QWidget * /*parent*/, QLineEdit * /*fillThis*/) diff -Nru kopete-4.12.3/protocols/meanwhile/meanwhilesession.cpp kopete-4.12.90/protocols/meanwhile/meanwhilesession.cpp --- kopete-4.12.3/protocols/meanwhile/meanwhilesession.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/meanwhile/meanwhilesession.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -16,6 +16,8 @@ ************************************************************************* */ +#include "meanwhilesession.h" + #include #include #include @@ -27,7 +29,6 @@ #include #include #include -#include "meanwhilesession.h" #include "meanwhileprotocol.h" #include diff -Nru kopete-4.12.3/protocols/oscar/aim/aimaccount.cpp kopete-4.12.90/protocols/oscar/aim/aimaccount.cpp --- kopete-4.12.3/protocols/oscar/aim/aimaccount.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/oscar/aim/aimaccount.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -13,6 +13,8 @@ ************************************************************************* */ +#include "aimaccount.h" + #include #include @@ -35,7 +37,6 @@ #include "kopeteview.h" #include "aimprotocol.h" -#include "aimaccount.h" #include "aimchatsession.h" #include "aimcontact.h" #include "icqcontact.h" diff -Nru kopete-4.12.3/protocols/oscar/aim/aimchatsession.cpp kopete-4.12.90/protocols/oscar/aim/aimchatsession.cpp --- kopete-4.12.3/protocols/oscar/aim/aimchatsession.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/oscar/aim/aimchatsession.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -17,9 +17,10 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA // 02110-1301, USA. +#include "aimchatsession.h" + #include -#include "aimchatsession.h" #include "kopetecontact.h" #include "kopetechatsessionmanager.h" #include "kopeteprotocol.h" diff -Nru kopete-4.12.3/protocols/oscar/aim/aimprotocol.cpp kopete-4.12.90/protocols/oscar/aim/aimprotocol.cpp --- kopete-4.12.3/protocols/oscar/aim/aimprotocol.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/oscar/aim/aimprotocol.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -15,9 +15,10 @@ ************************************************************************* */ +#include "aimprotocol.h" + #include -#include "aimprotocol.h" #include "aimaccount.h" #include "aimstatusmanager.h" #include "aimaddcontactpage.h" diff -Nru kopete-4.12.3/protocols/oscar/aim/ui/aimaddcontactpage.cpp kopete-4.12.90/protocols/oscar/aim/ui/aimaddcontactpage.cpp --- kopete-4.12.3/protocols/oscar/aim/ui/aimaddcontactpage.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/oscar/aim/ui/aimaddcontactpage.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#include "ui_aimaddcontactui.h" #include "aimaddcontactpage.h" +#include "ui_aimaddcontactui.h" #include "kopeteaccount.h" diff -Nru kopete-4.12.3/protocols/oscar/aim/ui/aimeditaccountui.ui kopete-4.12.90/protocols/oscar/aim/ui/aimeditaccountui.ui --- kopete-4.12.3/protocols/oscar/aim/ui/aimeditaccountui.ui 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/oscar/aim/ui/aimeditaccountui.ui 2014-03-04 05:59:24.000000000 +0000 @@ -36,7 +36,7 @@ 0 - + &Basic Setup @@ -241,7 +241,7 @@ - + Accou&nt Preferences @@ -637,7 +637,7 @@ - + Pri&vacy @@ -741,7 +741,7 @@ - + Visible @@ -807,7 +807,7 @@ - + Invisible diff -Nru kopete-4.12.3/protocols/oscar/aim/ui/aimeditaccountwidget.cpp kopete-4.12.90/protocols/oscar/aim/ui/aimeditaccountwidget.cpp --- kopete-4.12.3/protocols/oscar/aim/ui/aimeditaccountwidget.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/oscar/aim/ui/aimeditaccountwidget.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -118,8 +118,8 @@ if ( !mAccount || !mAccount->engine()->isActive() ) { - mGui->tabVisible->setEnabled( false ); - mGui->tabInvisible->setEnabled( false ); + mGui->visibleTab->setEnabled( false ); + mGui->invisibleTab->setEnabled( false ); } /* Set tab order to password custom widget correctly */ diff -Nru kopete-4.12.3/protocols/oscar/icq/icqaccount.cpp kopete-4.12.90/protocols/oscar/icq/icqaccount.cpp --- kopete-4.12.3/protocols/oscar/icq/icqaccount.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/oscar/icq/icqaccount.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -15,6 +15,8 @@ ************************************************************************* */ +#include "icqaccount.h" + #include #include #include @@ -41,7 +43,6 @@ #include "icqcontact.h" #include "aimcontact.h" #include "icqprotocol.h" -#include "icqaccount.h" #include "icquserinfowidget.h" #include "oscarstatusmanager.h" #include "oscarpresencesdataclasses.h" diff -Nru kopete-4.12.3/protocols/oscar/icq/icqprotocol.cpp kopete-4.12.90/protocols/oscar/icq/icqprotocol.cpp --- kopete-4.12.3/protocols/oscar/icq/icqprotocol.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/oscar/icq/icqprotocol.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -16,6 +16,8 @@ ************************************************************************* */ +#include "icqprotocol.h" + #include #include @@ -33,7 +35,6 @@ #include "icqaddcontactpage.h" #include "icqeditaccountwidget.h" -#include "icqprotocol.h" #include "icqstatusmanager.h" K_PLUGIN_FACTORY( ICQProtocolFactory, registerPlugin(); ) diff -Nru kopete-4.12.3/protocols/oscar/liboscar/rateclassmanager.cpp kopete-4.12.90/protocols/oscar/liboscar/rateclassmanager.cpp --- kopete-4.12.3/protocols/oscar/liboscar/rateclassmanager.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/oscar/liboscar/rateclassmanager.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -16,11 +16,12 @@ ************************************************************************* */ +#include "rateclassmanager.h" + #include #include -#include "rateclassmanager.h" #include "transfer.h" #include "connection.h" #include "rateclass.h" diff -Nru kopete-4.12.3/protocols/oscar/liboscar/tasks/ssiactivatetask.cpp kopete-4.12.90/protocols/oscar/liboscar/tasks/ssiactivatetask.cpp --- kopete-4.12.3/protocols/oscar/liboscar/tasks/ssiactivatetask.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/oscar/liboscar/tasks/ssiactivatetask.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -16,8 +16,8 @@ ************************************************************************* */ -#include #include "ssiactivatetask.h" +#include #include "connection.h" #include "buffer.h" #include "oscartypes.h" diff -Nru kopete-4.12.3/protocols/oscar/liboscar/tasks/task.cpp kopete-4.12.90/protocols/oscar/liboscar/tasks/task.cpp --- kopete-4.12.3/protocols/oscar/liboscar/tasks/task.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/oscar/liboscar/tasks/task.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -17,6 +17,8 @@ ************************************************************************* */ +#include "task.h" + #include #include #include @@ -25,8 +27,6 @@ #include "transfer.h" #include "safedelete.h" #include "buffer.h" -#include "task.h" - class Task::TaskPrivate { diff -Nru kopete-4.12.3/protocols/oscar/liboscar/tests/buffertest.cpp kopete-4.12.90/protocols/oscar/liboscar/tests/buffertest.cpp --- kopete-4.12.3/protocols/oscar/liboscar/tests/buffertest.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/oscar/liboscar/tests/buffertest.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -1,5 +1,5 @@ -#include #include "buffertest.h" +#include #include "buffer.h" QTEST_MAIN(BufferTest) diff -Nru kopete-4.12.3/protocols/oscar/liboscar/tests/guidtest.cpp kopete-4.12.90/protocols/oscar/liboscar/tests/guidtest.cpp --- kopete-4.12.3/protocols/oscar/liboscar/tests/guidtest.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/oscar/liboscar/tests/guidtest.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -1,6 +1,6 @@ -#include #include "guidtest.h" +#include #include "oscarguid.h" QTEST_MAIN( GuidTest ) diff -Nru kopete-4.12.3/protocols/oscar/liboscar/userdetails.cpp kopete-4.12.90/protocols/oscar/liboscar/userdetails.cpp --- kopete-4.12.3/protocols/oscar/liboscar/userdetails.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/oscar/liboscar/userdetails.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -15,12 +15,12 @@ * * ************************************************************************* */ +#include "userdetails.h" #include #include #include #include #include -#include "userdetails.h" #include "buffer.h" #include "oscarutils.h" #include "oscardebug.h" diff -Nru kopete-4.12.3/protocols/oscar/oscarencodingselectiondialog.cpp kopete-4.12.90/protocols/oscar/oscarencodingselectiondialog.cpp --- kopete-4.12.3/protocols/oscar/oscarencodingselectiondialog.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/oscar/oscarencodingselectiondialog.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -17,8 +17,8 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA // 02110-1301, USA. -#include "ui_oscarencodingselectionbase.h" #include "oscarencodingselectiondialog.h" +#include "ui_oscarencodingselectionbase.h" #include #include diff -Nru kopete-4.12.3/protocols/oscar/oscarmyselfcontact.cpp kopete-4.12.90/protocols/oscar/oscarmyselfcontact.cpp --- kopete-4.12.3/protocols/oscar/oscarmyselfcontact.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/oscar/oscarmyselfcontact.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -14,6 +14,8 @@ ************************************************************************* */ +#include "oscarmyselfcontact.h" + #include #include "kopetecontactlist.h" @@ -21,8 +23,6 @@ #include "oscartypes.h" #include "oscaraccount.h" -#include "oscarmyselfcontact.h" - OscarMyselfContact::OscarMyselfContact( OscarAccount* account ) : Kopete::Contact( account, account->accountId(), Kopete::ContactList::self()->myself() ) diff -Nru kopete-4.12.3/protocols/skype/libskype/skypewindow.cpp kopete-4.12.90/protocols/skype/libskype/skypewindow.cpp --- kopete-4.12.3/protocols/skype/libskype/skypewindow.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/skype/libskype/skypewindow.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -13,6 +13,8 @@ ************************************************************************* */ +#include "skypewindow.h" + #include #include #include @@ -31,8 +33,6 @@ #include #include -#include "skypewindow.h" - class SkypeWindowPrivate { public: diff -Nru kopete-4.12.3/protocols/skype/skypebuttons/qtbrowserplugin/qtbrowserplugin.cpp kopete-4.12.90/protocols/skype/skypebuttons/qtbrowserplugin/qtbrowserplugin.cpp --- kopete-4.12.3/protocols/skype/skypebuttons/qtbrowserplugin/qtbrowserplugin.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/skype/skypebuttons/qtbrowserplugin/qtbrowserplugin.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -20,11 +20,12 @@ ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. ** ****************************************************************************/ +#include "qtbrowserplugin.h" + #include #include "qtnpapi.h" -#include "qtbrowserplugin.h" #include "qtbrowserplugin_p.h" #ifndef WINAPI diff -Nru kopete-4.12.3/protocols/skype/skypebuttons/qtbrowserplugin/qtbrowserplugin.h kopete-4.12.90/protocols/skype/skypebuttons/qtbrowserplugin/qtbrowserplugin.h --- kopete-4.12.3/protocols/skype/skypebuttons/qtbrowserplugin/qtbrowserplugin.h 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/skype/skypebuttons/qtbrowserplugin/qtbrowserplugin.h 2014-03-04 05:59:24.000000000 +0000 @@ -27,6 +27,7 @@ #include #include #include +#include struct QtNPInstance; diff -Nru kopete-4.12.3/protocols/skype/ui/skypeeditaccountbase.ui kopete-4.12.90/protocols/skype/ui/skypeeditaccountbase.ui --- kopete-4.12.3/protocols/skype/ui/skypeeditaccountbase.ui 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/skype/ui/skypeeditaccountbase.ui 2014-03-04 05:59:24.000000000 +0000 @@ -16,7 +16,7 @@ 0 - + &Basic Setup @@ -107,7 +107,7 @@ - + Lau&nch @@ -305,7 +305,7 @@ - + C&onnection @@ -399,7 +399,7 @@ - + &Activity @@ -651,7 +651,7 @@ - + &Calls diff -Nru kopete-4.12.3/protocols/wlm/wlmchatsessioninkaction.cpp kopete-4.12.90/protocols/wlm/wlmchatsessioninkaction.cpp --- kopete-4.12.3/protocols/wlm/wlmchatsessioninkaction.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/wlm/wlmchatsessioninkaction.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -14,6 +14,8 @@ ************************************************************************* */ +#include "wlmchatsessioninkaction.h" + #include #include @@ -21,7 +23,6 @@ #include #include "wlmchatsessioninkarea.h" -#include "wlmchatsessioninkaction.h" #include "ui_wlmchatsessioninkpopup.h" class WlmChatSessionInkAction::WlmChatSessionInkActionPrivate diff -Nru kopete-4.12.3/protocols/wlm/wlmchatsessioninkarea.cpp kopete-4.12.90/protocols/wlm/wlmchatsessioninkarea.cpp --- kopete-4.12.3/protocols/wlm/wlmchatsessioninkarea.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/wlm/wlmchatsessioninkarea.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -14,6 +14,8 @@ ************************************************************************* */ +#include "wlmchatsessioninkarea.h" + #include #include #include @@ -24,7 +26,6 @@ #include #include -#include "wlmchatsessioninkarea.h" #include WlmChatSessionInkArea::WlmChatSessionInkArea(QWidget * parent) diff -Nru kopete-4.12.3/protocols/yahoo/libkyahoo/client.cpp kopete-4.12.90/protocols/yahoo/libkyahoo/client.cpp --- kopete-4.12.3/protocols/yahoo/libkyahoo/client.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/yahoo/libkyahoo/client.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -19,6 +19,8 @@ ************************************************************************* */ +#include "client.h" + #include #include @@ -54,7 +56,6 @@ #include "filetransfernotifiertask.h" #include "receivefiletask.h" #include "yahoochattask.h" -#include "client.h" #include "yahootypes.h" #include "yahoobuddyiconloader.h" diff -Nru kopete-4.12.3/protocols/yahoo/libkyahoo/coreprotocol.cpp kopete-4.12.90/protocols/yahoo/libkyahoo/coreprotocol.cpp --- kopete-4.12.3/protocols/yahoo/libkyahoo/coreprotocol.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/yahoo/libkyahoo/coreprotocol.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -19,6 +19,8 @@ ************************************************************************* */ +#include "coreprotocol.h" + #include #include @@ -31,7 +33,6 @@ #include #include -#include "coreprotocol.h" #include "ymsgprotocol.h" #include "ymsgtransfer.h" diff -Nru kopete-4.12.3/protocols/yahoo/libkyahoo/listtask.cpp kopete-4.12.90/protocols/yahoo/libkyahoo/listtask.cpp --- kopete-4.12.3/protocols/yahoo/libkyahoo/listtask.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/yahoo/libkyahoo/listtask.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -14,10 +14,11 @@ ************************************************************************* */ +#include "listtask.h" + #include #include -#include "listtask.h" #include "transfer.h" #include "ymsgtransfer.h" #include "client.h" diff -Nru kopete-4.12.3/protocols/yahoo/libkyahoo/mailnotifiertask.cpp kopete-4.12.90/protocols/yahoo/libkyahoo/mailnotifiertask.cpp --- kopete-4.12.3/protocols/yahoo/libkyahoo/mailnotifiertask.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/yahoo/libkyahoo/mailnotifiertask.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -14,9 +14,10 @@ ************************************************************************* */ +#include "mailnotifiertask.h" + #include -#include "mailnotifiertask.h" #include "transfer.h" #include "ymsgtransfer.h" #include "yahootypes.h" diff -Nru kopete-4.12.3/protocols/yahoo/libkyahoo/messagereceivertask.cpp kopete-4.12.90/protocols/yahoo/libkyahoo/messagereceivertask.cpp --- kopete-4.12.3/protocols/yahoo/libkyahoo/messagereceivertask.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/yahoo/libkyahoo/messagereceivertask.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -14,9 +14,10 @@ ************************************************************************* */ +#include "messagereceivertask.h" + #include -#include "messagereceivertask.h" #include "transfer.h" #include "ymsgtransfer.h" #include "yahootypes.h" diff -Nru kopete-4.12.3/protocols/yahoo/libkyahoo/task.cpp kopete-4.12.90/protocols/yahoo/libkyahoo/task.cpp --- kopete-4.12.3/protocols/yahoo/libkyahoo/task.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/yahoo/libkyahoo/task.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -17,14 +17,14 @@ ************************************************************************* */ +#include "task.h" + #include #include "client.h" #include "transfer.h" #include "safedelete.h" -#include "task.h" - using namespace KYahoo; class Task::TaskPrivate diff -Nru kopete-4.12.3/protocols/yahoo/libkyahoo/yahoobytestream.cpp kopete-4.12.90/protocols/yahoo/libkyahoo/yahoobytestream.cpp --- kopete-4.12.3/protocols/yahoo/libkyahoo/yahoobytestream.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/yahoo/libkyahoo/yahoobytestream.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -15,13 +15,13 @@ ************************************************************************* */ +#include "yahoobytestream.h" + #include #include #include #include -#include "yahoobytestream.h" - KNetworkByteStream::KNetworkByteStream( QObject *parent ) : ByteStream ( parent ) { diff -Nru kopete-4.12.3/protocols/yahoo/libkyahoo/yahooclientstream.cpp kopete-4.12.90/protocols/yahoo/libkyahoo/yahooclientstream.cpp --- kopete-4.12.3/protocols/yahoo/libkyahoo/yahooclientstream.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/yahoo/libkyahoo/yahooclientstream.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -19,6 +19,7 @@ */ +#include "yahooclientstream.h" #include // for qdebug #include @@ -33,7 +34,6 @@ #include "coreprotocol.h" #include "transfer.h" -#include "yahooclientstream.h" #include "yahootypes.h" void cs_dump( const QByteArray &bytes ); diff -Nru kopete-4.12.3/protocols/yahoo/libkyahoo/yahooconnector.cpp kopete-4.12.90/protocols/yahoo/libkyahoo/yahooconnector.cpp --- kopete-4.12.3/protocols/yahoo/libkyahoo/yahooconnector.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/yahoo/libkyahoo/yahooconnector.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -17,11 +17,12 @@ * * ***************************************************************************/ +#include "yahooconnector.h" + #include #include #include -#include "yahooconnector.h" #include "yahoobytestream.h" #include "yahootypes.h" diff -Nru kopete-4.12.3/protocols/yahoo/libkyahoo/ymsgprotocol.cpp kopete-4.12.90/protocols/yahoo/libkyahoo/ymsgprotocol.cpp --- kopete-4.12.3/protocols/yahoo/libkyahoo/ymsgprotocol.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/yahoo/libkyahoo/ymsgprotocol.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -16,6 +16,8 @@ ************************************************************************* */ +#include "ymsgprotocol.h" + #include #include #include @@ -23,7 +25,6 @@ #include -#include "ymsgprotocol.h" #include "ymsgtransfer.h" #include "yahootypes.h" diff -Nru kopete-4.12.3/protocols/yahoo/libkyahoo/ymsgtransfer.cpp kopete-4.12.90/protocols/yahoo/libkyahoo/ymsgtransfer.cpp --- kopete-4.12.3/protocols/yahoo/libkyahoo/ymsgtransfer.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/yahoo/libkyahoo/ymsgtransfer.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -18,9 +18,10 @@ ************************************************************************* */ +#include "ymsgtransfer.h" + #include -#include "ymsgtransfer.h" #include "yahootypes.h" #include "kdebug.h" diff -Nru kopete-4.12.3/protocols/yahoo/ui/yahoochatselectordialog.cpp kopete-4.12.90/protocols/yahoo/ui/yahoochatselectordialog.cpp --- kopete-4.12.3/protocols/yahoo/ui/yahoochatselectordialog.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/yahoo/ui/yahoochatselectordialog.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -14,6 +14,8 @@ ************************************************************************* */ +#include "yahoochatselectordialog.h" + #include #include #include @@ -21,7 +23,6 @@ #include #include "ui_yahoochatselectorwidgetbase.h" -#include "yahoochatselectordialog.h" YahooChatSelectorDialog::YahooChatSelectorDialog( QWidget *parent ) : KDialog( parent ) diff -Nru kopete-4.12.3/protocols/yahoo/ui/yahoochatselectordialog.h kopete-4.12.90/protocols/yahoo/ui/yahoochatselectordialog.h --- kopete-4.12.3/protocols/yahoo/ui/yahoochatselectordialog.h 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/yahoo/ui/yahoochatselectordialog.h 2014-03-04 05:59:24.000000000 +0000 @@ -18,6 +18,7 @@ #ifndef YAHOOCHATSELECTORDIALOG_H #define YAHOOCHATSELECTORDIALOG_H +#include #include #include "yahootypes.h" diff -Nru kopete-4.12.3/protocols/yahoo/yahooaccount.cpp kopete-4.12.90/protocols/yahoo/yahooaccount.cpp --- kopete-4.12.3/protocols/yahoo/yahooaccount.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/yahoo/yahooaccount.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -16,6 +16,9 @@ * * ************************************************************************* */ +// Own Header +#include "yahooaccount.h" + //Standard Header #include #include @@ -58,7 +61,6 @@ #include // Yahoo -#include "yahooaccount.h" #include "yahoocontact.h" #include "yahooconnector.h" #include "yahooclientstream.h" diff -Nru kopete-4.12.3/protocols/yahoo/yahooaddcontact.cpp kopete-4.12.90/protocols/yahoo/yahooaddcontact.cpp --- kopete-4.12.3/protocols/yahoo/yahooaddcontact.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/yahoo/yahooaddcontact.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -15,6 +15,8 @@ * * ************************************************************************* */ +// Own Header +#include "yahooaddcontact.h" // QT Includes #include @@ -30,7 +32,6 @@ // Local Includes #include "ui_yahooadd.h" -#include "yahooaddcontact.h" #include "yahooaccount.h" // Yahoo Add Contact page diff -Nru kopete-4.12.3/protocols/yahoo/yahoochatchatsession.cpp kopete-4.12.90/protocols/yahoo/yahoochatchatsession.cpp --- kopete-4.12.3/protocols/yahoo/yahoochatchatsession.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/yahoo/yahoochatchatsession.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -16,6 +16,8 @@ ************************************************************************* */ +#include "yahoochatchatsession.h" + #include #include #include @@ -26,7 +28,6 @@ #include #include -#include "yahoochatchatsession.h" #include "yahoocontact.h" #include "yahooaccount.h" diff -Nru kopete-4.12.3/protocols/yahoo/yahooconferencemessagemanager.cpp kopete-4.12.90/protocols/yahoo/yahooconferencemessagemanager.cpp --- kopete-4.12.3/protocols/yahoo/yahooconferencemessagemanager.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/yahoo/yahooconferencemessagemanager.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -16,6 +16,8 @@ ************************************************************************* */ +#include "yahooconferencemessagemanager.h" + #include #include #include @@ -30,7 +32,6 @@ #include #include -#include "yahooconferencemessagemanager.h" #include "yahoocontact.h" #include "yahooaccount.h" #include "yahooinvitelistimpl.h" diff -Nru kopete-4.12.3/protocols/yahoo/yahooconferencemessagemanager.h kopete-4.12.90/protocols/yahoo/yahooconferencemessagemanager.h --- kopete-4.12.3/protocols/yahoo/yahooconferencemessagemanager.h 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/yahoo/yahooconferencemessagemanager.h 2014-03-04 05:59:24.000000000 +0000 @@ -19,6 +19,7 @@ #ifndef YAHOOCONFERENCEMESSAGEMANAGER_H #define YAHOOCONFERENCEMESSAGEMANAGER_H +#include #include "kopetechatsession.h" class YahooContact; diff -Nru kopete-4.12.3/protocols/yahoo/yahoocontact.cpp kopete-4.12.90/protocols/yahoo/yahoocontact.cpp --- kopete-4.12.3/protocols/yahoo/yahoocontact.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/yahoo/yahoocontact.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -18,6 +18,9 @@ * * ************************************************************************* */ + +#include "yahoocontact.h" + #include "kopetegroup.h" #include "kopetechatsession.h" #include "kopeteonlinestatus.h" @@ -29,7 +32,6 @@ #include "kopeteavatarmanager.h" // Local Includes -#include "yahoocontact.h" #include "yahooaccount.h" #include "client.h" #include "yahoowebcamdialog.h" diff -Nru kopete-4.12.3/protocols/yahoo/yahooeditaccount.cpp kopete-4.12.90/protocols/yahoo/yahooeditaccount.cpp --- kopete-4.12.3/protocols/yahoo/yahooeditaccount.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/yahoo/yahooeditaccount.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -16,6 +16,9 @@ ************************************************************************* */ +// Own header +#include "yahooeditaccount.h" + // QT Includes #include #include @@ -47,7 +50,6 @@ // Local Includes #include "yahooaccount.h" #include "yahoocontact.h" -#include "yahooeditaccount.h" // Yahoo Add Contact page YahooEditAccount::YahooEditAccount(YahooProtocol *protocol, Kopete::Account *theAccount, QWidget *parent): QWidget(parent), KopeteEditAccountWidget(theAccount) diff -Nru kopete-4.12.3/protocols/yahoo/yahooeditaccount.h kopete-4.12.90/protocols/yahoo/yahooeditaccount.h --- kopete-4.12.3/protocols/yahoo/yahooeditaccount.h 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/yahoo/yahooeditaccount.h 2014-03-04 05:59:24.000000000 +0000 @@ -28,6 +28,7 @@ #include "kopetepasswordwidget.h" // Local Includes +#include "yahooaccount.h" #include "ui_yahooeditaccountbase.h" namespace Kopete { class Account; } diff -Nru kopete-4.12.3/protocols/yahoo/yahooprotocol.cpp kopete-4.12.90/protocols/yahoo/yahooprotocol.cpp --- kopete-4.12.3/protocols/yahoo/yahooprotocol.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/yahoo/yahooprotocol.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -15,6 +15,8 @@ * * ************************************************************************* */ +/* Own Header */ +#include "yahooprotocol.h" /* QT Includes */ @@ -24,7 +26,6 @@ #include /* Local Includes */ -#include "yahooprotocol.h" #include "yahooaccount.h" #include "yahooaddcontact.h" #include "yahooeditaccount.h" diff -Nru kopete-4.12.3/protocols/yahoo/yahooverifyaccount.cpp kopete-4.12.90/protocols/yahoo/yahooverifyaccount.cpp --- kopete-4.12.3/protocols/yahoo/yahooverifyaccount.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/yahoo/yahooverifyaccount.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -13,6 +13,9 @@ ************************************************************************* */ +// Own header +#include "yahooverifyaccount.h" + // QT Includes #include #include @@ -33,7 +36,6 @@ // Local Includes #include "ui_yahooverifyaccountbase.h" -#include "yahooverifyaccount.h" #include "yahooaccount.h" YahooVerifyAccount::YahooVerifyAccount(Kopete::Account *account, QWidget *parent) diff -Nru kopete-4.12.3/protocols/yahoo/yahooverifyaccount.h kopete-4.12.90/protocols/yahoo/yahooverifyaccount.h --- kopete-4.12.3/protocols/yahoo/yahooverifyaccount.h 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/yahoo/yahooverifyaccount.h 2014-03-04 05:59:24.000000000 +0000 @@ -23,6 +23,7 @@ // KDE Includes #include +#include namespace Kopete { class Account; } namespace Ui { class YahooVerifyAccountBase; } diff -Nru kopete-4.12.3/protocols/yahoo/yahoowebcam.cpp kopete-4.12.90/protocols/yahoo/yahoowebcam.cpp --- kopete-4.12.3/protocols/yahoo/yahoowebcam.cpp 2014-02-24 07:26:26.000000000 +0000 +++ kopete-4.12.90/protocols/yahoo/yahoowebcam.cpp 2014-03-04 05:59:24.000000000 +0000 @@ -13,11 +13,12 @@ ************************************************************************* */ +#include "yahoowebcam.h" + #include #include #include "client.h" -#include "yahoowebcam.h" #include "yahooaccount.h" #include "yahoowebcamdialog.h" #ifndef VIDEOSUPPORT_DISABLED