Cleanup code using forward declarations.

Use misc methods of avoiding unnecesary header includes.
Replace int typedefs with int##_t from stdint.h.
Replace PRI64[xdu] with PRI[xdu]64 from inttypes.h.
Normalize QT_VERSION ifs where possible.
Resolve some indirect dependencies as direct ones.
Remove extern declarations from .cpp files.

1 files changed, 14 insertions, 10 deletions

diff --git a/src/qt/notificator.cpp b/src/qt/notificator.cpp
index fcde23f7e..c9f6834ec 100644
--- a/src/qt/notificator.cpp
+++ b/src/qt/notificator.cpp
@@ -4,27 +4,31 @@
 
 #include "notificator.h"
 
+
 #include <QApplication>
-#include <QMetaType>
-#include <QVariant>
+#include <QByteArray>
 #include <QIcon>
+#include <QImageWriter>
+#include <QMessageBox>
+#include <QMetaType>
 #include <QStyle>
-#include <QByteArray>
 #include <QSystemTrayIcon>
-#include <QMessageBox>
 #include <QTemporaryFile>
-#include <QImageWriter>
+#include <QVariant>
+
+#ifdef Q_OS_MAC
+#include "macnotificationhandler.h"
+
+#include <ApplicationServices/ApplicationServices.h>
+#endif
 
 #ifdef USE_DBUS
-#include <QtDBus>
 #include <stdint.h>
-#endif
 
-#ifdef Q_OS_MAC
-#include <ApplicationServices/ApplicationServices.h>
-#include "macnotificationhandler.h"
+#include <QtDBus>
 #endif
 
+
 // https://wiki.ubuntu.com/NotificationDevelopmentGuidelines recommends at least 128
 const int FREEDESKTOP_NOTIFICATION_ICON_SIZE = 128;