From ecf0e6725dfa194d6bb281a15897ad21af994c5d Mon Sep 17 00:00:00 2001
From: Dominik Schmidt <dev@dominik-schmidt.de>
Date: Sat, 3 Nov 2012 02:47:32 +0100
Subject: [PATCH] Reorder includes in accounts

---
 src/accounts/twitter/TomahawkOAuthTwitter.cpp |  4 +--
 src/accounts/twitter/TomahawkOAuthTwitter.h   |  2 +-
 src/accounts/twitter/TwitterAccount.cpp       |  1 -
 src/accounts/twitter/TwitterConfigWidget.cpp  |  2 +-
 src/accounts/twitter/TwitterInfoPlugin.cpp    |  6 ++--
 src/accounts/twitter/sip/TwitterSip.cpp       | 32 +++++++++----------
 src/accounts/twitter/sip/TwitterSip.h         | 15 +++++----
 src/accounts/xmpp/XmppAccount.cpp             |  2 +-
 src/accounts/xmpp/XmppConfigWidget.cpp        |  7 ++--
 src/accounts/xmpp/sip/AvatarManager.cpp       |  3 +-
 src/accounts/xmpp/sip/AvatarManager.h         |  4 +--
 .../xmpp/sip/TomahawkXmppMessageFactory.cpp   |  3 +-
 src/accounts/xmpp/sip/XmlConsole.cpp          |  4 +--
 src/accounts/xmpp/sip/XmlConsole.h            |  8 ++---
 src/accounts/xmpp/sip/XmppSip.cpp             | 31 +++++++++---------
 src/accounts/xmpp/sip/XmppSip.h               |  9 +++---
 src/accounts/zeroconf/TomahawkZeroconf.h      | 10 +++---
 src/accounts/zeroconf/Zeroconf.cpp            |  7 ++--
 src/accounts/zeroconf/ZeroconfAccount.cpp     |  2 +-
 19 files changed, 76 insertions(+), 76 deletions(-)

diff --git a/src/accounts/twitter/TomahawkOAuthTwitter.cpp b/src/accounts/twitter/TomahawkOAuthTwitter.cpp
index fd2b2cf72..243129fd7 100644
--- a/src/accounts/twitter/TomahawkOAuthTwitter.cpp
+++ b/src/accounts/twitter/TomahawkOAuthTwitter.cpp
@@ -20,10 +20,10 @@
 
 #include "TomahawkOAuthTwitter.h"
 
-#include <QtGui/QInputDialog>
-
 #include "utils/Logger.h"
 
+#include <QInputDialog>
+
 
 TomahawkOAuthTwitter::TomahawkOAuthTwitter( QNetworkAccessManager *nam, QObject* parent )
     : OAuthTwitter( QByteArray::fromBase64( "QzR2NFdmYTIxcmZJRGNrNEhNUjNB" ), QByteArray::fromBase64( "elhTalU2Ympydmc2VVZNSlg0SnVmcUh5amozaWV4dFkxNFNSOXVCRUFv" ), parent )
diff --git a/src/accounts/twitter/TomahawkOAuthTwitter.h b/src/accounts/twitter/TomahawkOAuthTwitter.h
index 2203f8a16..4270a89a2 100644
--- a/src/accounts/twitter/TomahawkOAuthTwitter.h
+++ b/src/accounts/twitter/TomahawkOAuthTwitter.h
@@ -21,7 +21,7 @@
 #define TOMAHAWKOAUTHTWITTERACCOUNT
 
 #include "accounts/AccountDllMacro.h"
-#include <utils/TomahawkUtils.h>
+#include "utils/TomahawkUtils.h"
 
 #include <QTweetLib/qtweetlib_global.h>
 #include <QTweetLib/oauthtwitter.h>
