diff --git a/src/lib_gui/platform_includes/includesLinux.h b/src/lib_gui/platform_includes/includesLinux.h index 37d7ee55..a058a784 100644 --- a/src/lib_gui/platform_includes/includesLinux.h +++ b/src/lib_gui/platform_includes/includesLinux.h @@ -8,7 +8,6 @@ #include "utility/file/FilePath.h" #include "utility/file/FileSystem.h" #include "qt/utility/utilityQt.h" -#include "isTrial.h" void setupPlatform(int argc, char *argv[]) { @@ -22,14 +21,7 @@ void setupApp(int argc, char *argv[]) } std::string userdir(std::getenv("HOME")); - if(isTrial()) - { - userdir.append("/.config/coatitrial/"); - } - else - { - userdir.append("/.config/coati/"); - } + userdir.append("/.config/coati/"); UserPaths::setUserDataPath(userdir); diff --git a/src/test/FileSystemTestSuite.h b/src/test/FileSystemTestSuite.h index bc4ee681..8fbca866 100644 --- a/src/test/FileSystemTestSuite.h +++ b/src/test/FileSystemTestSuite.h @@ -85,11 +85,21 @@ public: std::vector files = FileSystem::getFileInfosFromPaths(directoryPaths, extensions, true); TS_ASSERT_EQUALS(files.size(), 5); - TS_ASSERT(isInFileInfos(files, "./data/FileSystemTestSuite/src/Settings/player.h")); - TS_ASSERT(isInFileInfos(files, "./data/FileSystemTestSuite/src/Settings/sample.cpp")); - TS_ASSERT(isInFileInfos(files, "./data/FileSystemTestSuite/src/main.cpp")); - TS_ASSERT(isInFileInfos(files, "./data/FileSystemTestSuite/src/Settings/src/test.cpp")); - TS_ASSERT(isInFileInfos(files, "./data/FileSystemTestSuite/src/Settings/src/test.h")); + TS_ASSERT(isInFileInfos(files, "./data/FileSystemTestSuite/src/Settings/player.h", + "./data/FileSystemTestSuite/player.h" + )); + TS_ASSERT(isInFileInfos(files, "./data/FileSystemTestSuite/src/Settings/sample.cpp", + "./data/FileSystemTestSuite/sample.cpp" + )); + TS_ASSERT(isInFileInfos(files, "./data/FileSystemTestSuite/src/main.cpp", + "./data/FileSystemTestSuite/src/Settings/src/main.cpp" + )); + TS_ASSERT(isInFileInfos(files, "./data/FileSystemTestSuite/src/test.cpp", + "./data/FileSystemTestSuite/src/Settings/src/test.cpp" + )); + TS_ASSERT(isInFileInfos(files, "./data/FileSystemTestSuite/src/test.h", + "./data/FileSystemTestSuite/src/Settings/src/test.h" + )); #endif } @@ -141,4 +151,17 @@ private: return false; } + + bool isInFileInfos(const std::vector& infos, const std::string filename, const std::string filename2) + { + for (const FileInfo& info : infos) + { + if (info.path.str() == filename || info.path.str() == filename2) + { + return true; + } + } + + return false; + } };