From 7fe862b71507553ad2d9794a0a388323cee3b53e Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Mon, 17 Mar 2025 22:05:20 -0400 Subject: [PATCH] refactor: remove unused ARCH::getSystemDirectory --- src/lib/arch/IArchFile.h | 6 ------ src/lib/arch/unix/ArchFileUnix.cpp | 5 ----- src/lib/arch/unix/ArchFileUnix.h | 1 - src/lib/arch/win32/ArchFileWindows.cpp | 12 ------------ src/lib/arch/win32/ArchFileWindows.h | 1 - 5 files changed, 25 deletions(-) diff --git a/src/lib/arch/IArchFile.h b/src/lib/arch/IArchFile.h index cc8776203..941dc1ac3 100644 --- a/src/lib/arch/IArchFile.h +++ b/src/lib/arch/IArchFile.h @@ -34,12 +34,6 @@ public: */ virtual std::string getUserDirectory() = 0; - //! Get system directory - /*! - Returns the ussystem configuration file directory. - */ - virtual std::string getSystemDirectory() = 0; - //! Get installed directory /*! Returns the directory in which Deskflow is installed. diff --git a/src/lib/arch/unix/ArchFileUnix.cpp b/src/lib/arch/unix/ArchFileUnix.cpp index cb23c06aa..d0916dbd4 100644 --- a/src/lib/arch/unix/ArchFileUnix.cpp +++ b/src/lib/arch/unix/ArchFileUnix.cpp @@ -70,11 +70,6 @@ std::string ArchFileUnix::getUserDirectory() return dir; } -std::string ArchFileUnix::getSystemDirectory() -{ - return "/etc"; -} - std::string ArchFileUnix::getInstalledDirectory() { #if WINAPI_XWINDOWS diff --git a/src/lib/arch/unix/ArchFileUnix.h b/src/lib/arch/unix/ArchFileUnix.h index 6b3d43d0d..7cc1247df 100644 --- a/src/lib/arch/unix/ArchFileUnix.h +++ b/src/lib/arch/unix/ArchFileUnix.h @@ -21,7 +21,6 @@ public: // IArchFile overrides virtual const char *getBasename(const char *pathname); virtual std::string getUserDirectory(); - virtual std::string getSystemDirectory(); virtual std::string getInstalledDirectory(); virtual std::string concatPath(const std::string &prefix, const std::string &suffix); }; diff --git a/src/lib/arch/win32/ArchFileWindows.cpp b/src/lib/arch/win32/ArchFileWindows.cpp index 33965178a..bd969fc78 100644 --- a/src/lib/arch/win32/ArchFileWindows.cpp +++ b/src/lib/arch/win32/ArchFileWindows.cpp @@ -91,18 +91,6 @@ std::string ArchFileWindows::getUserDirectory() return "C:"; } -std::string ArchFileWindows::getSystemDirectory() -{ - // get windows directory - char dir[MAX_PATH]; - if (GetWindowsDirectory(dir, sizeof(dir)) != 0) { - return dir; - } else { - // can't get it. use C:\ as a default. - return "C:"; - } -} - std::string ArchFileWindows::getInstalledDirectory() { char fileNameBuffer[MAX_PATH]; diff --git a/src/lib/arch/win32/ArchFileWindows.h b/src/lib/arch/win32/ArchFileWindows.h index 1e6d58d72..36cd5bfab 100644 --- a/src/lib/arch/win32/ArchFileWindows.h +++ b/src/lib/arch/win32/ArchFileWindows.h @@ -21,7 +21,6 @@ public: // IArchFile overrides virtual const char *getBasename(const char *pathname); virtual std::string getUserDirectory(); - virtual std::string getSystemDirectory(); virtual std::string getInstalledDirectory(); virtual std::string concatPath(const std::string &prefix, const std::string &suffix); };