From 96751c4457553d71c92de2c74ffc6633aaf68958 Mon Sep 17 00:00:00 2001 From: "Admiral H. Curtiss" Date: Sun, 17 Apr 2022 03:28:34 +0200 Subject: [PATCH] Treewide: Rename references to SD Card image path to clarify they mean the image file, not the folder. --- Source/Core/Common/CommonPaths.h | 2 +- Source/Core/Common/FileUtil.cpp | 2 +- Source/Core/Common/FileUtil.h | 2 +- Source/Core/Core/Config/MainSettings.cpp | 2 +- Source/Core/Core/Config/MainSettings.h | 2 +- Source/Core/Core/IOS/SDIO/SDIOSlot0.cpp | 2 +- Source/Core/Core/NetPlayClient.cpp | 2 +- Source/Core/DolphinQt/Settings/PathPane.cpp | 7 ++++--- Source/Core/UICommon/UICommon.cpp | 2 +- 9 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Source/Core/Common/CommonPaths.h b/Source/Core/Common/CommonPaths.h index 306dbb78ff..f697f6b383 100644 --- a/Source/Core/Common/CommonPaths.h +++ b/Source/Core/Common/CommonPaths.h @@ -128,7 +128,7 @@ #define WII_STATE "state.dat" -#define WII_SDCARD "sd.raw" +#define WII_SD_CARD_IMAGE "sd.raw" #define WII_BTDINF_BACKUP "btdinf.bak" #define WII_SETTING "setting.txt" diff --git a/Source/Core/Common/FileUtil.cpp b/Source/Core/Common/FileUtil.cpp index b03a22f108..030ae169a5 100644 --- a/Source/Core/Common/FileUtil.cpp +++ b/Source/Core/Common/FileUtil.cpp @@ -994,7 +994,7 @@ static void RebuildUserDirectories(unsigned int dir_index) s_user_paths[F_ARAMDUMP_IDX] = s_user_paths[D_DUMP_IDX] + ARAM_DUMP; s_user_paths[F_FAKEVMEMDUMP_IDX] = s_user_paths[D_DUMP_IDX] + FAKEVMEM_DUMP; s_user_paths[F_GCSRAM_IDX] = s_user_paths[D_GCUSER_IDX] + GC_SRAM; - s_user_paths[F_WIISDCARD_IDX] = s_user_paths[D_WIIROOT_IDX] + WII_SDCARD; + s_user_paths[F_WIISDCARDIMAGE_IDX] = s_user_paths[D_WIIROOT_IDX] + WII_SD_CARD_IMAGE; s_user_paths[D_MEMORYWATCHER_IDX] = s_user_paths[D_USER_IDX] + MEMORYWATCHER_DIR DIR_SEP; s_user_paths[F_MEMORYWATCHERLOCATIONS_IDX] = diff --git a/Source/Core/Common/FileUtil.h b/Source/Core/Common/FileUtil.h index 2b8d59ae2a..c0bcb8f451 100644 --- a/Source/Core/Common/FileUtil.h +++ b/Source/Core/Common/FileUtil.h @@ -79,7 +79,7 @@ enum F_GCSRAM_IDX, F_MEMORYWATCHERLOCATIONS_IDX, F_MEMORYWATCHERSOCKET_IDX, - F_WIISDCARD_IDX, + F_WIISDCARDIMAGE_IDX, F_DUALSHOCKUDPCLIENTCONFIG_IDX, F_FREELOOKCONFIG_IDX, F_GBABIOS_IDX, diff --git a/Source/Core/Core/Config/MainSettings.cpp b/Source/Core/Core/Config/MainSettings.cpp index c3161e924e..90b60000f3 100644 --- a/Source/Core/Core/Config/MainSettings.cpp +++ b/Source/Core/Core/Config/MainSettings.cpp @@ -268,7 +268,7 @@ const Info MAIN_DUMP_PATH{{System::Main, "General", "DumpPath"}, "" const Info MAIN_LOAD_PATH{{System::Main, "General", "LoadPath"}, ""}; const Info MAIN_RESOURCEPACK_PATH{{System::Main, "General", "ResourcePackPath"}, ""}; const Info MAIN_FS_PATH{{System::Main, "General", "NANDRootPath"}, ""}; -const Info MAIN_SD_PATH{{System::Main, "General", "WiiSDCardPath"}, ""}; +const Info MAIN_WII_SD_CARD_IMAGE_PATH{{System::Main, "General", "WiiSDCardPath"}, ""}; const Info MAIN_WFS_PATH{{System::Main, "General", "WFSPath"}, ""}; const Info MAIN_SHOW_LAG{{System::Main, "General", "ShowLag"}, false}; const Info MAIN_SHOW_FRAME_COUNT{{System::Main, "General", "ShowFrameCount"}, false}; diff --git a/Source/Core/Core/Config/MainSettings.h b/Source/Core/Core/Config/MainSettings.h index 4261eed960..d354414bf3 100644 --- a/Source/Core/Core/Config/MainSettings.h +++ b/Source/Core/Core/Config/MainSettings.h @@ -178,7 +178,7 @@ extern const Info MAIN_DUMP_PATH; extern const Info MAIN_LOAD_PATH; extern const Info MAIN_RESOURCEPACK_PATH; extern const Info MAIN_FS_PATH; -extern const Info MAIN_SD_PATH; +extern const Info MAIN_WII_SD_CARD_IMAGE_PATH; extern const Info MAIN_WFS_PATH; extern const Info MAIN_SHOW_LAG; extern const Info MAIN_SHOW_FRAME_COUNT; diff --git a/Source/Core/Core/IOS/SDIO/SDIOSlot0.cpp b/Source/Core/Core/IOS/SDIO/SDIOSlot0.cpp index d12121ce8b..f9e56d3d74 100644 --- a/Source/Core/Core/IOS/SDIO/SDIOSlot0.cpp +++ b/Source/Core/Core/IOS/SDIO/SDIOSlot0.cpp @@ -89,7 +89,7 @@ void SDIOSlot0Device::EventNotify() void SDIOSlot0Device::OpenInternal() { - const std::string filename = File::GetUserPath(F_WIISDCARD_IDX); + const std::string filename = File::GetUserPath(F_WIISDCARDIMAGE_IDX); m_card.Open(filename, "r+b"); if (!m_card) { diff --git a/Source/Core/Core/NetPlayClient.cpp b/Source/Core/Core/NetPlayClient.cpp index 20c05ce4cc..d4e8e5fa35 100644 --- a/Source/Core/Core/NetPlayClient.cpp +++ b/Source/Core/Core/NetPlayClient.cpp @@ -2479,7 +2479,7 @@ void NetPlayClient::ComputeMD5(const SyncIdentifier& sync_identifier) std::string file; if (sync_identifier == GetSDCardIdentifier()) - file = File::GetUserPath(F_WIISDCARD_IDX); + file = File::GetUserPath(F_WIISDCARDIMAGE_IDX); else if (auto game = m_dialog->FindGameFile(sync_identifier)) file = game->GetFilePath(); diff --git a/Source/Core/DolphinQt/Settings/PathPane.cpp b/Source/Core/DolphinQt/Settings/PathPane.cpp index 0ffed709c4..a1eec28aa9 100644 --- a/Source/Core/DolphinQt/Settings/PathPane.cpp +++ b/Source/Core/DolphinQt/Settings/PathPane.cpp @@ -102,7 +102,8 @@ void PathPane::BrowseResourcePack() void PathPane::BrowseSDCard() { QString file = QDir::toNativeSeparators(DolphinFileDialog::getOpenFileName( - this, tr("Select a SD Card Image"), QString::fromStdString(Config::Get(Config::MAIN_SD_PATH)), + this, tr("Select a SD Card Image"), + QString::fromStdString(Config::Get(Config::MAIN_WII_SD_CARD_IMAGE_PATH)), tr("SD Card Image (*.raw);;" "All Files (*)"))); if (!file.isEmpty()) @@ -125,7 +126,7 @@ void PathPane::BrowseWFS() void PathPane::OnSDCardPathChanged() { - Config::SetBase(Config::MAIN_SD_PATH, m_sdcard_edit->text().toStdString()); + Config::SetBase(Config::MAIN_WII_SD_CARD_IMAGE_PATH, m_sdcard_edit->text().toStdString()); } void PathPane::OnNANDPathChanged() @@ -241,7 +242,7 @@ QGridLayout* PathPane::MakePathsLayout() layout->addWidget(m_resource_pack_edit, 4, 1); layout->addWidget(resource_pack_open, 4, 2); - m_sdcard_edit = new QLineEdit(QString::fromStdString(File::GetUserPath(F_WIISDCARD_IDX))); + m_sdcard_edit = new QLineEdit(QString::fromStdString(File::GetUserPath(F_WIISDCARDIMAGE_IDX))); connect(m_sdcard_edit, &QLineEdit::editingFinished, this, &PathPane::OnSDCardPathChanged); QPushButton* sdcard_open = new NonDefaultQPushButton(QStringLiteral("...")); connect(sdcard_open, &QPushButton::clicked, this, &PathPane::BrowseSDCard); diff --git a/Source/Core/UICommon/UICommon.cpp b/Source/Core/UICommon/UICommon.cpp index 4e214d534e..b7a97a68a3 100644 --- a/Source/Core/UICommon/UICommon.cpp +++ b/Source/Core/UICommon/UICommon.cpp @@ -91,7 +91,7 @@ static void InitCustomPaths() CreateDumpPath(Config::Get(Config::MAIN_DUMP_PATH)); CreateResourcePackPath(Config::Get(Config::MAIN_RESOURCEPACK_PATH)); CreateWFSPath(Config::Get(Config::MAIN_WFS_PATH)); - File::SetUserPath(F_WIISDCARD_IDX, Config::Get(Config::MAIN_SD_PATH)); + File::SetUserPath(F_WIISDCARDIMAGE_IDX, Config::Get(Config::MAIN_WII_SD_CARD_IMAGE_PATH)); #ifdef HAS_LIBMGBA File::SetUserPath(F_GBABIOS_IDX, Config::Get(Config::MAIN_GBA_BIOS_PATH)); File::SetUserPath(D_GBASAVES_IDX, Config::Get(Config::MAIN_GBA_SAVES_PATH));