aboutsummaryrefslogtreecommitdiff
path: root/src/qt
diff options
context:
space:
mode:
authorRussell Yanofsky <russ@yanofsky.org>2017-04-17 15:44:10 -0400
committerJohn Newbery <john@johnnewbery.com>2018-04-04 16:52:40 -0400
commitd7c2c9594897c39df6739b92610dfb5a7a1cb3ec (patch)
tree0b8355cffe4a206c43051ada4f2b796b2a6ccf2c /src/qt
parentfe6f27e6ea68a139d3a98b30a53706008ef8b132 (diff)
Remove direct bitcoin calls from qt/intro.cpp
Diffstat (limited to 'src/qt')
-rw-r--r--src/qt/bitcoin.cpp2
-rw-r--r--src/qt/intro.cpp8
-rw-r--r--src/qt/intro.h6
3 files changed, 11 insertions, 5 deletions
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index ba473bb4e8..279726d6df 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -602,7 +602,7 @@ int main(int argc, char *argv[])
/// 5. Now that settings and translations are available, ask user for data directory
// User language is set up: pick a data directory
- if (!Intro::pickDataDirectory())
+ if (!Intro::pickDataDirectory(*node))
return EXIT_SUCCESS;
/// 6. Determine availability of data and blocks directory and parse bitcoin.conf
diff --git a/src/qt/intro.cpp b/src/qt/intro.cpp
index e69f196238..4eb7482018 100644
--- a/src/qt/intro.cpp
+++ b/src/qt/intro.cpp
@@ -12,6 +12,7 @@
#include <qt/guiutil.h>
+#include <interface/node.h>
#include <util.h>
#include <QFileDialog>
@@ -186,7 +187,7 @@ QString Intro::getDefaultDataDirectory()
return GUIUtil::boostPathToQString(GetDefaultDataDir());
}
-bool Intro::pickDataDirectory()
+bool Intro::pickDataDirectory(interface::Node& node)
{
QSettings settings;
/* If data directory provided on command line, no need to look at settings
@@ -233,8 +234,9 @@ bool Intro::pickDataDirectory()
* override -datadir in the bitcoin.conf file in the default data directory
* (to be consistent with bitcoind behavior)
*/
- if(dataDir != getDefaultDataDirectory())
- gArgs.SoftSetArg("-datadir", GUIUtil::qstringToBoostPath(dataDir).string()); // use OS locale for path setting
+ if(dataDir != getDefaultDataDirectory()) {
+ node.softSetArg("-datadir", GUIUtil::qstringToBoostPath(dataDir).string()); // use OS locale for path setting
+ }
return true;
}
diff --git a/src/qt/intro.h b/src/qt/intro.h
index 5b428b379c..07d2025bb6 100644
--- a/src/qt/intro.h
+++ b/src/qt/intro.h
@@ -13,6 +13,10 @@ static const bool DEFAULT_CHOOSE_DATADIR = false;
class FreespaceChecker;
+namespace interface {
+ class Node;
+}
+
namespace Ui {
class Intro;
}
@@ -41,7 +45,7 @@ public:
* @note do NOT call global GetDataDir() before calling this function, this
* will cause the wrong path to be cached.
*/
- static bool pickDataDirectory();
+ static bool pickDataDirectory(interface::Node& node);
/**
* Determine default data directory for operating system.