cleanup includes

2015-02-03 15:38:32 +01:00 · 2015-02-03 15:38:32 +01:00 · 63db3a5c90
parent 2dcd673c55
commit 63db3a5c90
37 changed files with 18 additions and 81 deletions
--- a/src/core/notification/icon.cpp
+++ b/src/core/notification/icon.cpp
@ -22,6 +22,8 @@

 #include "notification/icon_p.h"

+#include <QBuffer>
+
 using namespace Snore;

 QByteArray Icon::dataFromImage(const QImage &image)
--- a/src/core/notification/icon_p.cpp
+++ b/src/core/notification/icon_p.cpp
@ -19,10 +19,10 @@
 #include "icon_p.h"
 #include "../snore_p.h"

-#include <QEventLoop>
+#include <QApplication>
+#include <QFile>
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
-#include <QApplication>

 using namespace Snore;

--- a/src/core/notification/icon_p.h
+++ b/src/core/notification/icon_p.h
@ -24,12 +24,8 @@

 #include <QImage>
 #include <QSharedData>
-#include <QBuffer>
-#include <QFile>
-#include <QDebug>
 #include <QSet>

-#include <QMutex>

 class QNetworkAccessManager;

--- a/src/core/notification/notification.cpp
+++ b/src/core/notification/notification.cpp
@ -21,7 +21,6 @@
 #include "notification/icon.h"
 #include "notification/notification_p.h"
 #include "plugins/plugincontainer.h"
-#include <QMetaEnum>
 #include <Qt>

 using namespace Snore;
--- a/src/core/notification/notification.h
+++ b/src/core/notification/notification.h
@ -24,7 +24,6 @@
 #include "../hint.h"
 #include "../application.h"

-#include <QVariant>
 #include <QDebug>

 namespace Snore
--- a/src/core/notification/notification_p.h
+++ b/src/core/notification/notification_p.h
@ -25,7 +25,6 @@

 #include <QSharedData>
 #include <QTimer>
-#include <QPointer>

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

 #include <QDir>
-#include <QDebug>
 #include <QMetaEnum>
 #include <QApplication>
 #include <QTime>
--- a/src/core/plugins/plugincontainer.h
+++ b/src/core/plugins/plugincontainer.h
@ -21,10 +21,8 @@
 #include "snore_exports.h"
 #include "../snore_p.h"

-#include <QPointer>
-#include <QSettings>
-#include <QFlag>
 #include <QPluginLoader>
