Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-22 14:15:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Some code cleanup in FileData.cpp

Browse source
This commit is contained in:
Leon Styhre 2022-05-21 14:48:29 +02:00
parent c66d2ace27
commit eb47511bbc
1 changed files with 68 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

136
es-app/src/FileData.cpp
View file

@ -76,7 +76,7 @@ FileData::~FileData()
std::string FileData::getDisplayName() const std::string FileData::getDisplayName() const
{ {
std::string stem = Utils::FileSystem::getStem(mPath); std::string stem {Utils::FileSystem::getStem(mPath)};
return stem; return stem;
} }
@ -156,7 +156,7 @@ const std::vector<FileData*> FileData::getChildrenRecursive() const
childrenRecursive.emplace_back((*it).second); childrenRecursive.emplace_back((*it).second);
// Recurse through any subdirectories. // Recurse through any subdirectories.
if ((*it).second->getType() == FOLDER) { if ((*it).second->getType() == FOLDER) {
std::vector<FileData*> childrenSubdirectory = (*it).second->getChildrenRecursive(); std::vector<FileData*> childrenSubdirectory {(*it).second->getChildrenRecursive()};
childrenRecursive.insert(childrenRecursive.end(), childrenSubdirectory.begin(), childrenRecursive.insert(childrenRecursive.end(), childrenSubdirectory.begin(),
childrenSubdirectory.end()); childrenSubdirectory.end());
} }
@ -167,8 +167,8 @@ const std::vector<FileData*> FileData::getChildrenRecursive() const
const std::string FileData::getROMDirectory() const std::string FileData::getROMDirectory()
{ {
std::string romDirSetting = Settings::getInstance()->getString("ROMDirectory"); std::string romDirSetting {Settings::getInstance()->getString("ROMDirectory")};
std::string romDirPath = ""; std::string romDirPath;
if (romDirSetting == "") { if (romDirSetting == "") {
romDirPath = Utils::FileSystem::getHomePath() + "/ROMs/"; romDirPath = Utils::FileSystem::getHomePath() + "/ROMs/";
@ -196,8 +196,8 @@ const std::string FileData::getROMDirectory()
const std::string FileData::getMediaDirectory() const std::string FileData::getMediaDirectory()
{ {
std::string mediaDirSetting = Settings::getInstance()->getString("MediaDirectory"); std::string mediaDirSetting {Settings::getInstance()->getString("MediaDirectory")};
std::string mediaDirPath = ""; std::string mediaDirPath;
if (mediaDirSetting == "") { if (mediaDirSetting == "") {
mediaDirPath = Utils::FileSystem::getHomePath() + "/.emulationstation/downloaded_media/"; mediaDirPath = Utils::FileSystem::getHomePath() + "/.emulationstation/downloaded_media/";
@ -221,7 +221,7 @@ const std::string FileData::getMediaDirectory()
const std::string FileData::getMediafilePath(const std::string& subdirectory) const const std::string FileData::getMediafilePath(const std::string& subdirectory) const
{ {
const std::vector<std::string> extList = {".png", ".jpg"}; const std::vector<std::string> extList {".png", ".jpg"};
std::string subFolders; std::string subFolders;
// Extract possible subfolders from the path. // Extract possible subfolders from the path.
@ -229,12 +229,12 @@ const std::string FileData::getMediafilePath(const std::string& subdirectory) co
subFolders = subFolders =
Utils::String::replace(Utils::FileSystem::getParent(mPath), mEnvData->mStartPath, ""); Utils::String::replace(Utils::FileSystem::getParent(mPath), mEnvData->mStartPath, "");
const std::string tempPath = getMediaDirectory() + mSystemName + "/" + subdirectory + const std::string tempPath {getMediaDirectory() + mSystemName + "/" + subdirectory +
subFolders + "/" + getDisplayName(); subFolders + "/" + getDisplayName()};
// Look for an image file in the media directory. // Look for an image file in the media directory.
for (size_t i = 0; i < extList.size(); ++i) { for (size_t i = 0; i < extList.size(); ++i) {
std::string mediaPath = tempPath + extList[i]; std::string mediaPath {tempPath + extList[i]};
if (Utils::FileSystem::exists(mediaPath)) if (Utils::FileSystem::exists(mediaPath))
return mediaPath; return mediaPath;
} }
@ -245,7 +245,8 @@ const std::string FileData::getMediafilePath(const std::string& subdirectory) co
const std::string FileData::getImagePath() const const std::string FileData::getImagePath() const
{ {
// Look for a mix image (a combination of screenshot, 2D/3D box and marquee). // Look for a mix image (a combination of screenshot, 2D/3D box and marquee).
std::string image = getMediafilePath("miximages"); std::string image {getMediafilePath("miximages")};
if (image != "") if (image != "")
return image; return image;
@ -325,7 +326,7 @@ const std::string FileData::getThumbnailPath() const
const std::string FileData::getVideoPath() const const std::string FileData::getVideoPath() const
{ {
const std::vector<std::string> extList = {".avi", ".mkv", ".mov", ".mp4", ".wmv"}; const std::vector<std::string> extList {".avi", ".mkv", ".mov", ".mp4", ".wmv"};
std::string subFolders; std::string subFolders;
// Extract possible subfolders from the path. // Extract possible subfolders from the path.
@ -333,12 +334,12 @@ const std::string FileData::getVideoPath() const
subFolders = subFolders =
Utils::String::replace(Utils::FileSystem::getParent(mPath), mEnvData->mStartPath, ""); Utils::String::replace(Utils::FileSystem::getParent(mPath), mEnvData->mStartPath, "");
const std::string tempPath = const std::string tempPath {getMediaDirectory() + mSystemName + "/videos" + subFolders + "/" +
getMediaDirectory() + mSystemName + "/videos" + subFolders + "/" + getDisplayName(); getDisplayName()};
// Look for media in the media directory. // Look for media in the media directory.
for (size_t i = 0; i < extList.size(); ++i) { for (size_t i = 0; i < extList.size(); ++i) {
std::string mediaPath = tempPath + extList[i]; std::string mediaPath {tempPath + extList[i]};
if (Utils::FileSystem::exists(mediaPath)) if (Utils::FileSystem::exists(mediaPath))
return mediaPath; return mediaPath;
} }
@ -348,7 +349,7 @@ const std::string FileData::getVideoPath() const
const std::vector<FileData*>& FileData::getChildrenListToDisplay() const std::vector<FileData*>& FileData::getChildrenListToDisplay()
{ {
FileFilterIndex* idx = mSystem->getIndex(); FileFilterIndex* idx {mSystem->getIndex()};
if (idx->isFiltered() || UIModeController::getInstance()->isUIModeKid()) { if (idx->isFiltered() || UIModeController::getInstance()->isUIModeKid()) {
mFilteredChildren.clear(); mFilteredChildren.clear();
for (auto it = mChildren.cbegin(); it != mChildren.cend(); ++it) { for (auto it = mChildren.cbegin(); it != mChildren.cend(); ++it) {
@ -368,7 +369,7 @@ std::vector<FileData*> FileData::getFilesRecursive(unsigned int typeMask,
bool countAllGames) const bool countAllGames) const
{ {
std::vector<FileData*> out; std::vector<FileData*> out;
FileFilterIndex* idx = mSystem->getIndex(); FileFilterIndex* idx {mSystem->getIndex()};
for (auto it = mChildren.cbegin(); it != mChildren.cend(); ++it) { for (auto it = mChildren.cbegin(); it != mChildren.cend(); ++it) {
if ((*it)->getType() & typeMask) { if ((*it)->getType() & typeMask) {
@ -380,7 +381,7 @@ std::vector<FileData*> FileData::getFilesRecursive(unsigned int typeMask,
} }
} }
if ((*it)->getChildren().size() > 0) { if ((*it)->getChildren().size() > 0) {
std::vector<FileData*> subChildren = (*it)->getFilesRecursive(typeMask, displayedOnly); std::vector<FileData*> subChildren {(*it)->getFilesRecursive(typeMask, displayedOnly)};
if (countAllGames) { if (countAllGames) {
out.insert(out.cend(), subChildren.cbegin(), subChildren.cend()); out.insert(out.cend(), subChildren.cbegin(), subChildren.cend());
} }
@ -418,8 +419,8 @@ std::vector<FileData*> FileData::getScrapeFilesRecursive(bool includeFolders,
continue; continue;
if ((*it)->getChildren().size() > 0) { if ((*it)->getChildren().size() > 0) {
std::vector<FileData*> subChildren = (*it)->getScrapeFilesRecursive( std::vector<FileData*> subChildren {(*it)->getScrapeFilesRecursive(
includeFolders, excludeRecursively, respectExclusions); includeFolders, excludeRecursively, respectExclusions)};
out.insert(out.cend(), subChildren.cbegin(), subChildren.cend()); out.insert(out.cend(), subChildren.cbegin(), subChildren.cend());
} }
} }
@ -429,7 +430,7 @@ std::vector<FileData*> FileData::getScrapeFilesRecursive(bool includeFolders,
const bool FileData::isArcadeAsset() const const bool FileData::isArcadeAsset() const
{ {
const std::string stem = Utils::FileSystem::getStem(mPath); const std::string stem {Utils::FileSystem::getStem(mPath)};
return ((mSystem && (mSystem->hasPlatformId(PlatformIds::ARCADE) || return ((mSystem && (mSystem->hasPlatformId(PlatformIds::ARCADE) ||
mSystem->hasPlatformId(PlatformIds::SNK_NEO_GEO))) && mSystem->hasPlatformId(PlatformIds::SNK_NEO_GEO))) &&
(MameNames::getInstance().isBios(stem) || MameNames::getInstance().isDevice(stem))); (MameNames::getInstance().isBios(stem) || MameNames::getInstance().isDevice(stem)));
@ -437,7 +438,7 @@ const bool FileData::isArcadeAsset() const
const bool FileData::isArcadeGame() const const bool FileData::isArcadeGame() const
{ {
const std::string stem = Utils::FileSystem::getStem(mPath); const std::string stem {Utils::FileSystem::getStem(mPath)};
return ((mSystem && (mSystem->hasPlatformId(PlatformIds::ARCADE) || return ((mSystem && (mSystem->hasPlatformId(PlatformIds::ARCADE) ||
mSystem->hasPlatformId(PlatformIds::SNK_NEO_GEO))) && mSystem->hasPlatformId(PlatformIds::SNK_NEO_GEO))) &&
(!MameNames::getInstance().isBios(stem) && !MameNames::getInstance().isDevice(stem))); (!MameNames::getInstance().isBios(stem) && !MameNames::getInstance().isDevice(stem)));
@ -479,9 +480,9 @@ void FileData::sort(ComparisonFunction& comparator,
{ {
mOnlyFolders = true; mOnlyFolders = true;
mHasFolders = false; mHasFolders = false;
bool foldersOnTop = Settings::getInstance()->getBool("FoldersOnTop"); bool foldersOnTop {Settings::getInstance()->getBool("FoldersOnTop")};
bool showHiddenGames = Settings::getInstance()->getBool("ShowHiddenGames"); bool showHiddenGames {Settings::getInstance()->getBool("ShowHiddenGames")};
bool isKidMode = UIModeController::getInstance()->isUIModeKid(); bool isKidMode {UIModeController::getInstance()->isUIModeKid()};
std::vector<FileData*> mChildrenFolders; std::vector<FileData*> mChildrenFolders;
std::vector<FileData*> mChildrenOthers; std::vector<FileData*> mChildrenOthers;
@ -510,7 +511,7 @@ void FileData::sort(ComparisonFunction& comparator,
// The main custom collections view is sorted during startup in CollectionSystemsManager. // The main custom collections view is sorted during startup in CollectionSystemsManager.
// The individual collections are however sorted as any normal systems/folders. // The individual collections are however sorted as any normal systems/folders.
if (mSystem->isCollection() && mSystem->getFullName() == "collections") { if (mSystem->isCollection() && mSystem->getFullName() == "collections") {
std::pair<unsigned int, unsigned int> tempGameCount = {}; std::pair<unsigned int, unsigned int> tempGameCount {};
for (auto it = mChildren.cbegin(); it != mChildren.cend(); ++it) { for (auto it = mChildren.cbegin(); it != mChildren.cend(); ++it) {
if ((*it)->getChildren().size() > 0) if ((*it)->getChildren().size() > 0)
(*it)->sort(comparator, gameCount); (*it)->sort(comparator, gameCount);
@ -593,9 +594,9 @@ void FileData::sortFavoritesOnTop(ComparisonFunction& comparator,
{ {
mOnlyFolders = true; mOnlyFolders = true;
mHasFolders = false; mHasFolders = false;
bool foldersOnTop = Settings::getInstance()->getBool("FoldersOnTop"); bool foldersOnTop {Settings::getInstance()->getBool("FoldersOnTop")};
bool showHiddenGames = Settings::getInstance()->getBool("ShowHiddenGames"); bool showHiddenGames {Settings::getInstance()->getBool("ShowHiddenGames")};
bool isKidMode = UIModeController::getInstance()->isUIModeKid(); bool isKidMode {UIModeController::getInstance()->isUIModeKid()};
std::vector<FileData*> mChildrenFolders; std::vector<FileData*> mChildrenFolders;
std::vector<FileData*> mChildrenFavoritesFolders; std::vector<FileData*> mChildrenFavoritesFolders;
std::vector<FileData*> mChildrenFavorites; std::vector<FileData*> mChildrenFavorites;
@ -747,8 +748,8 @@ void FileData::sort(const SortType& type, bool mFavoritesOnTop)
void FileData::countGames(std::pair<unsigned int, unsigned int>& gameCount) void FileData::countGames(std::pair<unsigned int, unsigned int>& gameCount)
{ {
bool isKidMode = (Settings::getInstance()->getString("UIMode") == "kid" || bool isKidMode {(Settings::getInstance()->getString("UIMode") == "kid" ||
Settings::getInstance()->getBool("ForceKid")); Settings::getInstance()->getBool("ForceKid"))};
for (unsigned int i = 0; i < mChildren.size(); ++i) { for (unsigned int i = 0; i < mChildren.size(); ++i) {
if (mChildren[i]->getType() == GAME && mChildren[i]->getCountAsGame()) { if (mChildren[i]->getType() == GAME && mChildren[i]->getCountAsGame()) {
@ -806,7 +807,7 @@ const FileData::SortType& FileData::getSortTypeFromString(const std::string& des
std::vector<FileData::SortType> SortTypes = FileSorts::SortTypes; std::vector<FileData::SortType> SortTypes = FileSorts::SortTypes;
for (unsigned int i = 0; i < FileSorts::SortTypes.size(); ++i) { for (unsigned int i = 0; i < FileSorts::SortTypes.size(); ++i) {
const FileData::SortType& sort = FileSorts::SortTypes.at(i); const FileData::SortType& sort {FileSorts::SortTypes.at(i)};
if (sort.description == desc) if (sort.description == desc)
return sort; return sort;
} }
@ -910,9 +911,9 @@ void FileData::launchGame()
std::string coreEntry; std::string coreEntry;
std::string coreName; std::string coreName;
size_t coreEntryPos = 0; size_t coreEntryPos {0};
size_t coreFilePos = 0; size_t coreFilePos {0};
bool foundCoreFile = false; bool foundCoreFile {false};
std::vector<std::string> emulatorCorePaths; std::vector<std::string> emulatorCorePaths;
#if defined(_WIN64) #if defined(_WIN64)
@ -966,11 +967,11 @@ void FileData::launchGame()
command = Utils::FileSystem::expandHomePath(command); command = Utils::FileSystem::expandHomePath(command);
// Check that the emulator binary actually exists, and if so, get its path. // Check that the emulator binary actually exists, and if so, get its path.
std::string binaryPath = findEmulatorPath(command); std::string binaryPath {findEmulatorPath(command)};
// Hack to show an error message if there was no emulator entry in es_find_rules.xml. // Hack to show an error message if there was no emulator entry in es_find_rules.xml.
if (binaryPath.substr(0, 18) == "NO EMULATOR RULE: ") { if (binaryPath.substr(0, 18) == "NO EMULATOR RULE: ") {
std::string emulatorEntry = binaryPath.substr(18, binaryPath.size() - 18); std::string emulatorEntry {binaryPath.substr(18, binaryPath.size() - 18)};
LOG(LogError) << "Couldn't launch game, either there is no emulator entry for \"" LOG(LogError) << "Couldn't launch game, either there is no emulator entry for \""
<< emulatorEntry << "\" in es_find_rules.xml or there are no rules defined"; << emulatorEntry << "\" in es_find_rules.xml or there are no rules defined";
LOG(LogError) << "Raw emulator launch command:"; LOG(LogError) << "Raw emulator launch command:";
@ -1022,16 +1023,16 @@ void FileData::launchGame()
// If %EMUPATH% is used in es_systems.xml for this system, then check that the core // If %EMUPATH% is used in es_systems.xml for this system, then check that the core
// file actually exists. // file actually exists.
size_t emuPathPos = command.find("%EMUPATH%"); size_t emuPathPos {command.find("%EMUPATH%")};
if (emuPathPos != std::string::npos) { if (emuPathPos != std::string::npos) {
bool hasQuotationMark = false; bool hasQuotationMark {false};
unsigned int quotationMarkPos = 0; unsigned int quotationMarkPos {0};
if (command.find("\"%EMUPATH%", emuPathPos - 1) != std::string::npos) { if (command.find("\"%EMUPATH%", emuPathPos - 1) != std::string::npos) {
hasQuotationMark = true; hasQuotationMark = true;
quotationMarkPos = quotationMarkPos =
static_cast<unsigned int>(command.find("\"", emuPathPos + 9) - emuPathPos); static_cast<unsigned int>(command.find("\"", emuPathPos + 9) - emuPathPos);
} }
size_t spacePos = command.find(" ", emuPathPos + quotationMarkPos); size_t spacePos {command.find(" ", emuPathPos + quotationMarkPos)};
std::string coreRaw; std::string coreRaw;
std::string coreFile; std::string coreFile;
if (spacePos != std::string::npos) { if (spacePos != std::string::npos) {
@ -1107,7 +1108,7 @@ void FileData::launchGame()
coreFilePos = command.find("%", coreEntryPos + 6); coreFilePos = command.find("%", coreEntryPos + 6);
size_t separatorPos; size_t separatorPos;
size_t quotePos = command.find("\"", coreFilePos); size_t quotePos {command.find("\"", coreFilePos)};
if (quotePos == std::string::npos) if (quotePos == std::string::npos)
separatorPos = command.find(" ", coreFilePos); separatorPos = command.find(" ", coreFilePos);
else else
@ -1117,13 +1118,13 @@ void FileData::launchGame()
coreName = command.substr(coreFilePos + 2, separatorPos - (coreFilePos + 2)); coreName = command.substr(coreFilePos + 2, separatorPos - (coreFilePos + 2));
#if defined(_WIN64) #if defined(_WIN64)
std::string coreFile = Utils::FileSystem::expandHomePath(path + "\\" + coreName); std::string coreFile {Utils::FileSystem::expandHomePath(path + "\\" + coreName)};
#else #else
std::string coreFile = Utils::FileSystem::expandHomePath(path + "/" + coreName); std::string coreFile {Utils::FileSystem::expandHomePath(path + "/" + coreName)};
#endif #endif
// Expand %EMUPATH% if it has been used in the %CORE_ variable. // Expand %EMUPATH% if it has been used in the %CORE_ variable.
size_t stringPos = coreFile.find("%EMUPATH%"); size_t stringPos {coreFile.find("%EMUPATH%")};
if (stringPos != std::string::npos) { if (stringPos != std::string::npos) {
#if defined(_WIN64) #if defined(_WIN64)
coreFile = coreFile.replace( coreFile = coreFile.replace(
@ -1344,7 +1345,6 @@ void FileData::launchGame()
injectFile = Utils::FileSystem::getParent(Utils::String::replace(romPath, "\\", "")) + injectFile = Utils::FileSystem::getParent(Utils::String::replace(romPath, "\\", "")) +
"/" + injectFile; "/" + injectFile;
#endif #endif
if (Utils::FileSystem::isRegularFile(injectFile) || if (Utils::FileSystem::isRegularFile(injectFile) ||
Utils::FileSystem::isSymlink(injectFile)) { Utils::FileSystem::isSymlink(injectFile)) {
LOG(LogDebug) << "FileData::launchGame(): Injecting arguments from file \"" LOG(LogDebug) << "FileData::launchGame(): Injecting arguments from file \""
@ -1438,7 +1438,7 @@ void FileData::launchGame()
Scripting::fireEvent("game-start", romPath, getSourceFileData()->metadata.get("name"), Scripting::fireEvent("game-start", romPath, getSourceFileData()->metadata.get("name"),
getSourceFileData()->getSystem()->getName(), getSourceFileData()->getSystem()->getName(),
getSourceFileData()->getSystem()->getFullName()); getSourceFileData()->getSystem()->getFullName());
int returnValue = 0; int returnValue {0};
LOG(LogDebug) << "Raw emulator launch command:"; LOG(LogDebug) << "Raw emulator launch command:";
LOG(LogDebug) << commandRaw; LOG(LogDebug) << commandRaw;
@ -1520,7 +1520,7 @@ void FileData::launchGame()
} }
// Update number of times the game has been launched. // Update number of times the game has been launched.
FileData* gameToUpdate = getSourceFileData(); FileData* gameToUpdate {getSourceFileData()};
int timesPlayed {gameToUpdate->metadata.getInt("playcount") + 1}; int timesPlayed {gameToUpdate->metadata.getInt("playcount") + 1};
gameToUpdate->metadata.set("playcount", std::to_string(static_cast<long long>(timesPlayed))); gameToUpdate->metadata.set("playcount", std::to_string(static_cast<long long>(timesPlayed)));
@ -1602,14 +1602,14 @@ const std::string FileData::findEmulatorPath(std::string& command)
#if defined(_WIN64) #if defined(_WIN64)
for (std::string path : emulatorWinRegistryPaths) { for (std::string path : emulatorWinRegistryPaths) {
// Search for the emulator using the App Paths keys in the Windows Registry. // Search for the emulator using the App Paths keys in the Windows Registry.
std::string registryKeyPath = std::string registryKeyPath {"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\" +
"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\" + path; path};
HKEY registryKey; HKEY registryKey;
LSTATUS keyStatus = -1; LSTATUS keyStatus {-1};
LSTATUS pathStatus = -1; LSTATUS pathStatus {-1};
char registryPath[1024] {}; char registryPath[1024] {};
DWORD pathSize = 1024; DWORD pathSize {1024};
// First look in HKEY_CURRENT_USER. // First look in HKEY_CURRENT_USER.
keyStatus = RegOpenKeyEx(HKEY_CURRENT_USER, registryKeyPath.c_str(), 0, KEY_QUERY_VALUE, keyStatus = RegOpenKeyEx(HKEY_CURRENT_USER, registryKeyPath.c_str(), 0, KEY_QUERY_VALUE,
@ -1648,7 +1648,7 @@ const std::string FileData::findEmulatorPath(std::string& command)
// If the pipe character is found, then the string following this should be appended // If the pipe character is found, then the string following this should be appended
// to the key value, assuming the key is found. // to the key value, assuming the key is found.
std::string appendString; std::string appendString;
size_t pipePos = value.find('|'); size_t pipePos {value.find('|')};
if (pipePos != std::string::npos) { if (pipePos != std::string::npos) {
appendString = value.substr(pipePos + 1, std::string::npos); appendString = value.substr(pipePos + 1, std::string::npos);
@ -1656,15 +1656,15 @@ const std::string FileData::findEmulatorPath(std::string& command)
} }
// Search for the defined value in the Windows Registry. // Search for the defined value in the Windows Registry.
std::string registryValueKey = std::string registryValueKey {
Utils::String::replace(Utils::FileSystem::getParent(value), "/", "\\"); Utils::String::replace(Utils::FileSystem::getParent(value), "/", "\\")};
std::string registryValue = Utils::FileSystem::getFileName(value); std::string registryValue {Utils::FileSystem::getFileName(value)};
HKEY registryKey; HKEY registryKey;
LSTATUS keyStatus = -1; LSTATUS keyStatus {-1};
LSTATUS pathStatus = -1; LSTATUS pathStatus {-1};
char path[1024] {}; char path[1024] {};
DWORD pathSize = 1024; DWORD pathSize {1024};
// First look in HKEY_CURRENT_USER. // First look in HKEY_CURRENT_USER.
keyStatus = RegOpenKeyEx(HKEY_CURRENT_USER, registryValueKey.c_str(), 0, KEY_QUERY_VALUE, keyStatus = RegOpenKeyEx(HKEY_CURRENT_USER, registryValueKey.c_str(), 0, KEY_QUERY_VALUE,
@ -1710,16 +1710,16 @@ const std::string FileData::findEmulatorPath(std::string& command)
for (std::string path : emulatorSystemPaths) { for (std::string path : emulatorSystemPaths) {
#if defined(_WIN64) #if defined(_WIN64)
std::wstring pathWide = Utils::String::stringToWideString(path); std::wstring pathWide {Utils::String::stringToWideString(path)};
// Search for the emulator using the PATH environment variable. // Search for the emulator using the PATH environment variable.
DWORD size = SearchPathW(nullptr, pathWide.c_str(), L".exe", 0, nullptr, nullptr); DWORD size {SearchPathW(nullptr, pathWide.c_str(), L".exe", 0, nullptr, nullptr)};
if (size) { if (size) {
std::vector<wchar_t> pathBuffer(static_cast<size_t>(size) + 1); std::vector<wchar_t> pathBuffer(static_cast<size_t>(size) + 1);
wchar_t* fileName = nullptr; wchar_t* fileName {nullptr};
SearchPathW(nullptr, pathWide.c_str(), L".exe", size + 1, pathBuffer.data(), &fileName); SearchPathW(nullptr, pathWide.c_str(), L".exe", size + 1, pathBuffer.data(), &fileName);
std::wstring pathString = pathBuffer.data(); std::wstring pathString {pathBuffer.data()};
if (pathString.length()) { if (pathString.length()) {
exePath = Utils::String::wideStringToString( exePath = Utils::String::wideStringToString(
@ -1778,7 +1778,7 @@ const std::string FileData::findEmulatorPath(std::string& command)
// If the first character is a quotation mark, then we need to extract up to the // If the first character is a quotation mark, then we need to extract up to the
// next quotation mark, otherwise we'll only extract up to the first space character. // next quotation mark, otherwise we'll only extract up to the first space character.
if (command.front() == '\"') { if (command.front() == '\"') {
std::string emuTemp = command.substr(1, std::string::npos); std::string emuTemp {command.substr(1, std::string::npos)};
emuExecutable = emuTemp.substr(0, emuTemp.find('"')); emuExecutable = emuTemp.substr(0, emuTemp.find('"'));
} }
else { else {
@ -1794,13 +1794,13 @@ const std::string FileData::findEmulatorPath(std::string& command)
} }
#if defined(_WIN64) #if defined(_WIN64)
std::wstring emuExecutableWide = Utils::String::stringToWideString(emuExecutable); std::wstring emuExecutableWide {Utils::String::stringToWideString(emuExecutable)};
// Search for the emulator using the PATH environment variable. // Search for the emulator using the PATH environment variable.
DWORD size = SearchPathW(nullptr, emuExecutableWide.c_str(), L".exe", 0, nullptr, nullptr); DWORD size {SearchPathW(nullptr, emuExecutableWide.c_str(), L".exe", 0, nullptr, nullptr)};
if (size) { if (size) {
std::vector<wchar_t> pathBuffer(static_cast<size_t>(size) + 1); std::vector<wchar_t> pathBuffer(static_cast<size_t>(size) + 1);
wchar_t* fileName = nullptr; wchar_t* fileName {nullptr};
SearchPathW(nullptr, emuExecutableWide.c_str(), L".exe", size + 1, pathBuffer.data(), SearchPathW(nullptr, emuExecutableWide.c_str(), L".exe", size + 1, pathBuffer.data(),
&fileName); &fileName);