diff options
| author | Jonas Schnelli <dev@jonasschnelli.ch> | 2019-04-23 18:10:45 +0200 |
|---|---|---|
| committer | Jonas Schnelli <dev@jonasschnelli.ch> | 2019-04-23 18:11:01 +0200 |
| commit | e9e777e21b42b3f4d5aef1650d72036e72170ba2 (patch) | |
| tree | ec2ecd7ed082a5421ac1257d31443ff9d46c1e3e /test | |
| parent | cd14d210c4156a0a17450d3d451a92ae3938b019 (diff) | |
| parent | fa1c8e297825fbaeda049c8bf36f39de919a9989 (diff) | |
| download | bitcoin-e9e777e21b42b3f4d5aef1650d72036e72170ba2.tar.xz | |
Merge #15874: Resolve the qt/guiutil <-> qt/optionsmodel CD
fa1c8e297 Resolve the qt/guiutil <-> qt/optionsmodal CD (251)
Pull request description:
This pull request attempts to resolve the `qt/guiutil` <-> `qt/optionsmodel` circular dependency.
The `Intro` class in `qt/intro` has a static member function `getDefaultDataDirectory` which is used by `qt/optionsmodel` and creates the circular dependency
`qt/guiutil -> qt/walletmodel -> qt/optionsmodel -> qt/intro -> qt/guiutil`.
This circular dependency is resolved by moving `Intro::getDefaultDataDirectory` to `GUIUtil::getDefaultDataDirectory` without modifying the implementation.
ACKs for commit fa1c8e:
MarcoFalke:
utACK fa1c8e297825fbaeda049c8bf36f39de919a9989
promag:
utACK fa1c8e2.
hebasto:
utACK fa1c8e297825fbaeda049c8bf36f39de919a9989
practicalswift:
utACK fa1c8e297825fbaeda049c8bf36f39de919a9989
jonasschnelli:
utACK fa1c8e297825fbaeda049c8bf36f39de919a9989
Tree-SHA512: 58cc4aee937c943d8de9dc97ef1789decfddb0287308f44e7e3a3b497c19e51da184988e17207544fff410168ec98dd49a3e62c47e84ad1f0cf6ef7247a80fb5
Diffstat (limited to 'test')
| -rwxr-xr-x | test/lint/lint-circular-dependencies.sh | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/test/lint/lint-circular-dependencies.sh b/test/lint/lint-circular-dependencies.sh index e59a5ce126..e1a99abc49 100755 --- a/test/lint/lint-circular-dependencies.sh +++ b/test/lint/lint-circular-dependencies.sh @@ -36,7 +36,6 @@ EXPECTED_CIRCULAR_DEPENDENCIES=( "txmempool -> validation -> validationinterface -> txmempool" "qt/addressbookpage -> qt/bitcoingui -> qt/walletview -> qt/receivecoinsdialog -> qt/addressbookpage" "qt/addressbookpage -> qt/bitcoingui -> qt/walletview -> qt/signverifymessagedialog -> qt/addressbookpage" - "qt/guiutil -> qt/walletmodel -> qt/optionsmodel -> qt/intro -> qt/guiutil" "qt/addressbookpage -> qt/bitcoingui -> qt/walletview -> qt/sendcoinsdialog -> qt/sendcoinsentry -> qt/addressbookpage" ) |