diff options
author | fanquake <fanquake@gmail.com> | 2023-04-21 11:04:26 +0100 |
---|---|---|
committer | fanquake <fanquake@gmail.com> | 2023-04-21 11:19:08 +0100 |
commit | 669af326329b01a739aa5ee79c2e8002818fa4cc (patch) | |
tree | c40fe3188f52938875b3404ee7dcbd232ab21db2 /src/qt | |
parent | 4c40837a454996c9f704ebf060efd6b249f2e362 (diff) | |
parent | be55f545d53d44fdcf2d8ae802e9eae551d120c6 (diff) |
Merge bitcoin/bitcoin#27419: move-only: Extract common/args from util/system
be55f545d53d44fdcf2d8ae802e9eae551d120c6 move-only: Extract common/args and common/config.cpp from util/system (TheCharlatan)
Pull request description:
This pull request is part of the `libbitcoinkernel` project https://github.com/bitcoin/bitcoin/issues/24303 https://github.com/bitcoin/bitcoin/projects/18 and more specifically its "Step 2: Decouple most non-consensus code from libbitcoinkernel". It is part of a series of patches splitting up the `util/system` files. Its preceding pull request is https://github.com/bitcoin/bitcoin/pull/27254.
The pull request contains an extraction of ArgsManager related functions from util/system into their own common/ file.
The background of this commit is an ongoing effort to decouple the libbitcoinkernel library from the ArgsManager. The ArgsManager belongs into the common library, since the kernel library should not depend on it. See [doc/design/libraries.md](https://github.com/bitcoin/bitcoin/blob/master/doc/design/libraries.md) for more information on this rationale.
ACKs for top commit:
MarcoFalke:
re-ACK be55f545d53d44fdcf2d8ae802e9eae551d120c6 🚲
ryanofsky:
Code review ACK be55f545d53d44fdcf2d8ae802e9eae551d120c6. Just small cleanups since the last review.
hebasto:
ACK be55f545d53d44fdcf2d8ae802e9eae551d120c6, I have reviewed the code and it looks OK, I agree it can be merged.
Tree-SHA512: 90eb03334af0155b823030b4f2ecf286d35058d700ee2ddbbaa445be19e31eb0fe982656f35bd14ecee3ad2c3d0db3746855cb8f3777eff7253713e42873e111
Diffstat (limited to 'src/qt')
-rw-r--r-- | src/qt/bitcoin.cpp | 3 | ||||
-rw-r--r-- | src/qt/clientmodel.cpp | 1 | ||||
-rw-r--r-- | src/qt/guiutil.cpp | 3 | ||||
-rw-r--r-- | src/qt/intro.cpp | 2 | ||||
-rw-r--r-- | src/qt/optionsmodel.cpp | 6 | ||||
-rw-r--r-- | src/qt/paymentserver.cpp | 2 | ||||
-rw-r--r-- | src/qt/test/optiontests.cpp | 2 | ||||
-rw-r--r-- | src/qt/utilitydialog.cpp | 2 | ||||
-rw-r--r-- | src/qt/walletmodel.cpp | 2 |
9 files changed, 13 insertions, 10 deletions
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index f604039427..2f00009596 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -9,6 +9,7 @@ #include <qt/bitcoin.h> #include <chainparams.h> +#include <common/args.h> #include <common/init.h> #include <init.h> #include <interfaces/handler.h> @@ -494,7 +495,7 @@ static void SetupUIArgs(ArgsManager& argsman) int GuiMain(int argc, char* argv[]) { #ifdef WIN32 - util::WinCmdLineArgs winArgs; + common::WinCmdLineArgs winArgs; std::tie(argc, argv) = winArgs.get(); #endif diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp index 8411ec4696..837e5f4fed 100644 --- a/src/qt/clientmodel.cpp +++ b/src/qt/clientmodel.cpp @@ -11,6 +11,7 @@ #include <qt/peertablesortproxy.h> #include <clientversion.h> +#include <common/args.h> #include <interfaces/handler.h> #include <interfaces/node.h> #include <net.h> diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp index e98d953fd2..dc7daed4bc 100644 --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -12,8 +12,10 @@ #include <base58.h> #include <chainparams.h> +#include <common/args.h> #include <interfaces/node.h> #include <key_io.h> +#include <logging.h> #include <policy/policy.h> #include <primitives/transaction.h> #include <protocol.h> @@ -22,7 +24,6 @@ #include <util/exception.h> #include <util/fs.h> #include <util/fs_helpers.h> -#include <util/system.h> #include <util/time.h> #ifdef WIN32 diff --git a/src/qt/intro.cpp b/src/qt/intro.cpp index 6423e457aa..a54ba19354 100644 --- a/src/qt/intro.cpp +++ b/src/qt/intro.cpp @@ -15,9 +15,9 @@ #include <qt/guiutil.h> #include <qt/optionsmodel.h> +#include <common/args.h> #include <interfaces/node.h> #include <util/fs_helpers.h> -#include <util/system.h> #include <validation.h> #include <QFileDialog> diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp index bee8fafddc..87a7e703b8 100644 --- a/src/qt/optionsmodel.cpp +++ b/src/qt/optionsmodel.cpp @@ -12,14 +12,14 @@ #include <qt/guiconstants.h> #include <qt/guiutil.h> +#include <common/args.h> #include <interfaces/node.h> #include <mapport.h> #include <net.h> #include <netbase.h> -#include <txdb.h> // for -dbcache defaults +#include <txdb.h> // for -dbcache defaults #include <util/string.h> -#include <util/system.h> -#include <validation.h> // For DEFAULT_SCRIPTCHECK_THREADS +#include <validation.h> // For DEFAULT_SCRIPTCHECK_THREADS #include <wallet/wallet.h> // For DEFAULT_SPEND_ZEROCONF_CHANGE #include <QDebug> diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp index 3f9d1b040b..592e591edb 100644 --- a/src/qt/paymentserver.cpp +++ b/src/qt/paymentserver.cpp @@ -13,11 +13,11 @@ #include <qt/optionsmodel.h> #include <chainparams.h> +#include <common/args.h> #include <interfaces/node.h> #include <key_io.h> #include <node/interface_ui.h> #include <policy/policy.h> -#include <util/system.h> #include <wallet/wallet.h> #include <cstdlib> diff --git a/src/qt/test/optiontests.cpp b/src/qt/test/optiontests.cpp index dc7c8928c5..0838e21678 100644 --- a/src/qt/test/optiontests.cpp +++ b/src/qt/test/optiontests.cpp @@ -2,12 +2,12 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#include <common/args.h> #include <init.h> #include <qt/bitcoin.h> #include <qt/guiutil.h> #include <qt/test/optiontests.h> #include <test/util/setup_common.h> -#include <util/system.h> #include <QSettings> #include <QTest> diff --git a/src/qt/utilitydialog.cpp b/src/qt/utilitydialog.cpp index eb2ab12a66..f43b993628 100644 --- a/src/qt/utilitydialog.cpp +++ b/src/qt/utilitydialog.cpp @@ -13,8 +13,8 @@ #include <qt/guiutil.h> #include <clientversion.h> +#include <common/args.h> #include <init.h> -#include <util/system.h> #include <util/strencodings.h> #include <cstdio> diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp index fdd96c664a..ee3327530c 100644 --- a/src/qt/walletmodel.cpp +++ b/src/qt/walletmodel.cpp @@ -18,12 +18,12 @@ #include <qt/sendcoinsdialog.h> #include <qt/transactiontablemodel.h> +#include <common/args.h> // for GetBoolArg #include <interfaces/handler.h> #include <interfaces/node.h> #include <key_io.h> #include <node/interface_ui.h> #include <psbt.h> -#include <util/system.h> // for GetBoolArg #include <util/translation.h> #include <wallet/coincontrol.h> #include <wallet/wallet.h> // for CRecipient |