From c955e07712d0b8c9cd964f3f4f382d70a40e3620 Mon Sep 17 00:00:00 2001 From: The Dax Date: Thu, 17 Oct 2013 18:18:39 -0400 Subject: [PATCH] Clean up FileUtil.h. Remove GetBundleDirectory(I searched master and nothing uses it either). --- Common/FileUtil.cpp | 16 ---------------- Common/FileUtil.h | 22 ---------------------- 2 files changed, 38 deletions(-) diff --git a/Common/FileUtil.cpp b/Common/FileUtil.cpp index b2990fda11..fa32532c5d 100644 --- a/Common/FileUtil.cpp +++ b/Common/FileUtil.cpp @@ -641,22 +641,6 @@ bool SetCurrentDir(const std::string &directory) return __chdir(directory.c_str()) == 0; } -#if defined(__APPLE__) -std::string GetBundleDirectory() -{ - CFURLRef BundleRef; - char AppBundlePath[MAXPATHLEN]; - // Get the main bundle for the app - BundleRef = CFBundleCopyBundleURL(CFBundleGetMainBundle()); - CFStringRef BundlePath = CFURLCopyFileSystemPath(BundleRef, kCFURLPOSIXPathStyle); - CFStringGetFileSystemRepresentation(BundlePath, AppBundlePath, sizeof(AppBundlePath)); - CFRelease(BundleRef); - CFRelease(BundlePath); - - return AppBundlePath; -} -#endif - #ifdef _WIN32 std::wstring &GetExeDirectory() { diff --git a/Common/FileUtil.h b/Common/FileUtil.h index 25dca98009..79f46f7188 100644 --- a/Common/FileUtil.h +++ b/Common/FileUtil.h @@ -26,17 +26,6 @@ #include "Common.h" -// User directory indices for GetUserPath -enum { - D_USER_IDX, - D_SCREENSHOTS_IDX, - D_LOGS_IDX, - D_CONFIG_IDX, - F_CONFIG_IDX, - F_MAINLOG_IDX, - NUM_PATH_INDICES -}; - #ifdef _WIN32 inline struct tm* localtime_r(const time_t *clock, struct tm *result) { if (localtime_s(result, clock) == 0) @@ -113,17 +102,6 @@ void CopyDir(const std::string &source_path, const std::string &dest_path); // Set the current directory to given directory bool SetCurrentDir(const std::string &directory); -// Returns a pointer to a string with a Dolphin data dir in the user's home -// directory. To be used in "multi-user" mode (that is, installed). -std::string &GetUserPath(const unsigned int DirIDX, const std::string &newPath=""); - -// Returns the path to where the sys file are -std::string GetSysDirectory(); - -#ifdef __APPLE__ -std::string GetBundleDirectory(); -#endif - #ifdef _WIN32 std::wstring &GetExeDirectory(); #endif