diff --git a/src/accounts/twitter/TwitterAccount.cpp b/src/accounts/twitter/TwitterAccount.cpp
index 527959b48..cd6859f17 100644
--- a/src/accounts/twitter/TwitterAccount.cpp
+++ b/src/accounts/twitter/TwitterAccount.cpp
@@ -22,7 +22,6 @@
 #include "TwitterConfigWidget.h"
 #include "accounts/twitter/TomahawkOAuthTwitter.h"
 #include "libtomahawk/infosystem/InfoSystem.h"
-
 #include "sip/SipPlugin.h"
 
 #include <QTweetLib/qtweetaccountverifycredentials.h>
diff --git a/src/accounts/twitter/TwitterConfigWidget.cpp b/src/accounts/twitter/TwitterConfigWidget.cpp
index c3a40a737..d6e025f11 100644
--- a/src/accounts/twitter/TwitterConfigWidget.cpp
+++ b/src/accounts/twitter/TwitterConfigWidget.cpp
@@ -26,8 +26,8 @@
 #include "database/Database.h"
 #include "database/DatabaseImpl.h"
 #include "Source.h"
-
 #include "TomahawkOAuthTwitter.h"
+
 #include <QTweetLib/qtweetaccountverifycredentials.h>
 #include <QTweetLib/qtweetstatusupdate.h>
 #include <QTweetLib/qtweetdirectmessagenew.h>
diff --git a/src/accounts/twitter/TwitterInfoPlugin.cpp b/src/accounts/twitter/TwitterInfoPlugin.cpp
index add608f33..a77846f48 100644
--- a/src/accounts/twitter/TwitterInfoPlugin.cpp
+++ b/src/accounts/twitter/TwitterInfoPlugin.cpp
@@ -22,13 +22,13 @@
 
 #include "accounts/twitter/TwitterAccount.h"
 
-#include <QTweetLib/qtweetaccountverifycredentials.h>
-#include <QTweetLib/qtweetstatusupdate.h>
-
 #include "GlobalActionManager.h"
 #include "utils/Logger.h"
 #include "Source.h"
 
