Permalink
Browse files

Reorder includes in the app

  • Loading branch information...
1 parent 997c77c commit 85ef6dfdb8d81a5efb571f9ea59a03ea36285a31 @dschmidt dschmidt committed Nov 3, 2012
View
@@ -19,8 +19,6 @@
#include "AclRegistryImpl.h"
-#include <QThread>
-#include <QVariant>
#include "TomahawkSettings.h"
#include "TomahawkApp.h"
@@ -36,6 +34,9 @@
#include "utils/Logger.h"
+#include <QThread>
+#include <QVariant>
+
ACLRegistryImpl::ACLRegistryImpl( QObject* parent )
: ACLRegistry( parent )
View
@@ -20,6 +20,10 @@
#ifndef TOMAHAWK_ACLREGISTRYIMPL_H
#define TOMAHAWK_ACLREGISTRYIMPL_H
+#include "AclRegistry.h"
+#include "HeadlessCheck.h"
+#include "DllMacro.h"
+
#include <QObject>
#include <QString>
#include <QHash>
@@ -30,10 +34,6 @@
#include <QStringList>
#include <QUuid>
-#include "AclRegistry.h"
-#include "HeadlessCheck.h"
-#include "DllMacro.h"
-
class ACLJobItem;
class ACLRegistryImpl : public ACLRegistry
@@ -59,11 +59,11 @@ public slots:
**/
virtual ACLRegistry::ACL isAuthorizedUser( const QString &dbid, const QString &username, ACLRegistry::ACL globalType = ACLRegistry::NotFound, bool skipEmission = false );
virtual void wipeEntries();
-
+
protected:
virtual void load();
virtual void save();
-
+
#ifndef ENABLE_HEADLESS
void getUserDecision( ACLRegistry::User user, const QString &username );
View
@@ -20,11 +20,6 @@
#include "AudioControls.h"
#include "ui_AudioControls.h"
-#include <QtNetwork/QNetworkReply>
-#include <QtGui/QDropEvent>
-#include <QtGui/QMouseEvent>
-#include <QtGui/QDesktopServices>
-
#include "audio/AudioEngine.h"
#include "playlist/PlaylistView.h"
#include "database/Database.h"
@@ -38,6 +33,11 @@
#include "ViewManager.h"
#include "Source.h"
+#include <QNetworkReply>
+#include <QDropEvent>
+#include <QMouseEvent>
+#include <QDesktopServices>
+
const static int ALLOWED_MAX_DIVERSION = 300;
using namespace Tomahawk;
View
@@ -20,14 +20,14 @@
#ifndef AUDIOCONTROLS_H
#define AUDIOCONTROLS_H
-#include <QtGui/QWidget>
-#include <QtCore/QTimer>
-#include <QtCore/QTimeLine>
-
#include "Result.h"
#include "PlaylistInterface.h"
#include "Query.h"
+#include <QWidget>
+#include <QTimer>
+#include <QTimeLine>
+
class QDropEvent;
class QDragEnterEvent;
class QDragMoveEvent;
View
@@ -73,7 +73,7 @@ SET( tomahawkSourcesGui ${tomahawkSourcesGui}
TomahawkWindow.cpp
LoadXSPFDialog.cpp
SocialWidget.cpp
-
+
widgets/ContainedMenuButton.cpp
widgets/AccountListWidget.cpp
widgets/AccountModelFactoryProxy.cpp
View
@@ -23,6 +23,14 @@
#include "config.h"
#include "TomahawkVersion.h"
+#include "SourceList.h"
+
+#include "accounts/AccountManager.h"
+#include "network/Servent.h"
+#include "sip/SipHandler.h"
+#include "utils/TomahawkUtilsGui.h"
+#include "utils/Logger.h"
+
#include <QLabel>
#include <QTextEdit>
#include <QDialogButtonBox>
@@ -31,14 +39,6 @@
#include <QClipboard>
#include <QDebug>
-#include "accounts/AccountManager.h"
-#include "network/Servent.h"
-#include "SourceList.h"
-
-#include "sip/SipHandler.h"
-#include "utils/TomahawkUtilsGui.h"
-#include "utils/Logger.h"
-
DiagnosticsDialog::DiagnosticsDialog( QWidget *parent )
: QDialog( parent )
View
@@ -17,10 +17,11 @@
*/
#include "LoadXSPFDialog.h"
+#include "ui_LoadXSPFDialog.h"
+
#include "TomahawkSettings.h"
#include "Source.h"
-#include "ui_LoadXSPFDialog.h"
#include <QFileDialog>
LoadXSPFDialog::LoadXSPFDialog( QWidget* parent, Qt::WindowFlags f )
@@ -18,15 +18,14 @@
#include "ResolverConfigDelegate.h"
-// #include "resolversmodel.h"
#include "ExternalResolverGui.h"
+#include "utils/Logger.h"
+
#include <QApplication>
#include <QPainter>
#include <QMouseEvent>
-#include "utils/Logger.h"
-
#define PADDING 4
#define ICONSIZE 24
View
@@ -19,20 +19,21 @@
#include "Scrobbler.h"
-#include <QDir>
-#include <QSettings>
-#include <QCryptographicHash>
-
#include "Artist.h"
#include "Album.h"
+#include "Source.h"
#include "Typedefs.h"
-#include "audio/AudioEngine.h"
#include "TomahawkSettings.h"
+
+#include "audio/AudioEngine.h"
#include "infosystem/InfoSystem.h"
-#include "Source.h"
#include "utils/Logger.h"
+#include <QDir>
+#include <QSettings>
+#include <QCryptographicHash>
+
static QString s_scInfoIdentifier = QString( "SCROBBLER" );
View
@@ -20,16 +20,12 @@
*/
#include "SettingsDialog.h"
-#include "config.h"
+#include "ui_ProxyDialog.h"
+#include "ui_Settings_Accounts.h"
+#include "ui_Settings_Collection.h"
+#include "ui_Settings_Advanced.h"
-#include <QtGui/QDesktopServices>
-#include <QtGui/QFileDialog>
-#include <QtGui/QMessageBox>
-#include <QtNetwork/QNetworkConfiguration>
-#include <QtNetwork/QNetworkProxy>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QSizeGrip>
-#include <QtGui/QToolBar>
+#include "config.h"
#include "AtticaManager.h"
#include "AclRegistry.h"
@@ -48,18 +44,22 @@
#include "accounts/AccountModel.h"
#include "accounts/Account.h"
#include "accounts/AccountManager.h"
-#include <accounts/AccountModelFilterProxy.h>
-#include <accounts/ResolverAccount.h>
+#include "accounts/AccountModelFilterProxy.h"
+#include "accounts/ResolverAccount.h"
#include "utils/Logger.h"
#include "accounts/AccountFactoryWrapper.h"
#include "accounts/spotify/SpotifyAccount.h"
#include "thirdparty/Qocoa/qtoolbartabdialog.h"
#include "thirdparty/Qocoa/qbutton.h"
-#include "ui_ProxyDialog.h"
-#include "ui_Settings_Accounts.h"
-#include "ui_Settings_Collection.h"
-#include "ui_Settings_Advanced.h"
+#include <QDesktopServices>
+#include <QFileDialog>
+#include <QMessageBox>
+#include <QNetworkConfiguration>
+#include <QNetworkProxy>
+#include <QVBoxLayout>
+#include <QSizeGrip>
+#include <QToolBar>
using namespace Tomahawk;
using namespace Accounts;
View
@@ -22,12 +22,10 @@
#ifndef SETTINGSDIALOG_H
#define SETTINGSDIALOG_H
-#include <QtGui/QDialog>
-#include <QtCore/QModelIndex>
-#include <QtGui/QActionGroup>
-#include <QtGui/QToolBar>
-
-#include "config.h"
+#include <QDialog>
+#include <QModelIndex>
+#include <QActionGroup>
+#include <QToolBar>
class AnimatedSpinner;
class QListWidgetItem;
View
@@ -20,14 +20,15 @@
#include "SocialWidget.h"
#include "ui_SocialWidget.h"
-#include <QPainter>
-#include <QDialog>
-#include <QPropertyAnimation>
-
#include "GlobalActionManager.h"
+#include "Source.h"
+
#include "utils/TomahawkUtilsGui.h"
#include "utils/Logger.h"
-#include "Source.h"
+
+#include <QPainter>
+#include <QDialog>
+#include <QPropertyAnimation>
#define ARROW_HEIGHT 6
@@ -67,7 +68,7 @@ SocialWidget::SocialWidget( QWidget* parent )
ui->buttonBox->button( QDialogButtonBox::Cancel )->setIcon( QIcon( RESPATH "images/cancel.png" ) );
ui->textEdit->setStyleSheet( "border: 1px solid " + TomahawkUtils::Colors::BORDER_LINE.name() );
-
+
m_parent->installEventFilter( this );
connect( ui->buttonBox, SIGNAL( accepted() ), SLOT( accept() ) );
@@ -202,7 +203,7 @@ void
SocialWidget::accept()
{
tDebug() << "Sharing social link!";
-
+
QVariantMap shareInfo;
Tomahawk::InfoSystem::InfoStringHash trackInfo;
View
@@ -20,12 +20,12 @@
#ifndef SOCIALWIDGET_H
#define SOCIALWIDGET_H
+#include "Query.h"
+
#include <QWidget>
#include <QAbstractItemView>
#include <QTimer>
-#include "Query.h"
-
namespace Ui
{
class SocialWidget;
@@ -64,7 +64,7 @@ private slots:
void accept();
void onChanged();
void onShortLinkReady( const QUrl& longUrl, const QUrl& shortUrl, const QVariant& callbackObj );
-
+
void onGeometryUpdate();
private:
View
@@ -21,18 +21,6 @@
#include "TomahawkApp.h"
#include "TomahawkVersion.h"
-
-#include <iostream>
-
-#include <QtCore/QPluginLoader>
-#include <QtCore/QDir>
-#include <QtCore/QMetaType>
-#include <QtCore/QTime>
-#include <QtNetwork/QNetworkReply>
-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
-#include <QTranslator>
-
#include "AclRegistryImpl.h"
#include "Album.h"
#include "Artist.h"
@@ -71,8 +59,6 @@
#include "accounts/spotify/SpotifyPlaylistUpdater.h"
#include "utils/TomahawkCache.h"
-#include "config.h"
-
#ifndef ENABLE_HEADLESS
#include "resolvers/QtScriptResolver.h"
#include "resolvers/ScriptResolver.h"
@@ -81,9 +67,14 @@
#include "TomahawkWindow.h"
#include "SettingsDialog.h"
#include "ActionCollection.h"
- #include <QtGui/QMessageBox>
#include "widgets/HeaderLabel.h"
- #include <TomahawkSettingsGui.h>
+ #include "TomahawkSettingsGui.h"
+#endif
+
+#include "config.h"
+
+#ifndef ENABLE_HEADLESS
+ #include <QMessageBox>
#endif
#ifdef Q_WS_MAC
@@ -93,6 +84,18 @@
#include <sys/sysctl.h>
#endif
+#include <QPluginLoader>
+#include <QDir>
+#include <QMetaType>
+#include <QTime>
+#include <QNetworkReply>
+#include <QFile>
+#include <QFileInfo>
+#include <QTranslator>
+
+#include <iostream>
+
+
const char* enApiSecret = "BNvTzfthHr/d1eNhHLvL1Jo=";
void
Oops, something went wrong.

0 comments on commit 85ef6df

Please sign in to comment.