+#include <QDir>

 namespace Snore
 {
--- a/src/core/plugins/plugins.cpp
+++ b/src/core/plugins/plugins.cpp
@ -23,13 +23,9 @@
 #include "../notification/notification_p.h"
 #include "plugincontainer.h"

-#include <QTimer>
-#include <QPluginLoader>
-#include <QDir>
 #include <QDebug>
 #include <QMetaEnum>
 #include <QApplication>
-#include <QWidget>

 using namespace Snore;

--- a/src/core/plugins/plugins.h
+++ b/src/core/plugins/plugins.h
@ -22,11 +22,7 @@
 #include "pluginsettingswidget.h"
 #include "../notification/notification.h"

-#include <QPointer>
 #include <QHash>
-#include <QTimer>
-#include <QtPlugin>
-#include <QSettings>

 namespace Snore
 {
--- a/src/core/plugins/snorebackend.cpp
+++ b/src/core/plugins/snorebackend.cpp
@ -24,8 +24,6 @@
 #include "../notification/notification_p.h"

 #include <QTimer>
-#include <QDir>
-#include <QDebug>
 #include <QThread>
 #include <QMetaMethod>

--- a/src/core/plugins/snorebackend.h
+++ b/src/core/plugins/snorebackend.h
@ -23,8 +23,6 @@
 #include "../notification/notification.h"
 #include "../snore.h"

-#include <QPointer>
-#include <QFlag>

 namespace Snore
 {
--- a/src/core/plugins/snorefrontend.cpp
+++ b/src/core/plugins/snorefrontend.cpp
@ -19,9 +19,6 @@
 #include "snorefrontend.h"
 #include "../snore.h"

-#include <QTimer>
-#include <QDir>
-#include <QDebug>

 namespace Snore
 {
--- a/src/core/plugins/snorefrontend.h
+++ b/src/core/plugins/snorefrontend.h
@ -22,8 +22,6 @@
 #include "../notification/notification.h"
 #include "plugins.h"

-#include <QPointer>
-#include <QFlag>

 namespace Snore
 {
--- a/src/core/snore.cpp
+++ b/src/core/snore.cpp
@ -28,10 +28,6 @@

 #include <iostream>

-#include <QDebug>
-#include <QDir>
-#include <QSystemTrayIcon>
-#include <QApplication>
 #include <QSettings>

 using namespace Snore;
--- a/src/core/snore.h
+++ b/src/core/snore.h
@ -26,6 +26,7 @@
 #include "plugins/plugins.h"
 #include "hint.h"

+#include <QSettings>
 #include <QStringList>
 #include <QTextDocument>
 #include <QTextDocumentFragment>
--- a/src/core/snore_p.h
+++ b/src/core/snore_p.h
@ -22,7 +22,6 @@
 #include "snore.h"
 #include "plugins/snorebackend.h"

-#include <QDir>
 #include <QPointer>
 #include <QCryptographicHash>

--- a/src/daemon/snorenotify.cpp
+++ b/src/daemon/snorenotify.cpp
@ -20,17 +20,11 @@
 #include "trayicon.h"
 #include "core/snore.h"

-#include <QDir>
-#include <QFile>
-#include <QList>
-#include <QDebug>
-#include <QPluginLoader>
-#include <QSystemTrayIcon>
-#include <QSettings>

 #include <iostream>
 #include <stdlib.h>

+#include <QApplication>

 using namespace Snore;

--- a/src/daemon/snorenotify.h
+++ b/src/daemon/snorenotify.h
@ -19,7 +19,7 @@
 #ifndef SNORENOTIFY_H
 #define SNORENOTIFY_H

-#include <QtCore>
+#include <QSettings>

 namespace Snore
 {
@ -38,7 +38,7 @@ public:
 private:
    class TrayIcon *m_trayIcon;
    Snore::SnoreCore *m_snore;
-    class QSettings m_settings;
+    QSettings m_settings;

 private slots:
    void exit();
--- a/src/daemon/trayicon.cpp
+++ b/src/daemon/trayicon.cpp
@ -21,9 +21,11 @@
 #include "core/snore.h"
 #include "core/snore_p.h"

-#include <QSystemTrayIcon>
-#include <QMenu>
 #include <QAction>
+#include <QApplication>
+#include <QMenu>
+#include <QSystemTrayIcon>
+#include <QTimer>

 #include "core/version.h"

--- a/src/daemon/trayicon.h
+++ b/src/daemon/trayicon.h
@ -19,7 +19,6 @@
 #ifndef TRAYICON_H
 #define TRAYICON_H

-#include <QtCore>
 #include <QAction>
 #include "core/snore.h"

--- a/src/plugins/backends/freedesktop/fredesktopnotification.cpp
+++ b/src/plugins/backends/freedesktop/fredesktopnotification.cpp
@ -19,7 +19,6 @@
 #include "fredesktopnotification.h"

 #include <QImage>
-#include <QtGlobal>

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

--- a/src/plugins/backends/freedesktop/fredesktopnotification.h
+++ b/src/plugins/backends/freedesktop/fredesktopnotification.h
@ -21,7 +21,6 @@

 #include "core/notification/notification.h"

-#include <QtDBus>
 #include <QMetaType>

 class FreedesktopImageHint
--- a/src/plugins/backends/freedesktop/freedesktopnotification_backend.cpp
+++ b/src/plugins/backends/freedesktop/freedesktopnotification_backend.cpp
@ -1,12 +1,8 @@
 #include "freedesktopnotification_backend.h"

-#include <QtGlobal>
-#include <QDebug>
 #include "core/notification/notification.h"
 #include "core/notification/notification_p.h"
 #include "core/snore_p.h"
-#include <QtCore>
-#include <QImage>
 #include "fredesktopnotification.h"
 #include "core/snore.h"

--- a/src/plugins/backends/growl/growlbackend.cpp
+++ b/src/plugins/backends/growl/growlbackend.cpp
@ -21,8 +21,6 @@
 #include "core/snore.h"
 #include "core/snore_p.h"

-#include <QtCore>
-#include <QTcpSocket>

 using namespace Snore;

--- a/src/plugins/backends/snarl/snarl.cpp
+++ b/src/plugins/backends/snarl/snarl.cpp
@ -24,7 +24,6 @@
 #include "core/plugins/snorebackend.h"
 #include "core/notification/notification_p.h"

-#include <QtDebug>
 #include <QWidget>

 #include <iostream>
--- a/src/plugins/backends/snore/notifywidget.cpp
+++ b/src/plugins/backends/snore/notifywidget.cpp
@ -20,11 +20,6 @@
 #include "snorenotifier.h"
 #include "core/log.h"

-#include <QDesktopWidget>
-#include <QDesktopServices>
-#include <QPicture>
-#include <QLayout>
-#include <QSize>

 using namespace Snore;

--- a/src/plugins/backends/snore/notifywidget.h
+++ b/src/plugins/backends/snore/notifywidget.h
@ -19,13 +19,10 @@
 #ifndef NOTIFYWIDGET_H
 #define NOTIFYWIDGET_H

-#include <QWidget>
-#include <QTimer>
 #include <QSharedMemory>
 #include "core/notification/notification.h"

 #include <QtQuick/QtQuick>
-#include <QPropertyAnimation>

 class SnoreNotifier;

--- a/src/plugins/backends/snore/snorenotifier.cpp
+++ b/src/plugins/backends/snore/snorenotifier.cpp
@ -23,7 +23,6 @@
 #include "core/snore_p.h"


-#include <QApplication>
 #include <QThread>

 using namespace Snore;
--- a/src/plugins/backends/snoretoast/snoretoast.cpp
+++ b/src/plugins/backends/snoretoast/snoretoast.cpp
@ -4,7 +4,6 @@
 #include "core/plugins/plugins.h"
 #include "core/plugins/snorebackend.h"

-#include <QDebug>
 #include <QDir>
 #include <QApplication>
 #include <QSysInfo>
--- a/src/plugins/backends/trayicon/trayiconnotifer.cpp
+++ b/src/plugins/backends/trayicon/trayiconnotifer.cpp
@ -2,11 +2,7 @@
 #include "core/snore.h"
 #include "core/snore_p.h"

-#include <QtCore>
 #include <QSystemTrayIcon>
-#include <QTimer>
-#include <QTime>
-#include <QDebug>
 using namespace Snore;

 TrayIconNotifer::TrayIconNotifer() :
--- a/src/plugins/frontends/freedesktop/freedesktopnotificationfrontend.cpp
+++ b/src/plugins/frontends/freedesktop/freedesktopnotificationfrontend.cpp
@ -24,8 +24,6 @@
 #include "core/version.h"
 #include "core/notification/notification_p.h"

-#include <QtCore>
-#include <QtDBus>
 #include <QImage>
 #include <QIcon>

--- a/src/plugins/frontends/freedesktop/freedesktopnotificationfrontend.h
+++ b/src/plugins/frontends/freedesktop/freedesktopnotificationfrontend.h
@ -20,7 +20,6 @@
 #define FREEDESKTOPNOTIFICATION_FRONTEND_H
 #include "core/plugins/snorefrontend.h"
 #include "core/application.h"
-#include <QtDBus>

 class NotificationsAdaptor;

--- a/src/plugins/frontends/snarlnetwork/parser.cpp
+++ b/src/plugins/frontends/snarlnetwork/parser.cpp
@ -23,10 +23,6 @@
 #include "core/notification/notification.h"
 #include "core/notification/notification_p.h"

-#include <QDir>
-#include <QNetworkAccessManager>
-#include <QEventLoop>
-#include <QNetworkReply>
 #include <QObject>
 #include <QTcpSocket>

--- a/src/plugins/frontends/snarlnetwork/snarlnetwork.cpp
+++ b/src/plugins/frontends/snarlnetwork/snarlnetwork.cpp
@ -19,7 +19,6 @@
 #include "snarlnetwork.h"
 #include "core/snore.h"

-#include <QtCore>
 #include <QTcpServer>
 #include <QTcpSocket>

--- a/src/plugins/frontends/snarlnetwork/snarlnetwork.h
+++ b/src/plugins/frontends/snarlnetwork/snarlnetwork.h
@ -22,7 +22,6 @@
 #include "core/log.h"
 #include "parser.h"

-#include <QPointer>
 #include <QTcpSocket>
 #include <QTcpServer>

--- a/src/plugins/secondary_backends/toasty/toasty.cpp
+++ b/src/plugins/secondary_backends/toasty/toasty.cpp
@ -18,8 +18,11 @@
 #include "toasty.h"
 #include "toastysettings.h"

-#include <QtNetwork>
-#include <QImage>
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
+#include <QNetworkRequest>
+#include <QHttpMultiPart>
+#include <QFile>

 using namespace Snore;