cleanup includes

2025-01-09 16:15:45 +00:00 · 2015-07-05 13:06:21 +02:00 · 2015-07-05 13:06:21 +02:00 · 5857d09085
commit 5857d09085
parent 884363e67f
23 changed files with 14 additions and 35 deletions
--- a/autotest/snorebenchmark.cpp
+++ b/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>

--- a/src/daemon/snorenotify.cpp
+++ b/src/daemon/snorenotify.cpp
@ -23,8 +23,6 @@
 #include <iostream>
 #include <stdlib.h>

-#include <QApplication>
-
 using namespace Snore;

 SnoreNotify::SnoreNotify()
--- a/src/daemon/snorenotify.h
+++ b/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
--- a/src/daemon/trayicon.cpp
+++ b/src/daemon/trayicon.cpp
@ -26,7 +26,6 @@
 #include <QDialogButtonBox>
 #include <QMenu>
 #include <QSystemTrayIcon>
-#include <QTimer>

 #include "libsnore/version.h"

--- a/src/libsnore/hint.h
+++ b/src/libsnore/hint.h
@ -18,7 +18,6 @@
 #ifndef HINT_H
 #define HINT_H

-#include <QObject>
 #include <QVariantHash>
 #include <QDebug>

--- a/src/libsnore/plugins/plugincontainer.cpp
+++ b/src/libsnore/plugins/plugincontainer.cpp
@ -25,7 +25,6 @@
 #include "../version.h"

 #include <QDir>
-#include <QMetaEnum>
 #include <QApplication>
 #include <QTime>

--- a/src/libsnore/plugins/pluginsettingswidget.cpp
+++ b/src/libsnore/plugins/pluginsettingswidget.cpp
@ -20,7 +20,6 @@
 #include "snore.h"

 #include <QCheckBox>
-#include <QLabel>

 using namespace Snore;

--- a/src/libsnore/settingsdialog.cpp
+++ b/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;
--- a/src/libsnore/settingsdialog.h
+++ b/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
--- a/src/libsnore/snore.cpp
+++ b/src/libsnore/snore.cpp
@ -27,6 +27,7 @@

 #include "version.h"

+#include <QApplication>
 #include <QSettings>
 #include <QThread>

--- a/src/libsnore/snore.h
+++ b/src/libsnore/snore.h
@ -27,7 +27,6 @@
 #include "plugins/plugins.h"
 #include "hint.h"

-#include <QSettings>
 #include <QStringList>

 /**
--- a/src/libsnore/snore_p.cpp
+++ b/src/libsnore/snore_p.cpp
@ -26,6 +26,7 @@
 #include "version.h"

 #include <QApplication>
+#include <QSettings>
 #include <QTemporaryDir>
 #include <QTranslator>

--- a/src/libsnore/snore_p.h
+++ b/src/libsnore/snore_p.h
@ -25,7 +25,8 @@
 #include "utils.h"

 #include <QPointer>
-#include <QApplication>
+
+class QSettings;

 namespace Snore
 {
--- a/src/libsnore/utils.h
+++ b/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
 {
--- a/src/plugins/backends/freedesktop/fredesktopnotification.cpp
+++ b/src/plugins/backends/freedesktop/fredesktopnotification.cpp
@ -18,8 +18,8 @@

 #include "fredesktopnotification.h"

-#include <QImage>
 #include <QDBusMetaType>
+#include <QImage>

 int FreedesktopImageHint::imageHintID = qDBusRegisterMetaType<FreedesktopImageHint>();

--- a/src/plugins/frontends/pushover/pushover_frontend.cpp
+++ b/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;

--- a/src/plugins/frontends/pushover/pushover_frontend.h
+++ b/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
 {
--- a/src/plugins/secondary_backends/nma/nma.cpp
+++ b/src/plugins/secondary_backends/nma/nma.cpp
@ -20,7 +20,6 @@

 #include"libsnore/utils.h"

-#include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QNetworkRequest>

--- a/src/plugins/secondary_backends/pushover/pushover.cpp
+++ b/src/plugins/secondary_backends/pushover/pushover.cpp
@ -20,7 +20,6 @@

 #include"libsnore/utils.h"

-#include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QNetworkRequest>
 #include <QHttpMultiPart>
--- a/src/plugins/secondary_backends/toasty/toasty.cpp
+++ b/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>
--- a/src/settings/main.cpp
+++ b/src/settings/main.cpp
@ -6,7 +6,6 @@

 #include <QApplication>
 #include <QCommandLineParser>
-#include <QMainWindow>

 #include <iostream>

--- a/src/settings/settingswindow.cpp
+++ b/src/settings/settingswindow.cpp
@ -7,7 +7,6 @@
 #include "utils.h"

 #include <QApplication>
-#include <QComboBox>
 #include <QDialogButtonBox>

 using namespace Snore;
--- a/src/settings/settingswindow.h
+++ b/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);