From af2ccbb9dad2be73c38e42036618e9291e366232 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sat, 12 Oct 2013 16:08:39 -0700 Subject: [PATCH] Rename flashDirectory to flash0Directory. --- Core/Config.h | 2 +- Core/System.cpp | 2 +- Qt/QtHost.cpp | 2 +- UI/NativeApp.cpp | 6 +++--- android/jni/TestRunner.cpp | 2 +- headless/Headless.cpp | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Core/Config.h b/Core/Config.h index d37e20594c..a62573f93b 100644 --- a/Core/Config.h +++ b/Core/Config.h @@ -173,7 +173,7 @@ public: std::string currentDirectory; std::string externalDirectory; std::string memCardDirectory; - std::string flashDirectory; + std::string flash0Directory; std::string internalDataDirectory; void Load(const char *iniFileName = "ppsspp.ini", const char *controllerIniFilename = "controls.ini"); diff --git a/Core/System.cpp b/Core/System.cpp index 76cc0b7fc4..f0ddf3ccc1 100644 --- a/Core/System.cpp +++ b/Core/System.cpp @@ -379,6 +379,6 @@ void GetSysDirectories(std::string &memstickpath, std::string &flash0path) { #else // TODO memstickpath = g_Config.memCardDirectory; - flash0path = g_Config.flashDirectory; + flash0path = g_Config.flash0Directory; #endif } diff --git a/Qt/QtHost.cpp b/Qt/QtHost.cpp index 6f6d3b780b..d9777f2735 100644 --- a/Qt/QtHost.cpp +++ b/Qt/QtHost.cpp @@ -309,7 +309,7 @@ void NativeInit(int argc, const char *argv[], const char *savegame_directory, co } g_Config.memCardDirectory = QDir::homePath().toStdString()+"/.ppsspp/"; - g_Config.flashDirectory = g_Config.memCardDirectory+"/flash0/"; + g_Config.flash0Directory = g_Config.memCardDirectory+"/flash0/"; LogManager::Init(); if (fileToLog != NULL) diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp index 938e10e8b5..87e6c9c169 100644 --- a/UI/NativeApp.cpp +++ b/UI/NativeApp.cpp @@ -252,14 +252,14 @@ void NativeInit(int argc, const char *argv[], // that for most people, using external memory (SDCard/USB Storage) makes the // most sense. g_Config.memCardDirectory = std::string(external_directory) + "/"; - g_Config.flashDirectory = std::string(external_directory) + "/flash0/"; + g_Config.flash0Directory = std::string(external_directory) + "/flash0/"; #elif defined(BLACKBERRY) || defined(__SYMBIAN32__) || defined(MEEGO_EDITION_HARMATTAN) || defined(IOS) g_Config.memCardDirectory = user_data_path; - g_Config.flashDirectory = std::string(external_directory) + "/flash0/"; + g_Config.flash0Directory = std::string(external_directory) + "/flash0/"; #elif !defined(_WIN32) // Linux, Mac. Does this path really make sense? g_Config.memCardDirectory = std::string(getenv("HOME")) + "/.ppsspp/"; - g_Config.flashDirectory = g_Config.memCardDirectory + "/flash0/"; + g_Config.flash0Directory = g_Config.memCardDirectory + "/flash0/"; #endif #ifndef _WIN32 diff --git a/android/jni/TestRunner.cpp b/android/jni/TestRunner.cpp index 11d9ca7ddd..1c5299c57b 100644 --- a/android/jni/TestRunner.cpp +++ b/android/jni/TestRunner.cpp @@ -73,7 +73,7 @@ void RunTests() coreParam.updateRecent = false; #ifdef IOS - std::string baseDirectory = g_Config.flashDirectory + "../"; + std::string baseDirectory = g_Config.flash0Directory + "../"; #else std::string baseDirectory = g_Config.memCardDirectory; #endif diff --git a/headless/Headless.cpp b/headless/Headless.cpp index 41be9205b4..da2658911f 100644 --- a/headless/Headless.cpp +++ b/headless/Headless.cpp @@ -329,7 +329,7 @@ int main(int argc, const char* argv[]) #elif defined(BLACKBERRY) || defined(__SYMBIAN32__) #elif !defined(_WIN32) g_Config.memCardDirectory = std::string(getenv("HOME"))+"/.ppsspp/"; - g_Config.flashDirectory = g_Config.memCardDirectory+"/flash/"; + g_Config.flash0Directory = g_Config.memCardDirectory+"/flash/"; #endif if (screenshotFilename != 0)