diff --git a/src/qt/guiutil.h b/src/qt/guiutil.h --- a/src/qt/guiutil.h +++ b/src/qt/guiutil.h @@ -98,6 +98,11 @@ void setClipboard(const QString &str); +/** + * Determine default data directory for operating system. + */ +QString getDefaultDataDirectory(); + /** Get save filename, mimics QFileDialog::getSaveFileName, except that it appends a default suffix when no suffix is provided by the user. diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -266,6 +266,10 @@ return view->selectionModel()->selectedRows(column); } +QString getDefaultDataDirectory() { + return boostPathToQString(GetDefaultDataDir()); +} + QString getSaveFileName(QWidget *parent, const QString &caption, const QString &dir, const QString &filter, QString *selectedSuffixOut) { diff --git a/src/qt/intro.h b/src/qt/intro.h --- a/src/qt/intro.h +++ b/src/qt/intro.h @@ -50,11 +50,6 @@ */ static bool showIfNeeded(bool &did_show_intro, bool &prune); - /** - * Determine default data directory for operating system. - */ - static QString getDefaultDataDirectory(); - Q_SIGNALS: void requestCheck(); diff --git a/src/qt/intro.cpp b/src/qt/intro.cpp --- a/src/qt/intro.cpp +++ b/src/qt/intro.cpp @@ -172,7 +172,7 @@ void Intro::setDataDirectory(const QString &dataDir) { ui->dataDirectory->setText(dataDir); - if (dataDir == getDefaultDataDirectory()) { + if (dataDir == GUIUtil::getDefaultDataDirectory()) { ui->dataDirDefault->setChecked(true); ui->dataDirectory->setEnabled(false); ui->ellipsisButton->setEnabled(false); @@ -183,10 +183,6 @@ } } -QString Intro::getDefaultDataDirectory() { - return GUIUtil::boostPathToQString(GetDefaultDataDir()); -} - bool Intro::showIfNeeded(bool &did_show_intro, bool &prune) { did_show_intro = false; @@ -197,7 +193,7 @@ return true; } /* 1) Default data directory for operating system */ - QString dataDir = getDefaultDataDirectory(); + QString dataDir = GUIUtil::getDefaultDataDirectory(); /* 2) Allow QSettings to override default dir */ dataDir = settings.value("strDataDir", dataDir).toString(); @@ -261,7 +257,7 @@ * override -datadir in the bitcoin.conf file in the default data directory * (to be consistent with bitcoind behavior) */ - if (dataDir != getDefaultDataDirectory()) { + if (dataDir != GUIUtil::getDefaultDataDirectory()) { // use OS locale for path setting gArgs.SoftSetArg("-datadir", GUIUtil::qstringToBoostPath(dataDir).string()); @@ -319,7 +315,7 @@ } void Intro::on_dataDirDefault_clicked() { - setDataDirectory(getDefaultDataDirectory()); + setDataDirectory(GUIUtil::getDefaultDataDirectory()); } void Intro::on_dataDirCustom_clicked() { diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp --- a/src/qt/optionsmodel.cpp +++ b/src/qt/optionsmodel.cpp @@ -14,7 +14,6 @@ #include #include #include -#include #include // for -dbcache defaults #include #include // For DEFAULT_SCRIPTCHECK_THREADS @@ -125,7 +124,7 @@ } if (!settings.contains("strDataDir")) { - settings.setValue("strDataDir", Intro::getDefaultDataDirectory()); + settings.setValue("strDataDir", GUIUtil::getDefaultDataDirectory()); } // Wallet @@ -226,7 +225,7 @@ BackupSettings(GetDataDir(true) / "guisettings.ini.bak", settings); // Save the strDataDir setting - QString dataDir = Intro::getDefaultDataDirectory(); + QString dataDir = GUIUtil::getDefaultDataDirectory(); dataDir = settings.value("strDataDir", dataDir).toString(); // Remove all entries from our QSettings object