diff options
author | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2019-11-19 13:45:32 +0200 |
---|---|---|
committer | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2019-11-19 17:05:35 +0200 |
commit | 5f50599ae7077ae9b9b56edb8892387b6ddc460a (patch) | |
tree | 47756acc0a8a2f61e283bb6e7b4bfe96849110f8 | |
parent | a53e9895db7617c879858ca27e38e6aaf35f6075 (diff) | |
download | bitcoin-5f50599ae7077ae9b9b56edb8892387b6ddc460a.tar.xz |
refactor: Cleanup headers from walletmodel.h
-rw-r--r-- | src/qt/openuridialog.cpp | 1 | ||||
-rw-r--r-- | src/qt/receiverequestdialog.cpp | 1 | ||||
-rw-r--r-- | src/qt/receiverequestdialog.h | 3 | ||||
-rw-r--r-- | src/qt/recentrequeststablemodel.cpp | 1 | ||||
-rw-r--r-- | src/qt/recentrequeststablemodel.h | 3 | ||||
-rw-r--r-- | src/qt/sendcoinsentry.cpp | 1 | ||||
-rw-r--r-- | src/qt/sendcoinsentry.h | 5 | ||||
-rw-r--r-- | src/qt/walletcontroller.cpp | 7 | ||||
-rw-r--r-- | src/qt/walletcontroller.h | 3 |
9 files changed, 17 insertions, 8 deletions
diff --git a/src/qt/openuridialog.cpp b/src/qt/openuridialog.cpp index d9ed498d7c..6a0143ac7e 100644 --- a/src/qt/openuridialog.cpp +++ b/src/qt/openuridialog.cpp @@ -7,7 +7,6 @@ #include <qt/guiutil.h> #include <qt/sendcoinsrecipient.h> -#include <qt/walletmodel.h> #include <QUrl> diff --git a/src/qt/receiverequestdialog.cpp b/src/qt/receiverequestdialog.cpp index e492502002..2674c9b953 100644 --- a/src/qt/receiverequestdialog.cpp +++ b/src/qt/receiverequestdialog.cpp @@ -8,6 +8,7 @@ #include <qt/bitcoinunits.h> #include <qt/guiutil.h> #include <qt/optionsmodel.h> +#include <qt/walletmodel.h> #include <QClipboard> #include <QPixmap> diff --git a/src/qt/receiverequestdialog.h b/src/qt/receiverequestdialog.h index ece1e2e9de..1bb43ce6d1 100644 --- a/src/qt/receiverequestdialog.h +++ b/src/qt/receiverequestdialog.h @@ -6,10 +6,11 @@ #define BITCOIN_QT_RECEIVEREQUESTDIALOG_H #include <qt/sendcoinsrecipient.h> -#include <qt/walletmodel.h> #include <QDialog> +class WalletModel; + namespace Ui { class ReceiveRequestDialog; } diff --git a/src/qt/recentrequeststablemodel.cpp b/src/qt/recentrequeststablemodel.cpp index 1611ec823c..6d933f46d6 100644 --- a/src/qt/recentrequeststablemodel.cpp +++ b/src/qt/recentrequeststablemodel.cpp @@ -7,6 +7,7 @@ #include <qt/bitcoinunits.h> #include <qt/guiutil.h> #include <qt/optionsmodel.h> +#include <qt/walletmodel.h> #include <clientversion.h> #include <streams.h> diff --git a/src/qt/recentrequeststablemodel.h b/src/qt/recentrequeststablemodel.h index a772db293d..30578b7a03 100644 --- a/src/qt/recentrequeststablemodel.h +++ b/src/qt/recentrequeststablemodel.h @@ -6,12 +6,13 @@ #define BITCOIN_QT_RECENTREQUESTSTABLEMODEL_H #include <qt/sendcoinsrecipient.h> -#include <qt/walletmodel.h> #include <QAbstractTableModel> #include <QStringList> #include <QDateTime> +class WalletModel; + class RecentRequestEntry { public: diff --git a/src/qt/sendcoinsentry.cpp b/src/qt/sendcoinsentry.cpp index be417655b4..ad37e09114 100644 --- a/src/qt/sendcoinsentry.cpp +++ b/src/qt/sendcoinsentry.cpp @@ -14,6 +14,7 @@ #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/sendcoinsentry.h b/src/qt/sendcoinsentry.h index 7b4b2120ef..aa69d30f99 100644 --- a/src/qt/sendcoinsentry.h +++ b/src/qt/sendcoinsentry.h @@ -6,13 +6,16 @@ #define BITCOIN_QT_SENDCOINSENTRY_H #include <qt/sendcoinsrecipient.h> -#include <qt/walletmodel.h> #include <QStackedWidget> class WalletModel; class PlatformStyle; +namespace interfaces { +class Node; +} // namespace interfaces + namespace Ui { class SendCoinsEntry; } diff --git a/src/qt/walletcontroller.cpp b/src/qt/walletcontroller.cpp index 4c253f8ddd..7413a1f09e 100644 --- a/src/qt/walletcontroller.cpp +++ b/src/qt/walletcontroller.cpp @@ -2,17 +2,18 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#include <qt/walletcontroller.h> + #include <qt/askpassphrasedialog.h> #include <qt/createwalletdialog.h> #include <qt/guiconstants.h> #include <qt/guiutil.h> -#include <qt/walletcontroller.h> - -#include <wallet/wallet.h> +#include <qt/walletmodel.h> #include <interfaces/handler.h> #include <interfaces/node.h> #include <util/string.h> +#include <wallet/wallet.h> #include <algorithm> diff --git a/src/qt/walletcontroller.h b/src/qt/walletcontroller.h index 2c5783c094..956245775e 100644 --- a/src/qt/walletcontroller.h +++ b/src/qt/walletcontroller.h @@ -6,7 +6,6 @@ #define BITCOIN_QT_WALLETCONTROLLER_H #include <qt/sendcoinsrecipient.h> -#include <qt/walletmodel.h> #include <support/allocators/secure.h> #include <sync.h> @@ -24,10 +23,12 @@ class OptionsModel; class PlatformStyle; +class WalletModel; namespace interfaces { class Handler; class Node; +class Wallet; } // namespace interfaces class AskPassphraseDialog; |