+#include <QTweetLib/qtweetaccountverifycredentials.h>
+#include <QTweetLib/qtweetstatusupdate.h>
+
 namespace Tomahawk
 {
 
diff --git a/src/accounts/twitter/sip/TwitterSip.cpp b/src/accounts/twitter/sip/TwitterSip.cpp
index 98af45ba1..8c59e6a5e 100644
--- a/src/accounts/twitter/sip/TwitterSip.cpp
+++ b/src/accounts/twitter/sip/TwitterSip.cpp
@@ -20,6 +20,22 @@
 
 #include "TwitterSip.h"
 
+#include "utils/TomahawkUtils.h"
+#include "TomahawkSettings.h"
+#include "database/Database.h"
+#include "database/DatabaseImpl.h"
+#include "network/Servent.h"
+#include "Source.h"
+
+#include "utils/Logger.h"
+#include "accounts/twitter/TomahawkOAuthTwitter.h"
+#include "accounts/twitter/TwitterAccount.h"
+
+#include <QTweetLib/qtweetaccountverifycredentials.h>
+#include <QTweetLib/qtweetuser.h>
+#include <QTweetLib/qtweetstatus.h>
+#include <QTweetLib/qtweetusershow.h>
+
 #include <QtPlugin>
 #include <QDateTime>
 #include <QRegExp>
@@ -28,22 +44,6 @@
 #include <QNetworkReply>
 #include <QStringList>
 
-#include <QTweetLib/qtweetaccountverifycredentials.h>
-#include <QTweetLib/qtweetuser.h>
-#include <QTweetLib/qtweetstatus.h>
-#include <QTweetLib/qtweetusershow.h>
-
-#include <utils/TomahawkUtils.h>
-#include <TomahawkSettings.h>
-#include <database/Database.h>
-#include <database/DatabaseImpl.h>
-#include <network/Servent.h>
-#include "Source.h"
-
-#include "utils/Logger.h"
-#include "accounts/twitter/TomahawkOAuthTwitter.h"
-#include <accounts/twitter/TwitterAccount.h>
-
 static QString s_gotTomahawkRegex = QString( "^(@[a-zA-Z0-9]+ )?(Got Tomahawk\\?) (\\{[a-fA-F0-9\\-]+\\}) (.*)$" );
 
 TwitterSipPlugin::TwitterSipPlugin( Tomahawk::Accounts::Account* account )
diff --git a/src/accounts/twitter/sip/TwitterSip.h b/src/accounts/twitter/sip/TwitterSip.h
index 7b4e0c90e..325a76181 100644
--- a/src/accounts/twitter/sip/TwitterSip.h
+++ b/src/accounts/twitter/sip/TwitterSip.h
@@ -21,9 +21,10 @@
 #ifndef TWITTER_H
 #define TWITTER_H
 
-#include <QTimer>
-#include <QWeakPointer>
-#include <QSet>
+#include "accounts/AccountDllMacro.h"
+#include "sip/SipPlugin.h"
+#include "accounts/Account.h"
+#include "accounts/twitter/TomahawkOAuthTwitter.h"
 
 #include <QTweetLib/qtweetuser.h>
 #include <QTweetLib/qtweetnetbase.h>
@@ -34,10 +35,10 @@
 #include <QTweetLib/qtweetmentions.h>
 #include <QTweetLib/qtweetdmstatus.h>
 
-#include "accounts/AccountDllMacro.h"
-#include "sip/SipPlugin.h"
-#include "accounts/Account.h"
-#include "accounts/twitter/TomahawkOAuthTwitter.h"
+#include <QTimer>
+#include <QWeakPointer>
+#include <QSet>
+
 
 class ACCOUNTDLLEXPORT TwitterSipPlugin : public SipPlugin
 {
diff --git a/src/accounts/xmpp/XmppAccount.cpp b/src/accounts/xmpp/XmppAccount.cpp
index 65e4287be..d6ee0cf94 100644
--- a/src/accounts/xmpp/XmppAccount.cpp
+++ b/src/accounts/xmpp/XmppAccount.cpp
@@ -23,7 +23,7 @@
 #include "sip/SipPlugin.h"
 #include "XmppInfoPlugin.h"
 
-#include <QtCore/QtPlugin>
+#include <QtPlugin>
 
 namespace Tomahawk
 {
diff --git a/src/accounts/xmpp/XmppConfigWidget.cpp b/src/accounts/xmpp/XmppConfigWidget.cpp
index e5fb56002..826cecf95 100644
--- a/src/accounts/xmpp/XmppConfigWidget.cpp
+++ b/src/accounts/xmpp/XmppConfigWidget.cpp
@@ -21,10 +21,11 @@
 #include "XmppConfigWidget.h"
 #include "ui_XmppConfigWidget.h"
 
-#include <QMessageBox>
 
-#include <accounts/AccountManager.h>
-#include <utils/Logger.h>
+#include "accounts/AccountManager.h"
+#include "utils/Logger.h"
+
+#include <QMessageBox>
 
 namespace Tomahawk
 {
diff --git a/src/accounts/xmpp/sip/AvatarManager.cpp b/src/accounts/xmpp/sip/AvatarManager.cpp
index 68abbf819..260cfb707 100644
--- a/src/accounts/xmpp/sip/AvatarManager.cpp
+++ b/src/accounts/xmpp/sip/AvatarManager.cpp
@@ -20,6 +20,7 @@
 #include "AvatarManager.h"
 
 #include "utils/TomahawkUtils.h"
+#include "utils/Logger.h"
 
 #include <jreen/vcard.h>
 #include <jreen/vcardupdate.h>
@@ -30,8 +31,6 @@
 #include <QCryptographicHash>
 #include <QPixmap>
 
-#include "utils/Logger.h"
-
 
 AvatarManager::AvatarManager( Jreen::Client* client )
     : m_cacheDir( TomahawkUtils::appDataDir().absolutePath().append( "/jreen/" ) )
diff --git a/src/accounts/xmpp/sip/AvatarManager.h b/src/accounts/xmpp/sip/AvatarManager.h
index a42cee08d..03c4907da 100644
--- a/src/accounts/xmpp/sip/AvatarManager.h
+++ b/src/accounts/xmpp/sip/AvatarManager.h
@@ -22,8 +22,8 @@
 
 #include <jreen/client.h>
 
-#include <QtCore/QObject>
-#include <QtCore/QDir>
+#include <QObject>
+#include <QDir>
 
 #include "accounts/AccountDllMacro.h"
 
diff --git a/src/accounts/xmpp/sip/TomahawkXmppMessageFactory.cpp b/src/accounts/xmpp/sip/TomahawkXmppMessageFactory.cpp
index 79e987c28..5c6a3f81f 100644
--- a/src/accounts/xmpp/sip/TomahawkXmppMessageFactory.cpp
+++ b/src/accounts/xmpp/sip/TomahawkXmppMessageFactory.cpp
@@ -19,11 +19,12 @@
 
 #include "TomahawkXmppMessageFactory.h"
 
+#include "utils/Logger.h"
+
 #include <QStringList>
 #include <QXmlStreamWriter>
 #include <QVariant>
 
-#include "utils/Logger.h"
 
 using namespace Jreen;
 
diff --git a/src/accounts/xmpp/sip/XmlConsole.cpp b/src/accounts/xmpp/sip/XmlConsole.cpp
index d502d2dcc..7d4fe2208 100644
--- a/src/accounts/xmpp/sip/XmlConsole.cpp
+++ b/src/accounts/xmpp/sip/XmlConsole.cpp
@@ -21,6 +21,8 @@
 #include "XmlConsole.h"
 #include "ui_XmlConsole.h"
 
+#include "utils/Logger.h"
+
 #include <QMenu>
 #include <QActionGroup>
 #include <QStringBuilder>
@@ -29,8 +31,6 @@
 #include <QFileDialog>
 #include <QTextDocumentWriter>
 
-#include "utils/Logger.h"
-
 using namespace Jreen;
 
 
diff --git a/src/accounts/xmpp/sip/XmlConsole.h b/src/accounts/xmpp/sip/XmlConsole.h
index 135e8c6a1..1c3bafb89 100644
--- a/src/accounts/xmpp/sip/XmlConsole.h
+++ b/src/accounts/xmpp/sip/XmlConsole.h
@@ -24,10 +24,10 @@
 #include <jreen/client.h>
 #include <jreen/jid.h>
 
-#include <QtGui/QWidget>
-#include <QtXml/QXmlStreamReader>
-#include <QtCore/QDateTime>
-#include <QtGui/QTextBlock>
+#include <QWidget>
+#include <QXmlStreamReader>
+#include <QDateTime>
+#include <QTextBlock>
 
 namespace Ui {
 class XmlConsole;
diff --git a/src/accounts/xmpp/sip/XmppSip.cpp b/src/accounts/xmpp/sip/XmppSip.cpp
index bbe4e7fe2..2c147bb15 100644
--- a/src/accounts/xmpp/sip/XmppSip.cpp
+++ b/src/accounts/xmpp/sip/XmppSip.cpp
@@ -21,11 +21,18 @@
 
 #include "XmppSip.h"
 
-#include "config.h"
 
 #include "TomahawkXmppMessage.h"
 #include "TomahawkXmppMessageFactory.h"
 
+#include "utils/TomahawkUtils.h"
+#include "utils/Logger.h"
+#include "accounts/AccountManager.h"
+#include "TomahawkSettings.h"
+#include "utils/TomahawkUtilsGui.h"
+
+#include "config.h"
+
 #include <jreen/jid.h>
 #include <jreen/capabilities.h>
 #include <jreen/vcardupdate.h>
@@ -40,25 +47,17 @@
 #include <qjson/parser.h>
 #include <qjson/serializer.h>
 
-#include <QtCore/QtPlugin>
-#include <QtCore/QStringList>
-#include <QtCore/QDateTime>
-#include <QtCore/QTimer>
-
-#include <utils/TomahawkUtils.h>
-#include <utils/Logger.h>
-#include <accounts/AccountManager.h>
-#include <TomahawkSettings.h>
+#include <QtPlugin>
+#include <QStringList>
+#include <QDateTime>
+#include <QTimer>
 
 #ifndef ENABLE_HEADLESS
-    #include <QtGui/QInputDialog>
-    #include <QtGui/QLineEdit>
-    #include <QtGui/QMessageBox>
+    #include <QInputDialog>
+    #include <QLineEdit>
+    #include <QMessageBox>
 #endif
 
-#include <utils/TomahawkUtilsGui.h>
-#include "utils/Logger.h"
-
 using namespace Tomahawk;
 using namespace Accounts;
 
diff --git a/src/accounts/xmpp/sip/XmppSip.h b/src/accounts/xmpp/sip/XmppSip.h
index 29218af92..85b3c12b6 100644
--- a/src/accounts/xmpp/sip/XmppSip.h
+++ b/src/accounts/xmpp/sip/XmppSip.h
@@ -30,6 +30,10 @@
     #include "XmlConsole.h"
 #endif
 
+#include "accounts/AccountDllMacro.h"
+
+#include "../XmppInfoPlugin.h"
+
 #include <jreen/client.h>
 #include <jreen/disco.h>
 #include <jreen/message.h>
@@ -45,12 +49,9 @@
 #include <jreen/pubsubmanager.h>
 
 #ifndef ENABLE_HEADLESS
-    #include <QtGui/QMessageBox>
+    #include <QMessageBox>
 #endif
 
-#include "accounts/AccountDllMacro.h"
-
-#include "../XmppInfoPlugin.h"
 
 class ACCOUNTDLLEXPORT XmppSipPlugin : public SipPlugin
 {
diff --git a/src/accounts/zeroconf/TomahawkZeroconf.h b/src/accounts/zeroconf/TomahawkZeroconf.h
index c6526093c..68ba797de 100644
--- a/src/accounts/zeroconf/TomahawkZeroconf.h
+++ b/src/accounts/zeroconf/TomahawkZeroconf.h
@@ -21,6 +21,11 @@
 
 #define ZCONF_PORT 50210
 
+#include "database/Database.h"
+#include "database/DatabaseImpl.h"
+#include "network/Servent.h"
+#include "accounts/AccountDllMacro.h"
+
 #include <QList>
 #include <QHostAddress>
 #include <QHostInfo>
@@ -28,11 +33,6 @@
 #include <QUdpSocket>
 #include <QTimer>
 
-#include "database/Database.h"
-#include "database/DatabaseImpl.h"
-#include "network/Servent.h"
-#include "accounts/AccountDllMacro.h"
-
 class Node : public QObject
 {
 Q_OBJECT
diff --git a/src/accounts/zeroconf/Zeroconf.cpp b/src/accounts/zeroconf/Zeroconf.cpp
index 8d95efe59..d255759bf 100644
--- a/src/accounts/zeroconf/Zeroconf.cpp
+++ b/src/accounts/zeroconf/Zeroconf.cpp
@@ -19,15 +19,14 @@
 
 #include "Zeroconf.h"
 
-#include <QtPlugin>
-
-#include <QtCore/QTimer>
-
 #include "TomahawkSettings.h"
 #include "utils/Logger.h"
 #include "ZeroconfAccount.h"
 #include "Source.h"
 
+#include <QtPlugin>
+#include <QTimer>
+
 using namespace Tomahawk;
 using namespace Accounts;
 
diff --git a/src/accounts/zeroconf/ZeroconfAccount.cpp b/src/accounts/zeroconf/ZeroconfAccount.cpp
index 364022a37..b337b48e1 100644
--- a/src/accounts/zeroconf/ZeroconfAccount.cpp
+++ b/src/accounts/zeroconf/ZeroconfAccount.cpp
@@ -22,7 +22,7 @@
 #include "Zeroconf.h"
 #include "Source.h"
 
-#include <QtCore/QtPlugin>
+#include <QtPlugin>
 
 using namespace Tomahawk;
 using namespace Accounts;