highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-07-05 13:11:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Nuke walletmodel circular dependency

Browse Source
This commit is contained in:
Hennadii Stepanov
2019-11-19 12:08:01 +02:00
parent 49c4211c04
commit a53e9895db
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/qt/paymentserver.h
View File

@ -37,13 +37,16 @@
#endif #endif
#include <qt/sendcoinsrecipient.h> #include <qt/sendcoinsrecipient.h>
#include <qt/walletmodel.h>
#include <QObject> #include <QObject>
#include <QString> #include <QString>
class OptionsModel; class OptionsModel;
namespace interfaces {
class Node;
} // namespace interfaces
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QApplication; class QApplication;
class QByteArray; class QByteArray;

5
src/qt/transactiondesc.cpp
View File

@ -15,11 +15,12 @@
#include <consensus/consensus.h> #include <consensus/consensus.h>
#include <interfaces/node.h> #include <interfaces/node.h>
#include <interfaces/wallet.h>
#include <key_io.h> #include <key_io.h>
#include <validation.h> #include <policy/policy.h>
#include <script/script.h> #include <script/script.h>
#include <util/system.h> #include <util/system.h>
#include <policy/policy.h> #include <validation.h>
#include <wallet/ismine.h> #include <wallet/ismine.h>
#include <stdint.h> #include <stdint.h>

1
test/lint/lint-circular-dependencies.sh
View File

@ -18,7 +18,6 @@ EXPECTED_CIRCULAR_DEPENDENCIES=(
"qt/bitcoingui -> qt/walletframe -> qt/bitcoingui" "qt/bitcoingui -> qt/walletframe -> qt/bitcoingui"
"qt/bitcoingui -> qt/walletview -> qt/bitcoingui" "qt/bitcoingui -> qt/walletview -> qt/bitcoingui"
"qt/clientmodel -> qt/peertablemodel -> qt/clientmodel" "qt/clientmodel -> qt/peertablemodel -> qt/clientmodel"
"qt/paymentserver -> qt/walletmodel -> qt/paymentserver"
"qt/recentrequeststablemodel -> qt/walletmodel -> qt/recentrequeststablemodel" "qt/recentrequeststablemodel -> qt/walletmodel -> qt/recentrequeststablemodel"
"qt/sendcoinsdialog -> qt/walletmodel -> qt/sendcoinsdialog" "qt/sendcoinsdialog -> qt/walletmodel -> qt/sendcoinsdialog"
"qt/transactiontablemodel -> qt/walletmodel -> qt/transactiontablemodel" "qt/transactiontablemodel -> qt/walletmodel -> qt/transactiontablemodel"