From 08843673d9ec0b3a31cf2ea484051a3ad6b98683 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 25 Apr 2021 20:39:32 +0200 Subject: [PATCH] Rename a couple of functions. --- Common/File/DirListing.cpp | 8 ++++---- Common/File/DirListing.h | 4 ++-- Common/File/PathBrowser.cpp | 2 +- Common/File/VFS/AssetReader.cpp | 6 +++--- Common/File/VFS/VFS.cpp | 4 ++-- Core/FileLoaders/DiskCachingFileLoader.cpp | 4 ++-- Core/FileLoaders/LocalFileLoader.cpp | 4 ++-- Core/HLE/Plugins.cpp | 2 +- GPU/Common/PostShader.cpp | 2 +- UI/GameInfoCache.cpp | 12 ++++++------ UI/GameSettingsScreen.cpp | 2 +- UI/InstallZipScreen.cpp | 2 +- UI/SavedataScreen.cpp | 2 +- Windows/WindowsHost.cpp | 2 +- 14 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Common/File/DirListing.cpp b/Common/File/DirListing.cpp index 3788c6cc8b..b65d696f91 100644 --- a/Common/File/DirListing.cpp +++ b/Common/File/DirListing.cpp @@ -36,7 +36,7 @@ namespace File { -bool getFileInfo(const char *path, FileInfo * fileInfo) { +bool GetFileInfo(const char *path, FileInfo * fileInfo) { // TODO: Expand relative paths? fileInfo->fullName = path; @@ -100,7 +100,7 @@ bool FileInfo::operator <(const FileInfo & other) const { return false; } -size_t getFilesInDir(const char *directory, std::vector * files, const char *filter, int flags) { +size_t GetFilesInDir(const char *directory, std::vector * files, const char *filter, int flags) { size_t foundEntries = 0; std::set filters; if (filter) { @@ -197,12 +197,12 @@ size_t getFilesInDir(const char *directory, std::vector * files, const int64_t getDirectoryRecursiveSize(const std::string & path, const char *filter, int flags) { std::vector fileInfo; - getFilesInDir(path.c_str(), &fileInfo, filter, flags); + GetFilesInDir(path.c_str(), &fileInfo, filter, flags); int64_t sizeSum = 0; // Note: getFileInDir does not fill in fileSize properly. for (size_t i = 0; i < fileInfo.size(); i++) { FileInfo finfo; - getFileInfo(fileInfo[i].fullName.c_str(), &finfo); + GetFileInfo(fileInfo[i].fullName.c_str(), &finfo); if (!finfo.isDirectory) sizeSum += finfo.size; else diff --git a/Common/File/DirListing.h b/Common/File/DirListing.h index 93d9cbece4..e5c1a645c8 100644 --- a/Common/File/DirListing.h +++ b/Common/File/DirListing.h @@ -23,13 +23,13 @@ struct FileInfo { }; std::string getFileExtension(const std::string &fn); -bool getFileInfo(const char *path, FileInfo *fileInfo); +bool GetFileInfo(const char *path, FileInfo *fileInfo); FILE *openCFile(const std::string &filename, const char *mode); enum { GETFILES_GETHIDDEN = 1 }; -size_t getFilesInDir(const char *directory, std::vector *files, const char *filter = nullptr, int flags = 0); +size_t GetFilesInDir(const char *directory, std::vector *files, const char *filter = nullptr, int flags = 0); int64_t getDirectoryRecursiveSize(const std::string &path, const char *filter = nullptr, int flags = 0); #ifdef _WIN32 diff --git a/Common/File/PathBrowser.cpp b/Common/File/PathBrowser.cpp index 03670fc554..e1625286b1 100644 --- a/Common/File/PathBrowser.cpp +++ b/Common/File/PathBrowser.cpp @@ -265,7 +265,7 @@ bool PathBrowser::GetListing(std::vector &fileInfo, const char * fileInfo = ApplyFilter(pendingFiles_, filter); return true; } else { - File::getFilesInDir(path_.c_str(), &fileInfo, filter); + File::GetFilesInDir(path_.c_str(), &fileInfo, filter); return true; } } diff --git a/Common/File/VFS/AssetReader.cpp b/Common/File/VFS/AssetReader.cpp index 4de81ddc14..ab3a861885 100644 --- a/Common/File/VFS/AssetReader.cpp +++ b/Common/File/VFS/AssetReader.cpp @@ -202,12 +202,12 @@ bool DirectoryAssetReader::GetFileListing(const char *path, std::vector *listing, c if (IsLocalPath(path)) { // Local path, not VFS. // INFO_LOG(IO, "Not a VFS path: %s . Reading local directory.", path); - File::getFilesInDir(path, listing, filter); + File::GetFilesInDir(path, listing, filter); return true; } @@ -95,7 +95,7 @@ bool VFSGetFileInfo(const char *path, File::FileInfo *info) { if (IsLocalPath(path)) { // Local path, not VFS. // INFO_LOG(IO, "Not a VFS path: %s . Getting local file info.", path); - return File::getFileInfo(path, info); + return File::GetFileInfo(path, info); } bool fileSystemFound = false; diff --git a/Core/FileLoaders/DiskCachingFileLoader.cpp b/Core/FileLoaders/DiskCachingFileLoader.cpp index 31bbd18215..f5cdff697c 100644 --- a/Core/FileLoaders/DiskCachingFileLoader.cpp +++ b/Core/FileLoaders/DiskCachingFileLoader.cpp @@ -795,7 +795,7 @@ u32 DiskCachingFileLoaderCache::CountCachedFiles() { } std::vector files; - return (u32)getFilesInDir(dir.c_str(), &files, "ppdc:"); + return (u32)GetFilesInDir(dir.c_str(), &files, "ppdc:"); } void DiskCachingFileLoaderCache::GarbageCollectCacheFiles(u64 goalBytes) { @@ -812,7 +812,7 @@ void DiskCachingFileLoaderCache::GarbageCollectCacheFiles(u64 goalBytes) { } std::vector files; - File::getFilesInDir(dir.c_str(), &files, "ppdc:"); + File::GetFilesInDir(dir.c_str(), &files, "ppdc:"); u64 remaining = goalBytes; // TODO: Could order by LRU or etc. diff --git a/Core/FileLoaders/LocalFileLoader.cpp b/Core/FileLoaders/LocalFileLoader.cpp index 7980f9b500..8d6ea5a395 100644 --- a/Core/FileLoaders/LocalFileLoader.cpp +++ b/Core/FileLoaders/LocalFileLoader.cpp @@ -113,14 +113,14 @@ bool LocalFileLoader::Exists() { if (handle_ != INVALID_HANDLE_VALUE || IsDirectory()) { #endif File::FileInfo info; - return File::getFileInfo(filename_.c_str(), &info); + return File::GetFileInfo(filename_.c_str(), &info); } return false; } bool LocalFileLoader::IsDirectory() { File::FileInfo info; - if (File::getFileInfo(filename_.c_str(), &info)) { + if (File::GetFileInfo(filename_.c_str(), &info)) { return info.isDirectory; } return false; diff --git a/Core/HLE/Plugins.cpp b/Core/HLE/Plugins.cpp index b10b6f2093..79dce1808e 100644 --- a/Core/HLE/Plugins.cpp +++ b/Core/HLE/Plugins.cpp @@ -83,7 +83,7 @@ static PluginInfo ReadPluginIni(const std::string &subdir, IniFile &ini) { static std::vector FindPlugins(const std::string &gameID, const std::string &lang) { std::vector pluginDirs; - getFilesInDir(GetSysDirectory(DIRECTORY_PLUGINS).c_str(), &pluginDirs); + GetFilesInDir(GetSysDirectory(DIRECTORY_PLUGINS).c_str(), &pluginDirs); std::vector found; for (auto subdir : pluginDirs) { diff --git a/GPU/Common/PostShader.cpp b/GPU/Common/PostShader.cpp index c12a7e6f2f..472b707a53 100644 --- a/GPU/Common/PostShader.cpp +++ b/GPU/Common/PostShader.cpp @@ -79,7 +79,7 @@ void LoadPostShaderInfo(const std::vector &directories) { for (size_t d = 0; d < directories.size(); d++) { std::vector fileInfo; - File::getFilesInDir(directories[d].c_str(), &fileInfo, "ini:"); + File::GetFilesInDir(directories[d].c_str(), &fileInfo, "ini:"); if (fileInfo.size() == 0) { VFSGetFileListing(directories[d].c_str(), &fileInfo, "ini:"); diff --git a/UI/GameInfoCache.cpp b/UI/GameInfoCache.cpp index 0f88b6ddc3..1fdaad31c1 100644 --- a/UI/GameInfoCache.cpp +++ b/UI/GameInfoCache.cpp @@ -125,7 +125,7 @@ std::vector GameInfo::GetSaveDataDirectories() { std::string memc = GetSysDirectory(DIRECTORY_SAVEDATA); std::vector dirs; - File::getFilesInDir(memc.c_str(), &dirs); + File::GetFilesInDir(memc.c_str(), &dirs); std::vector directories; if (id.size() < 5) { @@ -150,11 +150,11 @@ u64 GameInfo::GetSaveDataSizeInBytes() { u64 filesSizeInDir = 0; for (size_t j = 0; j < saveDataDir.size(); j++) { std::vector fileInfo; - File::getFilesInDir(saveDataDir[j].c_str(), &fileInfo); + File::GetFilesInDir(saveDataDir[j].c_str(), &fileInfo); // Note: getFileInDir does not fill in fileSize properly. for (size_t i = 0; i < fileInfo.size(); i++) { File::FileInfo finfo; - File::getFileInfo(fileInfo[i].fullName.c_str(), &finfo); + File::GetFileInfo(fileInfo[i].fullName.c_str(), &finfo); if (!finfo.isDirectory) filesSizeInDir += finfo.size; } @@ -177,11 +177,11 @@ u64 GameInfo::GetInstallDataSizeInBytes() { u64 filesSizeInDir = 0; for (size_t j = 0; j < saveDataDir.size(); j++) { std::vector fileInfo; - File::getFilesInDir(saveDataDir[j].c_str(), &fileInfo); + File::GetFilesInDir(saveDataDir[j].c_str(), &fileInfo); // Note: getFileInDir does not fill in fileSize properly. for (size_t i = 0; i < fileInfo.size(); i++) { File::FileInfo finfo; - File::getFileInfo(fileInfo[i].fullName.c_str(), &finfo); + File::GetFileInfo(fileInfo[i].fullName.c_str(), &finfo); if (!finfo.isDirectory) filesSizeInDir += finfo.size; } @@ -231,7 +231,7 @@ bool GameInfo::DeleteAllSaveData() { std::vector saveDataDir = GetSaveDataDirectories(); for (size_t j = 0; j < saveDataDir.size(); j++) { std::vector fileInfo; - File::getFilesInDir(saveDataDir[j].c_str(), &fileInfo); + File::GetFilesInDir(saveDataDir[j].c_str(), &fileInfo); for (size_t i = 0; i < fileInfo.size(); i++) { File::Delete(fileInfo[i].fullName.c_str()); diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp index c1fadc3df6..dbee08362d 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp @@ -1773,7 +1773,7 @@ UI::EventReturn DeveloperToolsScreen::OnCopyStatesToRoot(UI::EventParams &e) { std::string root_dir = GetSysDirectory(DIRECTORY_MEMSTICK_ROOT); std::vector files; - getFilesInDir(savestate_dir.c_str(), &files, nullptr, 0); + GetFilesInDir(savestate_dir.c_str(), &files, nullptr, 0); for (const File::FileInfo &file : files) { std::string src = file.fullName; diff --git a/UI/InstallZipScreen.cpp b/UI/InstallZipScreen.cpp index 96c2f7caea..832e921bfc 100644 --- a/UI/InstallZipScreen.cpp +++ b/UI/InstallZipScreen.cpp @@ -29,7 +29,7 @@ void InstallZipScreen::CreateViews() { using namespace UI; File::FileInfo fileInfo; - bool success = File::getFileInfo(zipPath_.c_str(), &fileInfo); + bool success = File::GetFileInfo(zipPath_.c_str(), &fileInfo); auto di = GetI18NCategory("Dialog"); auto iz = GetI18NCategory("InstallZip"); diff --git a/UI/SavedataScreen.cpp b/UI/SavedataScreen.cpp index c3a45684e0..6d3e629a98 100644 --- a/UI/SavedataScreen.cpp +++ b/UI/SavedataScreen.cpp @@ -489,7 +489,7 @@ void SavedataBrowser::Refresh() { std::vector savedataButtons; std::vector fileInfo; - getFilesInDir(path_.c_str(), &fileInfo, "ppst:"); + GetFilesInDir(path_.c_str(), &fileInfo, "ppst:"); for (size_t i = 0; i < fileInfo.size(); i++) { bool isState = !fileInfo[i].isDirectory; diff --git a/Windows/WindowsHost.cpp b/Windows/WindowsHost.cpp index f73ad84b2d..a50f37c4a9 100644 --- a/Windows/WindowsHost.cpp +++ b/Windows/WindowsHost.cpp @@ -274,7 +274,7 @@ static std::string SymbolMapFilename(const char *currentFilename, const char* ex std::string result = currentFilename; // can't fail, definitely exists if it gets this far - File::getFileInfo(currentFilename, &info); + File::GetFileInfo(currentFilename, &info); if (info.isDirectory) { #ifdef _WIN32 const char* slash = "\\";