Adjust code according to changes in the main repository

The following changes considered: - bitcoin/bitcoin#27419 - bitcoin/bitcoin#27491 - bitcoin/bitcoin#27576 - bitcoin/bitcoin#27636
bitcoin-core · Aug 29, 2023 · 592da16 · 592da16
1 parent b1f441f
commit 592da16
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/src/qml/bitcoin.cpp b/src/qml/bitcoin.cpp
@@ -5,6 +5,8 @@
 #include <qml/bitcoin.h>
 
 #include <chainparams.h>
+#include <common/args.h>
+#include <common/system.h>
 #include <init.h>
 #include <interfaces/chain.h>
 #include <interfaces/init.h>
@@ -30,7 +32,6 @@
 #include <qt/initexecutor.h>
 #include <qt/networkstyle.h>
 #include <qt/peertablemodel.h>
-#include <util/system.h>
 #include <util/threadnames.h>
 #include <util/translation.h>
 
@@ -192,7 +193,7 @@ int QmlGuiMain(int argc, char* argv[])
 
     /// Check for chain settings (Params() calls are only valid after this clause).
     try {
-        SelectParams(gArgs.GetChainName());
+        SelectParams(gArgs.GetChainType());
     } catch(std::exception &e) {
         InitError(Untranslated(strprintf("%s\n", e.what())));
         return EXIT_FAILURE;
@@ -248,7 +249,7 @@ int QmlGuiMain(int argc, char* argv[])
 #endif
 
     ChainModel chain_model{*chain};
-    chain_model.setCurrentNetworkName(QString::fromStdString(gArgs.GetChainName()));
+    chain_model.setCurrentNetworkName(QString::fromStdString(ChainTypeToString(gArgs.GetChainType())));
     setupChainQSettings(&app, chain_model.currentNetworkName());
 
     QObject::connect(&node_model, &NodeModel::setTimeRatioList, &chain_model, &ChainModel::setTimeRatioList);
@@ -268,7 +269,7 @@ int QmlGuiMain(int argc, char* argv[])
 
     QQmlApplicationEngine engine;
 
-    QScopedPointer<const NetworkStyle> network_style{NetworkStyle::instantiate(Params().NetworkIDString())};
+    QScopedPointer<const NetworkStyle> network_style{NetworkStyle::instantiate(Params().GetChainType())};
     assert(!network_style.isNull());
     engine.addImageProvider(QStringLiteral("images"), new ImageProvider{network_style.data()});
 

diff --git a/src/qml/models/options_model.cpp b/src/qml/models/options_model.cpp
@@ -4,13 +4,14 @@
 
 #include <qml/models/options_model.h>
 
+#include <common/args.h>
+#include <common/settings.h>
+#include <common/system.h>
 #include <interfaces/node.h>
 #include <qt/guiconstants.h>
 #include <qt/optionsmodel.h>
 #include <txdb.h>
 #include <univalue.h>
-#include <util/settings.h>
-#include <util/system.h>
 #include <validation.h>
 
 #include <cassert>
@@ -99,7 +100,7 @@ void OptionsQmlModel::setUpnp(bool new_upnp)
     }
 }
 
-util::SettingsValue OptionsQmlModel::pruneSetting() const
+common::SettingsValue OptionsQmlModel::pruneSetting() const
 {
     assert(!m_prune || m_prune_size_gb >= 1);
     return m_prune ? PruneGBtoMiB(m_prune_size_gb) : 0;

diff --git a/src/qml/models/options_model.h b/src/qml/models/options_model.h
@@ -6,8 +6,8 @@
 #define BITCOIN_QML_MODELS_OPTIONS_MODEL_H
 
 #include <txdb.h>
-#include <util/settings.h>
-#include <util/system.h>
+#include <common/settings.h>
+#include <common/system.h>
 #include <validation.h>
 
 #include <QObject>
@@ -84,7 +84,7 @@ class OptionsQmlModel : public QObject
     bool m_server;
     bool m_upnp;
 
-    util::SettingsValue pruneSetting() const;
+    common::SettingsValue pruneSetting() const;
 };
 
 #endif // BITCOIN_QML_MODELS_OPTIONS_MODEL_H