scripted-diff: Replace GetDataDir() calls with gArgs.GetDataDirNet() calls
-BEGIN VERIFY SCRIPT- git ls-files -- 'src' ':(exclude)src/util/system.h' ':(exclude)src/util/system.cpp' | xargs sed -i 's/GetDataDir()/gArgs.GetDataDirNet()/g'; -END VERIFY SCRIPT-
This commit is contained in:
1 parent
13bd8bb053
commit
4c3a5dcbfc
24 files changed
+43
-43
No files matched your search
@@ -221,7 +221,7 @@ QString ClientModel::formatClientStartupTime() const
|
||||
|
||||
QString ClientModel::dataDir() const
|
||||
{
|
||||
return GUIUtil::boostPathToQString(GetDataDir());
|
||||
return GUIUtil::boostPathToQString(gArgs.GetDataDirNet());
|
||||
}
|
||||
|
||||
QString ClientModel::blocksDir() const
|
||||
|
||||
+1
-1
@@ -405,7 +405,7 @@ void handleCloseWindowShortcut(QWidget* w)
|
||||
|
||||
void openDebugLogfile()
|
||||
{
|
||||
fs::path pathDebug = GetDataDir() / "debug.log";
|
||||
fs::path pathDebug = gArgs.GetDataDirNet() / "debug.log";
|
||||
|
||||
/* Open debug.log with the associated application */
|
||||
if (fs::exists(pathDebug))
|
||||
|
||||
+1
-1
@@ -45,7 +45,7 @@ public:
|
||||
* @returns true if a data directory was selected, false if the user cancelled the selection
|
||||
* dialog.
|
||||
*
|
||||
* @note do NOT call global GetDataDir() before calling this function, this
|
||||
* @note do NOT call global gArgs.GetDataDirNet() before calling this function, this
|
||||
* will cause the wrong path to be cached.
|
||||
*/
|
||||
static bool showIfNeeded(bool& did_show_intro, int64_t& prune_MiB);
|
||||
|
||||
@@ -65,7 +65,7 @@ void AppTests::appTests()
|
||||
|
||||
fs::create_directories([] {
|
||||
BasicTestingSetup test{CBaseChainParams::REGTEST}; // Create a temp data directory to backup the gui settings to
|
||||
return GetDataDir() / "blocks";
|
||||
return gArgs.GetDataDirNet() / "blocks";
|
||||
}());
|
||||
|
||||
qRegisterMetaType<interfaces::BlockAndHeaderTipInfo>("interfaces::BlockAndHeaderTipInfo");
|
||||
|
||||
Reference in new issue
Block a user