diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-12-12 14:37:23 +0100 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-12-12 14:56:25 +0100 |
commit | 5d132e8b974652d96466a1b73ec1231614719fe2 (patch) | |
tree | cbb8e4edcedf9151adc6f6e0583a20b1ec47c32b /src/qt | |
parent | 214046f69b1978129030ba1f65007d57b29f0761 (diff) | |
parent | a720b928c80f18d340173f39f63e7ef9cfb367c1 (diff) |
Merge #10574: Remove includes in .cpp files for things the corresponding .h file already included
a720b92 Remove includes in .cpp files for things the corresponding .h file already included (practicalswift)
Pull request description:
Remove includes in .cpp files for things the corresponding .h file already included.
Example case:
* `addrdb.cpp` includes `addrdb.h` and `fs.h`
* `addrdb.h` includes `fs.h`
Then remove the direct inclusion of `fs.h` in `addrman.cpp` and rely on the indirect inclusion of `fs.h` via the included `addrdb.h`.
In line with the header include guideline (see #10575).
Tree-SHA512: 8704b9de3011a4c234db336a39f7d2c139e741cf0f7aef08a5d3e05197e1e18286b863fdab25ae9638af4ff86b3d52e5cab9eed66bfa2476063aa5c79f9b0346
Diffstat (limited to 'src/qt')
-rw-r--r-- | src/qt/bitcoingui.cpp | 4 | ||||
-rw-r--r-- | src/qt/coincontroldialog.cpp | 2 | ||||
-rw-r--r-- | src/qt/guiutil.cpp | 1 | ||||
-rw-r--r-- | src/qt/notificator.cpp | 1 | ||||
-rw-r--r-- | src/qt/optionsmodel.cpp | 1 | ||||
-rw-r--r-- | src/qt/platformstyle.cpp | 2 | ||||
-rw-r--r-- | src/qt/receivecoinsdialog.cpp | 2 | ||||
-rw-r--r-- | src/qt/receiverequestdialog.cpp | 1 | ||||
-rw-r--r-- | src/qt/rpcconsole.cpp | 2 | ||||
-rw-r--r-- | src/qt/sendcoinsdialog.cpp | 3 | ||||
-rw-r--r-- | src/qt/sendcoinsentry.cpp | 1 | ||||
-rw-r--r-- | src/qt/transactionfilterproxy.cpp | 2 | ||||
-rw-r--r-- | src/qt/transactionview.cpp | 1 |
13 files changed, 0 insertions, 23 deletions
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index cd3234c564..f925ec5359 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -2,10 +2,6 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#if defined(HAVE_CONFIG_H) -#include <config/bitcoin-config.h> -#endif - #include <qt/bitcoingui.h> #include <qt/bitcoinunits.h> diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp index 03e633e375..49f4e74a9f 100644 --- a/src/qt/coincontroldialog.cpp +++ b/src/qt/coincontroldialog.cpp @@ -28,9 +28,7 @@ #include <QFlags> #include <QIcon> #include <QSettings> -#include <QString> #include <QTreeWidget> -#include <QTreeWidgetItem> QList<CAmount> CoinControlDialog::payAmounts; CCoinControl* CoinControlDialog::coinControl = new CCoinControl(); diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp index 80ee35a341..eb5d3304af 100644 --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -9,7 +9,6 @@ #include <qt/qvalidatedlineedit.h> #include <qt/walletmodel.h> -#include <fs.h> #include <primitives/transaction.h> #include <init.h> #include <policy/policy.h> diff --git a/src/qt/notificator.cpp b/src/qt/notificator.cpp index 4f8732a9ce..f4383bf679 100644 --- a/src/qt/notificator.cpp +++ b/src/qt/notificator.cpp @@ -6,7 +6,6 @@ #include <QApplication> #include <QByteArray> -#include <QIcon> #include <QImageWriter> #include <QMessageBox> #include <QMetaType> diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp index 52b4d4e42e..c9e4f517c7 100644 --- a/src/qt/optionsmodel.cpp +++ b/src/qt/optionsmodel.cpp @@ -11,7 +11,6 @@ #include <qt/bitcoinunits.h> #include <qt/guiutil.h> -#include <amount.h> #include <init.h> #include <validation.h> // For DEFAULT_SCRIPTCHECK_THREADS #include <net.h> diff --git a/src/qt/platformstyle.cpp b/src/qt/platformstyle.cpp index cc8ea3622b..0e1bd59ada 100644 --- a/src/qt/platformstyle.cpp +++ b/src/qt/platformstyle.cpp @@ -8,10 +8,8 @@ #include <QApplication> #include <QColor> -#include <QIcon> #include <QImage> #include <QPalette> -#include <QPixmap> static const struct { const char *platformId; diff --git a/src/qt/receivecoinsdialog.cpp b/src/qt/receivecoinsdialog.cpp index d6e2beb312..e9dcbc0a72 100644 --- a/src/qt/receivecoinsdialog.cpp +++ b/src/qt/receivecoinsdialog.cpp @@ -8,7 +8,6 @@ #include <qt/addressbookpage.h> #include <qt/addresstablemodel.h> #include <qt/bitcoinunits.h> -#include <qt/guiutil.h> #include <qt/optionsmodel.h> #include <qt/platformstyle.h> #include <qt/receiverequestdialog.h> @@ -17,7 +16,6 @@ #include <QAction> #include <QCursor> -#include <QItemSelection> #include <QMessageBox> #include <QScrollBar> #include <QTextDocument> diff --git a/src/qt/receiverequestdialog.cpp b/src/qt/receiverequestdialog.cpp index c69fea1c93..d30e9b2dca 100644 --- a/src/qt/receiverequestdialog.cpp +++ b/src/qt/receiverequestdialog.cpp @@ -9,7 +9,6 @@ #include <qt/guiconstants.h> #include <qt/guiutil.h> #include <qt/optionsmodel.h> -#include <qt/walletmodel.h> #include <QClipboard> #include <QDrag> diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp index 54a6e837c1..0b90205270 100644 --- a/src/qt/rpcconsole.cpp +++ b/src/qt/rpcconsole.cpp @@ -11,7 +11,6 @@ #include <qt/bantablemodel.h> #include <qt/clientmodel.h> -#include <qt/guiutil.h> #include <qt/platformstyle.h> #include <chainparams.h> #include <netbase.h> @@ -35,7 +34,6 @@ #include <QScrollBar> #include <QSettings> #include <QSignalMapper> -#include <QThread> #include <QTime> #include <QTimer> #include <QStringList> diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp index e2b9177885..2a46cdab8c 100644 --- a/src/qt/sendcoinsdialog.cpp +++ b/src/qt/sendcoinsdialog.cpp @@ -13,7 +13,6 @@ #include <qt/optionsmodel.h> #include <qt/platformstyle.h> #include <qt/sendcoinsentry.h> -#include <qt/walletmodel.h> #include <base58.h> #include <chainparams.h> @@ -25,11 +24,9 @@ #include <wallet/fees.h> #include <QFontMetrics> -#include <QMessageBox> #include <QScrollBar> #include <QSettings> #include <QTextDocument> -#include <QTimer> static const std::array<int, 9> confTargets = { {2, 4, 6, 12, 24, 48, 144, 504, 1008} }; int getConfTargetForIndex(int index) { diff --git a/src/qt/sendcoinsentry.cpp b/src/qt/sendcoinsentry.cpp index 20e39bdeba..4cf4bb9ef7 100644 --- a/src/qt/sendcoinsentry.cpp +++ b/src/qt/sendcoinsentry.cpp @@ -10,7 +10,6 @@ #include <qt/guiutil.h> #include <qt/optionsmodel.h> #include <qt/platformstyle.h> -#include <qt/walletmodel.h> #include <QApplication> #include <QClipboard> diff --git a/src/qt/transactionfilterproxy.cpp b/src/qt/transactionfilterproxy.cpp index ada73a73df..47890fc7e2 100644 --- a/src/qt/transactionfilterproxy.cpp +++ b/src/qt/transactionfilterproxy.cpp @@ -9,8 +9,6 @@ #include <cstdlib> -#include <QDateTime> - // Earliest date that can be represented (far in the past) const QDateTime TransactionFilterProxy::MIN_DATE = QDateTime::fromTime_t(0); // Last date that can be represented (far in the future) diff --git a/src/qt/transactionview.cpp b/src/qt/transactionview.cpp index 4d2aac12f0..b7e39e05ec 100644 --- a/src/qt/transactionview.cpp +++ b/src/qt/transactionview.cpp @@ -8,7 +8,6 @@ #include <qt/bitcoinunits.h> #include <qt/csvmodelwriter.h> #include <qt/editaddressdialog.h> -#include <qt/guiutil.h> #include <qt/optionsmodel.h> #include <qt/platformstyle.h> #include <qt/sendcoinsdialog.h> |