Browse Source

[Qt] include and file header cleanup

- alphabetical ordering
- correct ordering own headers before normal headers etc.
pull/1/head
Philip Kaufmann 8 years ago
parent
commit
5e83bc404c
  1. 5
      src/qt/bitcoin.cpp
  2. 4
      src/qt/bitcoinamountfield.h
  3. 5
      src/qt/bitcoingui.cpp
  4. 8
      src/qt/coincontroldialog.h
  5. 2
      src/qt/intro.h
  6. 2
      src/qt/openuridialog.h
  7. 2
      src/qt/optionsdialog.cpp
  8. 1
      src/qt/optionsmodel.cpp
  9. 1
      src/qt/paymentrequestplus.cpp
  10. 7
      src/qt/receivecoinsdialog.h
  11. 4
      src/qt/rpcconsole.cpp
  12. 8
      src/qt/rpcconsole.h
  13. 8
      src/qt/sendcoinsdialog.h
  14. 3
      src/qt/splashscreen.cpp
  15. 4
      src/qt/transactiondesc.cpp

5
src/qt/bitcoin.cpp

@ -16,6 +16,7 @@ @@ -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 @@ @@ -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 @@ @@ -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>

4
src/qt/bitcoinamountfield.h

@ -7,12 +7,12 @@ @@ -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

5
src/qt/bitcoingui.cpp

@ -14,6 +14,7 @@ @@ -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 @@ @@ -24,8 +25,8 @@
#endif
#include "init.h"
#include "util.h"
#include "ui_interface.h"
#include "util.h"
#include <iostream>
@ -50,8 +51,8 @@ @@ -50,8 +51,8 @@
#include <QVBoxLayout>
#if QT_VERSION < 0x050000
#include <QUrl>
#include <QTextDocument>
#include <QUrl>
#else
#include <QUrlQuery>
#endif

8
src/qt/coincontroldialog.h

@ -14,13 +14,15 @@ @@ -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

2
src/qt/intro.h

@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
class FreespaceChecker;
namespace Ui {
class Intro;
class Intro;
}
/** Introduction screen (pre-GUI startup).

2
src/qt/openuridialog.h

@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
#include <QDialog>
namespace Ui {
class OpenURIDialog;
class OpenURIDialog;
}
class OpenURIDialog : public QDialog

2
src/qt/optionsdialog.cpp

@ -17,11 +17,13 @@ @@ -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>

1
src/qt/optionsmodel.cpp

@ -15,6 +15,7 @@ @@ -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"

1
src/qt/paymentrequestplus.cpp

@ -13,6 +13,7 @@ @@ -13,6 +13,7 @@
#include <openssl/x509.h>
#include <openssl/x509_vfy.h>
#include <QDateTime>
#include <QDebug>
#include <QSslCertificate>

7
src/qt/receivecoinsdialog.h

@ -5,6 +5,8 @@ @@ -5,6 +5,8 @@
#ifndef RECEIVECOINSDIALOG_H
#define RECEIVECOINSDIALOG_H
#include "guiutil.h"
#include <QDialog>
#include <QHeaderView>
#include <QItemSelection>
@ -13,13 +15,12 @@ @@ -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;

4
src/qt/rpcconsole.cpp

@ -16,10 +16,12 @@ @@ -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>

8
src/qt/rpcconsole.h

@ -14,14 +14,14 @@ @@ -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
{

8
src/qt/sendcoinsdialog.h

@ -14,14 +14,14 @@ class OptionsModel; @@ -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
{

3
src/qt/splashscreen.cpp

@ -4,11 +4,12 @@ @@ -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

4
src/qt/transactiondesc.cpp

@ -6,13 +6,13 @@ @@ -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"

Loading…
Cancel
Save