cleanup includes

autotest/snorebenchmark.cpp

@@ -1,11 +1,7 @@
 #include <libsnore/snore.h>
 #include <libsnore/utils.h>
 
-#include <QApplication>
-#include <QDebug>
-
 #include <QTextDocument>
-#include <QTextDocumentFragment>
 
 #include <QtTest>
 

src/daemon/snorenotify.cpp

@@ -23,8 +23,6 @@
 #include <iostream>
 #include <stdlib.h>
 
-#include <QApplication>
-
 using namespace Snore;
 
 SnoreNotify::SnoreNotify()

src/daemon/snorenotify.h

@@ -19,7 +19,9 @@
 #ifndef SNORENOTIFY_H
 #define SNORENOTIFY_H
 
-#include <QSettings>
+#include <QObject>
+
+class TrayIcon;
 
 namespace Snore
 {
@@ -34,7 +36,7 @@ public:
     ~SnoreNotify();
 
 private:
-    class TrayIcon *m_trayIcon;
+    TrayIcon *m_trayIcon;
 };
 
 #endif // SNORENOTIFY_H

src/daemon/trayicon.cpp

@@ -26,7 +26,6 @@
 #include <QDialogButtonBox>
 #include <QMenu>
 #include <QSystemTrayIcon>
-#include <QTimer>
 
 #include "libsnore/version.h"
 

src/libsnore/hint.h

@@ -18,7 +18,6 @@
 #ifndef HINT_H
 #define HINT_H
 
-#include <QObject>
 #include <QVariantHash>
 #include <QDebug>
 

src/libsnore/plugins/plugincontainer.cpp

@@ -25,7 +25,6 @@
 #include "../version.h"
 
 #include <QDir>
-#include <QMetaEnum>
 #include <QApplication>
 #include <QTime>
 

src/libsnore/plugins/pluginsettingswidget.cpp

@@ -20,7 +20,6 @@
 #include "snore.h"
 
 #include <QCheckBox>
-#include <QLabel>
 
 using namespace Snore;
 

src/libsnore/settingsdialog.cpp

@@ -20,9 +20,7 @@
 #include "snore.h"
 #include "snore_p.h"
 
-#include <QAbstractButton>
 #include <QTabWidget>
-#include <QFormLayout>
 #include <QCheckBox>
 
 using namespace Snore;

src/libsnore/settingsdialog.h

@@ -20,17 +20,13 @@
 
 #include "snore_exports.h"
 
-#include <QDialog>
-#include <QScopedPointer>
+#include <QWidget>
 
 class QAbstractButton;
 
 namespace Snore
 {
-class SnoreCore;
 class PluginSettingsWidget;
-class Application;
-class Alert;
 }
 
 namespace Ui

src/libsnore/snore.cpp

@@ -27,6 +27,7 @@
 
 #include "version.h"
 
+#include <QApplication>
 #include <QSettings>
 #include <QThread>
 

src/libsnore/snore.h

@@ -27,7 +27,6 @@
 #include "plugins/plugins.h"
 #include "hint.h"
 
-#include <QSettings>
 #include <QStringList>
 
 /**

src/libsnore/snore_p.cpp

@@ -26,6 +26,7 @@
 #include "version.h"
 
 #include <QApplication>
+#include <QSettings>
 #include <QTemporaryDir>
 #include <QTranslator>
 

src/libsnore/snore_p.h

@@ -25,7 +25,8 @@
 #include "utils.h"
 
 #include <QPointer>
-#include <QApplication>
+
+class QSettings;
 
 namespace Snore
 {

src/libsnore/utils.h

@@ -21,9 +21,8 @@
 #include "snore_exports.h"
 #include "snoreglobals.h"
 
-#include <QApplication>
 #include <QCryptographicHash>
-#include <QSettings>
+#include <QObject>
 
 namespace Snore
 {

src/plugins/backends/freedesktop/fredesktopnotification.cpp

@@ -18,8 +18,8 @@
 
 #include "fredesktopnotification.h"
 
-#include <QImage>
 #include <QDBusMetaType>
+#include <QImage>
 
 int FreedesktopImageHint::imageHintID = qDBusRegisterMetaType<FreedesktopImageHint>();
 

src/plugins/frontends/pushover/pushover_frontend.cpp

@@ -23,13 +23,11 @@
 #include "libsnore/version.h"
 #include "libsnore/notification/notification_p.h"
 
-#include <QNetworkAccessManager>
-#include <QHttpMultiPart>
 #include <QNetworkReply>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonArray>
-#include <QtWebSockets/QWebSocket>
+#include <QtWebSockets>
 
 using namespace Snore;
 

src/plugins/frontends/pushover/pushover_frontend.h

@@ -23,7 +23,8 @@
 
 #include <QNetworkAccessManager>
 #include <QPointer>
-#include <QtWebSockets/QWebSocket>
+
+class QWebSocket;
 
 class PushoverFrontend : public Snore::SnoreFrontend
 {

src/plugins/secondary_backends/nma/nma.cpp

@@ -20,7 +20,6 @@
 
 #include"libsnore/utils.h"
 
-#include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QNetworkRequest>
 

src/plugins/secondary_backends/pushover/pushover.cpp

@@ -20,7 +20,6 @@
 
 #include"libsnore/utils.h"
 
-#include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QNetworkRequest>
 #include <QHttpMultiPart>

src/plugins/secondary_backends/toasty/toasty.cpp

@@ -19,7 +19,6 @@
 #include "toastysettings.h"
 #include "libsnore/utils.h"
 
-#include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QNetworkRequest>
 #include <QHttpMultiPart>

src/settings/main.cpp

@@ -6,7 +6,6 @@
 
 #include <QApplication>
 #include <QCommandLineParser>
-#include <QMainWindow>
 
 #include <iostream>
 

src/settings/settingswindow.cpp

@@ -7,7 +7,6 @@
 #include "utils.h"
 
 #include <QApplication>
-#include <QComboBox>
 #include <QDialogButtonBox>
 
 using namespace Snore;

src/settings/settingswindow.h

@@ -23,7 +23,6 @@ public:
 
     static QSettings &settings();
 
-
     template<typename Func>
     static QStringList allSettingsKeysWithPrefix(const QString &prefix, QSettings &settings, Func fun)
     {
@@ -41,7 +40,6 @@ public:
         return out;
     }
 
-
 private Q_SLOTS:
     void on_buttonBox_clicked(QAbstractButton *button);
     void on_comboBox_currentIndexChanged(const QString &arg1);