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.

5 files changed, 21 insertions, 18 deletions

diff --git a/src/qt/test/paymentservertests.cpp b/src/qt/test/paymentservertests.cpp
index 34079e94ff..f7d26fb919 100644
--- a/src/qt/test/paymentservertests.cpp
+++ b/src/qt/test/paymentservertests.cpp
@@ -1,17 +1,17 @@
-#include <QCoreApplication>
-#include <QDebug>
-#include <QTemporaryFile>
-#include <QVariant>
-#include <QFileOpenEvent>
-
-#include <openssl/x509.h>
-#include <openssl/x509_vfy.h>
+#include "paymentservertests.h"
 
 #include "optionsmodel.h"
-#include "paymentservertests.h"
 #include "paymentrequestdata.h"
+
 #include "util.h"
 
+#include <openssl/x509.h>
+#include <openssl/x509_vfy.h>
+#include <QCoreApplication>
+#include <QDebug>
+#include <QFileOpenEvent>
+#include <QTemporaryFile>
+#include <QVariant>
 
 
 X509 *parse_b64der_cert(const char* cert_data)
diff --git a/src/qt/test/paymentservertests.h b/src/qt/test/paymentservertests.h
index 5aa24ebaf2..0bff923ad4 100644
--- a/src/qt/test/paymentservertests.h
+++ b/src/qt/test/paymentservertests.h
@@ -1,11 +1,11 @@
 #ifndef PAYMENTSERVERTESTS_H
 #define PAYMENTSERVERTESTS_H
 
-#include <QTest>
-#include <QObject>
-
 #include "../paymentserver.h"
 
+#include <QObject>
+#include <QTest>
+
 class PaymentServerTests : public QObject
 {
     Q_OBJECT
diff --git a/src/qt/test/test_main.cpp b/src/qt/test/test_main.cpp
index dae4e60412..5c941c6387 100644
--- a/src/qt/test/test_main.cpp
+++ b/src/qt/test/test_main.cpp
@@ -1,8 +1,10 @@
-#include <QTest>
-#include <QObject>
 
-#include "uritests.h"
+
 #include "paymentservertests.h"
+#include "uritests.h"
+
+#include <QObject>
+#include <QTest>
 
 // This is all you need to run all the tests
 int main(int argc, char *argv[])
diff --git a/src/qt/test/uritests.cpp b/src/qt/test/uritests.cpp
index df4df3154b..5c0f4406a7 100644
--- a/src/qt/test/uritests.cpp
+++ b/src/qt/test/uritests.cpp
@@ -1,6 +1,7 @@
 #include "uritests.h"
-#include "../guiutil.h"
-#include "../walletmodel.h"
+
+#include "guiutil.h"
+#include "walletmodel.h"
 
 #include <QUrl>
 
diff --git a/src/qt/test/uritests.h b/src/qt/test/uritests.h
index 1237516e5f..17d4280a90 100644
--- a/src/qt/test/uritests.h
+++ b/src/qt/test/uritests.h
@@ -1,8 +1,8 @@
 #ifndef URITESTS_H
 #define URITESTS_H
 
-#include <QTest>
 #include <QObject>
+#include <QTest>
 
 class URITests : public QObject
 {