diff options
| author | Matt Corallo <git@bluematt.me> | 2016-11-29 18:45:24 -0800 |
|---|---|---|
| committer | Matt Corallo <git@bluematt.me> | 2016-12-24 11:29:33 -0500 |
| commit | 4cd373aea8d20356727f7d65e0bc818beb6523dc (patch) | |
| tree | 945990959f03be82089270427a7595431459942b /src/qt | |
| parent | 71fde5563b5d05a63e3ad08a3c32a9e5ffb952f7 (diff) | |
Un-expose mapArgs from utils.h
Diffstat (limited to 'src/qt')
| -rw-r--r-- | src/qt/bitcoin.cpp | 2 | ||||
| -rw-r--r-- | src/qt/optionsmodel.cpp | 4 | ||||
| -rw-r--r-- | src/qt/test/rpcnestedtests.cpp | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index 9d80a38008..36d803ce07 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -604,7 +604,7 @@ int main(int argc, char *argv[]) if (!boost::filesystem::is_directory(GetDataDir(false))) { QMessageBox::critical(0, QObject::tr(PACKAGE_NAME), - QObject::tr("Error: Specified data directory \"%1\" does not exist.").arg(QString::fromStdString(mapArgs["-datadir"]))); + QObject::tr("Error: Specified data directory \"%1\" does not exist.").arg(QString::fromStdString(GetArg("-datadir", "")))); return EXIT_FAILURE; } try { diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp index d48c4d91e7..ce3a040109 100644 --- a/src/qt/optionsmodel.cpp +++ b/src/qt/optionsmodel.cpp @@ -36,7 +36,7 @@ OptionsModel::OptionsModel(QObject *parent, bool resetSettings) : void OptionsModel::addOverriddenOption(const std::string &option) { - strOverriddenByCommandLine += QString::fromStdString(option) + "=" + QString::fromStdString(mapArgs[option]) + " "; + strOverriddenByCommandLine += QString::fromStdString(option) + "=" + QString::fromStdString(GetArg(option, "")) + " "; } // Writes all missing QSettings with their default values @@ -464,4 +464,4 @@ void OptionsModel::checkAndMigrate() settings.setValue(strSettingsVersionKey, CLIENT_VERSION); } -}
\ No newline at end of file +} diff --git a/src/qt/test/rpcnestedtests.cpp b/src/qt/test/rpcnestedtests.cpp index 26ac5e2114..972dad72d0 100644 --- a/src/qt/test/rpcnestedtests.cpp +++ b/src/qt/test/rpcnestedtests.cpp @@ -19,6 +19,8 @@ #include <boost/filesystem.hpp> +extern std::map<std::string, std::string> mapArgs; + static UniValue rpcNestedTest_rpc(const JSONRPCRequest& request) { if (request.fHelp) { |