diff --git a/src/lib/utility/file/FileSystem.cpp b/src/lib/utility/file/FileSystem.cpp index 709a40f5..c7d61b9b 100644 --- a/src/lib/utility/file/FileSystem.cpp +++ b/src/lib/utility/file/FileSystem.cpp @@ -197,11 +197,6 @@ TimeStamp FileSystem::getLastWriteTime(const FilePath& filePath) return TimeStamp(lastWriteTime); } -std::string FileSystem::getTimeStringNow() // TODO: move to utility -{ - return boost::posix_time::to_iso_string(boost::posix_time::second_clock::universal_time()); -} - bool FileSystem::remove(const FilePath& path) { return boost::filesystem::remove(path.getPath()); @@ -280,23 +275,3 @@ std::vector FileSystem::getRecursiveSubDirectories(const FilePath &pat return v; } - -std::string FileSystem::fileName(const std::string& path) -{ - return boost::filesystem::path(path).filename().generic_string(); -} - -std::string FileSystem::absoluteFilePath(const std::string& path) -{ - return boost::filesystem::absolute(boost::filesystem::path(path)).generic_string(); -} - -std::string FileSystem::extension(const std::string& path) -{ - return boost::filesystem::path(path).extension().generic_string(); -} - -std::string FileSystem::filePathWithoutExtension(const std::string& path) -{ - return boost::filesystem::path(path).replace_extension().generic_string(); -} diff --git a/src/lib/utility/file/FileSystem.h b/src/lib/utility/file/FileSystem.h index 227f3db4..1fa34a5c 100644 --- a/src/lib/utility/file/FileSystem.h +++ b/src/lib/utility/file/FileSystem.h @@ -24,7 +24,6 @@ public: static unsigned long long getFileByteSize(const FilePath& filePath); static TimeStamp getLastWriteTime(const FilePath& filePath); - static std::string getTimeStringNow(); static bool remove(const FilePath& path); static bool rename(const FilePath& from, const FilePath& to); @@ -35,12 +34,6 @@ public: static void createDirectory(const FilePath& path); static std::vector getDirectSubDirectories(const FilePath& path); static std::vector getRecursiveSubDirectories(const FilePath& path); - - static std::string fileName(const std::string& path); - static std::string absoluteFilePath(const std::string& path); - - static std::string extension(const std::string& path); - static std::string filePathWithoutExtension(const std::string& path); }; #endif // FILE_SYSTEM_H diff --git a/src/test/FileSystemTestSuite.h b/src/test/FileSystemTestSuite.h index 7ddf4ee6..b624a1be 100644 --- a/src/test/FileSystemTestSuite.h +++ b/src/test/FileSystemTestSuite.h @@ -101,24 +101,6 @@ public: #endif } - void test_filesystem_extracts_filename() - { - TS_ASSERT_EQUALS(FileSystem::fileName("data/FileSystemTestSuite/tictactoe.h"), "tictactoe.h"); - TS_ASSERT_EQUALS(FileSystem::fileName("data/FileSystemTestSuite/Settings/player.h"), "player.h"); - } - - void test_filesystem_extracts_extension() - { - TS_ASSERT_EQUALS(FileSystem::extension("data/FileSystemTestSuite/tictactoe.h"), ".h"); - TS_ASSERT_EQUALS(FileSystem::extension("data/FileSystemTestSuite/tictactoe.cpp"), ".cpp"); - } - - void test_filesystem_extract_filepath_without_extension() - { - TS_ASSERT_EQUALS(FileSystem::filePathWithoutExtension("data/FileSystemTestSuite/tictactoe.h"), "data/FileSystemTestSuite/tictactoe"); - TS_ASSERT_EQUALS(FileSystem::filePathWithoutExtension("data/FileSystemTestSuite/tictactoe.cpp"), "data/FileSystemTestSuite/tictactoe"); - } - private: bool isInFiles(const std::set& files, const FilePath& filename) {