aboutsummaryrefslogtreecommitdiff
path: root/src/qt
diff options
context:
space:
mode:
authorPhilip Kaufmann <phil.kaufmann@t-online.de>2014-09-05 13:18:35 +0200
committerPhilip Kaufmann <phil.kaufmann@t-online.de>2014-09-18 14:11:44 +0200
commit5e83bc404c77d6e70c62152f1f97eb264afcc80d (patch)
tree519eecfef852a7ca5e84b57813605b1f4b644c06 /src/qt
parent7fd881367544fcc9e70130bf448a181794da26ab (diff)
[Qt] include and file header cleanup
- alphabetical ordering - correct ordering own headers before normal headers etc.
Diffstat (limited to 'src/qt')
-rw-r--r--src/qt/bitcoin.cpp5
-rw-r--r--src/qt/bitcoinamountfield.h4
-rw-r--r--src/qt/bitcoingui.cpp5
-rw-r--r--src/qt/coincontroldialog.h8
-rw-r--r--src/qt/intro.h2
-rw-r--r--src/qt/openuridialog.h2
-rw-r--r--src/qt/optionsdialog.cpp2
-rw-r--r--src/qt/optionsmodel.cpp1
-rw-r--r--src/qt/paymentrequestplus.cpp1
-rw-r--r--src/qt/receivecoinsdialog.h7
-rw-r--r--src/qt/rpcconsole.cpp4
-rw-r--r--src/qt/rpcconsole.h8
-rw-r--r--src/qt/sendcoinsdialog.h8
-rw-r--r--src/qt/splashscreen.cpp3
-rw-r--r--src/qt/transactiondesc.cpp4
15 files changed, 39 insertions, 25 deletions
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index 6cc6b99ceb..d9ca423015 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -16,6 +16,7 @@
#include "splashscreen.h"
#include "utilitydialog.h"
#include "winshutdownmonitor.h"
+
#ifdef ENABLE_WALLET
#include "paymentserver.h"
#include "walletmodel.h"
@@ -26,6 +27,7 @@
#include "rpcserver.h"
#include "ui_interface.h"
#include "util.h"
+
#ifdef ENABLE_WALLET
#include "wallet.h"
#endif
@@ -34,15 +36,16 @@
#include <boost/filesystem/operations.hpp>
#include <boost/thread.hpp>
+
#include <QApplication>
#include <QDebug>
#include <QLibraryInfo>
#include <QLocale>
#include <QMessageBox>
#include <QSettings>
+#include <QThread>
#include <QTimer>
#include <QTranslator>
-#include <QThread>
#if defined(QT_STATICPLUGIN)
#include <QtPlugin>
diff --git a/src/qt/bitcoinamountfield.h b/src/qt/bitcoinamountfield.h
index c713f5d687..84795a7e7a 100644
--- a/src/qt/bitcoinamountfield.h
+++ b/src/qt/bitcoinamountfield.h
@@ -7,12 +7,12 @@
#include <QWidget>
+class AmountSpinBox;
+
QT_BEGIN_NAMESPACE
class QValueComboBox;
QT_END_NAMESPACE
-class AmountSpinBox;
-
/** Widget for entering bitcoin amounts.
*/
class BitcoinAmountField: public QWidget
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index 790301a1eb..dd5192982e 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -14,6 +14,7 @@
#include "optionsmodel.h"
#include "rpcconsole.h"
#include "utilitydialog.h"
+
#ifdef ENABLE_WALLET
#include "walletframe.h"
#include "walletmodel.h"
@@ -24,8 +25,8 @@
#endif
#include "init.h"
-#include "util.h"
#include "ui_interface.h"
+#include "util.h"
#include <iostream>
@@ -50,8 +51,8 @@
#include <QVBoxLayout>
#if QT_VERSION < 0x050000
-#include <QUrl>
#include <QTextDocument>
+#include <QUrl>
#else
#include <QUrlQuery>
#endif
diff --git a/src/qt/coincontroldialog.h b/src/qt/coincontroldialog.h
index 4f7422642f..a6f239a898 100644
--- a/src/qt/coincontroldialog.h
+++ b/src/qt/coincontroldialog.h
@@ -14,13 +14,15 @@
#include <QString>
#include <QTreeWidgetItem>
-namespace Ui {
- class CoinControlDialog;
-}
class WalletModel;
+
class CCoinControl;
class CTxMemPool;
+namespace Ui {
+ class CoinControlDialog;
+}
+
class CoinControlDialog : public QDialog
{
Q_OBJECT
diff --git a/src/qt/intro.h b/src/qt/intro.h
index 295a75562f..e3e396d369 100644
--- a/src/qt/intro.h
+++ b/src/qt/intro.h
@@ -12,7 +12,7 @@
class FreespaceChecker;
namespace Ui {
-class Intro;
+ class Intro;
}
/** Introduction screen (pre-GUI startup).
diff --git a/src/qt/openuridialog.h b/src/qt/openuridialog.h
index 28da7d6d9d..67a5f167d1 100644
--- a/src/qt/openuridialog.h
+++ b/src/qt/openuridialog.h
@@ -8,7 +8,7 @@
#include <QDialog>
namespace Ui {
-class OpenURIDialog;
+ class OpenURIDialog;
}
class OpenURIDialog : public QDialog
diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp
index c775a7f8d6..279467129f 100644
--- a/src/qt/optionsdialog.cpp
+++ b/src/qt/optionsdialog.cpp
@@ -17,11 +17,13 @@
#include "main.h" // for MAX_SCRIPTCHECK_THREADS
#include "netbase.h"
#include "txdb.h" // for -dbcache defaults
+
#ifdef ENABLE_WALLET
#include "wallet.h" // for CWallet::minTxFee
#endif
#include <boost/thread.hpp>
+
#include <QDir>
#include <QIntValidator>
#include <QLocale>
diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index 99928ebe4d..bd747faeb6 100644
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -15,6 +15,7 @@
#include "main.h"
#include "net.h"
#include "txdb.h" // for -dbcache defaults
+
#ifdef ENABLE_WALLET
#include "wallet.h"
#include "walletdb.h"
diff --git a/src/qt/paymentrequestplus.cpp b/src/qt/paymentrequestplus.cpp
index acce42e203..7b7de49831 100644
--- a/src/qt/paymentrequestplus.cpp
+++ b/src/qt/paymentrequestplus.cpp
@@ -13,6 +13,7 @@
#include <openssl/x509.h>
#include <openssl/x509_vfy.h>
+
#include <QDateTime>
#include <QDebug>
#include <QSslCertificate>
diff --git a/src/qt/receivecoinsdialog.h b/src/qt/receivecoinsdialog.h
index 663cb157a4..7a7e38e25e 100644
--- a/src/qt/receivecoinsdialog.h
+++ b/src/qt/receivecoinsdialog.h
@@ -5,6 +5,8 @@
#ifndef RECEIVECOINSDIALOG_H
#define RECEIVECOINSDIALOG_H
+#include "guiutil.h"
+
#include <QDialog>
#include <QHeaderView>
#include <QItemSelection>
@@ -13,13 +15,12 @@
#include <QPoint>
#include <QVariant>
-#include "guiutil.h"
+class OptionsModel;
+class WalletModel;
namespace Ui {
class ReceiveCoinsDialog;
}
-class OptionsModel;
-class WalletModel;
QT_BEGIN_NAMESPACE
class QModelIndex;
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index 11089b2497..8129353d4b 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -16,10 +16,12 @@
#include "util.h"
#include "json/json_spirit_value.h"
+
+#include <openssl/crypto.h>
+
#ifdef ENABLE_WALLET
#include <db_cxx.h>
#endif
-#include <openssl/crypto.h>
#include <QKeyEvent>
#include <QScrollBar>
diff --git a/src/qt/rpcconsole.h b/src/qt/rpcconsole.h
index 64bb5c29b3..1ffff92758 100644
--- a/src/qt/rpcconsole.h
+++ b/src/qt/rpcconsole.h
@@ -14,14 +14,14 @@
class ClientModel;
-QT_BEGIN_NAMESPACE
-class QItemSelection;
-QT_END_NAMESPACE
-
namespace Ui {
class RPCConsole;
}
+QT_BEGIN_NAMESPACE
+class QItemSelection;
+QT_END_NAMESPACE
+
/** Local Bitcoin RPC console. */
class RPCConsole: public QDialog
{
diff --git a/src/qt/sendcoinsdialog.h b/src/qt/sendcoinsdialog.h
index 6cdf4a00c8..a090fa42d5 100644
--- a/src/qt/sendcoinsdialog.h
+++ b/src/qt/sendcoinsdialog.h
@@ -14,14 +14,14 @@ class OptionsModel;
class SendCoinsEntry;
class SendCoinsRecipient;
-QT_BEGIN_NAMESPACE
-class QUrl;
-QT_END_NAMESPACE
-
namespace Ui {
class SendCoinsDialog;
}
+QT_BEGIN_NAMESPACE
+class QUrl;
+QT_END_NAMESPACE
+
/** Dialog for sending bitcoins */
class SendCoinsDialog : public QDialog
{
diff --git a/src/qt/splashscreen.cpp b/src/qt/splashscreen.cpp
index 5dd110b36a..feb0f3350f 100644
--- a/src/qt/splashscreen.cpp
+++ b/src/qt/splashscreen.cpp
@@ -4,11 +4,12 @@
#include "splashscreen.h"
-#include "version.h"
#include "clientversion.h"
#include "init.h"
#include "ui_interface.h"
#include "util.h"
+#include "version.h"
+
#ifdef ENABLE_WALLET
#include "wallet.h"
#endif
diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp
index 727b8dc66d..4923718341 100644
--- a/src/qt/transactiondesc.cpp
+++ b/src/qt/transactiondesc.cpp
@@ -6,13 +6,13 @@
#include "bitcoinunits.h"
#include "guiutil.h"
+#include "paymentserver.h"
+#include "transactionrecord.h"
#include "base58.h"
#include "db.h"
#include "main.h"
-#include "paymentserver.h"
#include "script/script.h"
-#include "transactionrecord.h"
#include "timedata.h"
#include "ui_interface.h"
#include "util.h"