diff --git a/src/lib/arch/IArchFile.h b/src/lib/arch/IArchFile.h index bea99f68d..f9ca59976 100644 --- a/src/lib/arch/IArchFile.h +++ b/src/lib/arch/IArchFile.h @@ -32,13 +32,4 @@ public: Returns the directory in which Deskflow is installed. */ virtual std::string getInstalledDirectory() = 0; - - //! Concatenate path components - /*! - Concatenate pathname components with a directory separator - between them. This should not check if the resulting path - is longer than allowed by the system; we'll rely on the - system calls to tell us that. - */ - virtual std::string concatPath(const std::string &prefix, const std::string &suffix) = 0; }; diff --git a/src/lib/arch/unix/ArchFileUnix.cpp b/src/lib/arch/unix/ArchFileUnix.cpp index ddb4cff27..e744815b2 100644 --- a/src/lib/arch/unix/ArchFileUnix.cpp +++ b/src/lib/arch/unix/ArchFileUnix.cpp @@ -53,15 +53,3 @@ std::string ArchFileUnix::getInstalledDirectory() return rtn; #endif } - -std::string ArchFileUnix::concatPath(const std::string &prefix, const std::string &suffix) -{ - std::string path; - path.reserve(prefix.size() + 1 + suffix.size()); - path += prefix; - if (path.size() == 0 || path[path.size() - 1] != '/') { - path += '/'; - } - path += suffix; - return path; -} diff --git a/src/lib/arch/unix/ArchFileUnix.h b/src/lib/arch/unix/ArchFileUnix.h index 17499e114..fcde1b8a2 100644 --- a/src/lib/arch/unix/ArchFileUnix.h +++ b/src/lib/arch/unix/ArchFileUnix.h @@ -21,5 +21,4 @@ public: // IArchFile overrides virtual const char *getBasename(const char *pathname); 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 37f4c4a9c..0301152ad 100644 --- a/src/lib/arch/win32/ArchFileWindows.cpp +++ b/src/lib/arch/win32/ArchFileWindows.cpp @@ -60,15 +60,3 @@ std::string ArchFileWindows::getInstalledDirectory() return fileName; } - -std::string ArchFileWindows::concatPath(const std::string &prefix, const std::string &suffix) -{ - std::string path; - path.reserve(prefix.size() + 1 + suffix.size()); - path += prefix; - if (path.size() == 0 || (path[path.size() - 1] != '\\' && path[path.size() - 1] != '/')) { - path += '\\'; - } - path += suffix; - return path; -} diff --git a/src/lib/arch/win32/ArchFileWindows.h b/src/lib/arch/win32/ArchFileWindows.h index 5c233196b..c8d0d5ea3 100644 --- a/src/lib/arch/win32/ArchFileWindows.h +++ b/src/lib/arch/win32/ArchFileWindows.h @@ -21,5 +21,4 @@ public: // IArchFile overrides virtual const char *getBasename(const char *pathname); virtual std::string getInstalledDirectory(); - virtual std::string concatPath(const std::string &prefix, const std::string &suffix); };