From 9ab724ae475a985e64203a5d13fe7ffd9fc1bf06 Mon Sep 17 00:00:00 2001 From: Eberhard Graether Date: Sun, 17 Nov 2019 16:22:35 +0100 Subject: [PATCH] src: Removed backwards compatibility to Coati (.coatiproject, .coatidb) --- .gitignore | 1 - deployment/windows/wixSetup/installDir.wxs | 4 --- setup/Linux/sourcetrail-mime.xml | 2 -- setup/macOS/bundle_info.plist.in | 1 - src/lib/app/Application.cpp | 32 ------------------- src/lib/app/Application.h | 1 - .../utility/commandline/CommandLineParser.cpp | 2 +- src/lib_gui/platform_includes/includesLinux.h | 10 +----- src/lib_gui/platform_includes/includesMac.h | 12 ------- src/lib_gui/qt/QtApplication.cpp | 2 +- src/lib_gui/qt/window/QtMainWindow.cpp | 2 +- 11 files changed, 4 insertions(+), 65 deletions(-) diff --git a/.gitignore b/.gitignore index 050e95f3..4ae73d9a 100644 --- a/.gitignore +++ b/.gitignore @@ -41,7 +41,6 @@ /ide_plugins/vs/vs2015/SourcetrailPlugin/TestResults -*.coatidb *.srctrldb *.srctrlbm *.suo diff --git a/deployment/windows/wixSetup/installDir.wxs b/deployment/windows/wixSetup/installDir.wxs index d38a07dc..c922a036 100644 --- a/deployment/windows/wixSetup/installDir.wxs +++ b/deployment/windows/wixSetup/installDir.wxs @@ -20,10 +20,6 @@ - - - - diff --git a/setup/Linux/sourcetrail-mime.xml b/setup/Linux/sourcetrail-mime.xml index 4af5e8ef..6481cd8b 100644 --- a/setup/Linux/sourcetrail-mime.xml +++ b/setup/Linux/sourcetrail-mime.xml @@ -5,12 +5,10 @@ - Sourcetrail Database - diff --git a/setup/macOS/bundle_info.plist.in b/setup/macOS/bundle_info.plist.in index 470cd8e7..59756254 100644 --- a/setup/macOS/bundle_info.plist.in +++ b/setup/macOS/bundle_info.plist.in @@ -46,7 +46,6 @@ CFBundleTypeExtensions srctrlprj - coatiproject CFBundleTypeIconFile project diff --git a/src/lib/app/Application.cpp b/src/lib/app/Application.cpp index 4f918356..72f88454 100644 --- a/src/lib/app/Application.cpp +++ b/src/lib/app/Application.cpp @@ -265,8 +265,6 @@ void Application::handleMessage(MessageLoadProject* message) { MessageStatus(L"Loading Project: " + projectSettingsFilePath.wstr(), false, true).dispatch(); - projectSettingsFilePath = migrateProjectSettings(projectSettingsFilePath); - m_project.reset(); if (m_hasGUI) @@ -359,36 +357,6 @@ void Application::handleMessage(MessageWindowFocus* message) } } -FilePath Application::migrateProjectSettings(const FilePath& projectSettingsFilePath) const -{ - if (projectSettingsFilePath.extension() == L".coatiproject") - { - MessageStatus(L"Migrating deprecated project file extension \".coatiproject\" to new file extension \".srctrlprj\"").dispatch(); - const FilePath newSettingsPath = projectSettingsFilePath.replaceExtension(ProjectSettings::PROJECT_FILE_EXTENSION); - { - FileSystem::rename(projectSettingsFilePath, newSettingsPath); - const FilePath oldDbPath = projectSettingsFilePath.replaceExtension(L"coatidb"); - if (oldDbPath.exists()) - { - FileSystem::rename(oldDbPath, oldDbPath.replaceExtension(L"srctrldb")); - } - } - { - ApplicationSettings* appSettings = ApplicationSettings::getInstance().get(); - std::vector recentProjects = appSettings->getRecentProjects(); - std::vector::iterator it = std::find(recentProjects.begin(), recentProjects.end(), projectSettingsFilePath); - if (it != recentProjects.end()) - { - recentProjects.erase(it); - } - appSettings->setRecentProjects(recentProjects); - appSettings->save(UserPaths::getAppSettingsPath()); - } - return newSettingsPath; - } - return projectSettingsFilePath; -} - void Application::startMessagingAndScheduling() { TaskManager::getScheduler(TabId::app())->startSchedulerLoopThreaded(); diff --git a/src/lib/app/Application.h b/src/lib/app/Application.h index e1b2ec6d..0fcc71e6 100644 --- a/src/lib/app/Application.h +++ b/src/lib/app/Application.h @@ -74,7 +74,6 @@ private: void handleMessage(MessageSwitchColorScheme* message) override; void handleMessage(MessageWindowFocus* message) override; - FilePath migrateProjectSettings(const FilePath& projectSettingsFilePath) const; void startMessagingAndScheduling(); void loadWindow(bool showStartWindow); diff --git a/src/lib/utility/commandline/CommandLineParser.cpp b/src/lib/utility/commandline/CommandLineParser.cpp index 6ca46345..7430ffe7 100644 --- a/src/lib/utility/commandline/CommandLineParser.cpp +++ b/src/lib/utility/commandline/CommandLineParser.cpp @@ -213,7 +213,7 @@ void CommandLineParser::processProjectfile() return; } - if (m_projectFile.extension() != L".srctrlprj" && m_projectFile.extension() != L".coatiproject") + if (m_projectFile.extension() != L".srctrlprj") { m_errorString = errorstring + L" has a wrong file ending"; m_projectFile = FilePath(); diff --git a/src/lib_gui/platform_includes/includesLinux.h b/src/lib_gui/platform_includes/includesLinux.h index 0e66b6b0..01c9596d 100644 --- a/src/lib_gui/platform_includes/includesLinux.h +++ b/src/lib_gui/platform_includes/includesLinux.h @@ -47,21 +47,13 @@ void setupApp(int argc, char *argv[]) AppPath::setAppPath(FilePath(QCoreApplication::applicationDirPath().toStdWString() + L"/").getAbsolute()); std::string userdir(std::getenv("HOME")); - QDir coatiDir((userdir + "/.config/coati").c_str()); userdir.append("/.config/sourcetrail/"); QString userDataPath(userdir.c_str()); QDir dataDir(userdir.c_str()); if (!dataDir.exists()) { - if (coatiDir.exists()) - { - utility::copyNewFilesFromDirectory(coatiDir.absolutePath(), userDataPath); - } - else - { - dataDir.mkpath(userDataPath); - } + dataDir.mkpath(userDataPath); } utility::copyNewFilesFromDirectory(QString::fromStdWString(ResourcePaths::getFallbackPath().wstr()), userDataPath); diff --git a/src/lib_gui/platform_includes/includesMac.h b/src/lib_gui/platform_includes/includesMac.h index 43ed425d..d357fc23 100644 --- a/src/lib_gui/platform_includes/includesMac.h +++ b/src/lib_gui/platform_includes/includesMac.h @@ -64,18 +64,6 @@ void setupPlatform(int argc, char *argv[]) if (!dataDir.exists()) { dataDir.mkpath(dataPath); - - if (dataPath.endsWith("Sourcetrail")) - { - QString coatiDataPath = dataPath; - coatiDataPath.append("/../Coati"); - - QDir coatiDataDir(coatiDataPath); - if (coatiDataDir.exists()) - { - oldDataPath = coatiDataPath; - } - } } utility::copyNewFilesFromDirectory(oldDataPath, dataPath); diff --git a/src/lib_gui/qt/QtApplication.cpp b/src/lib_gui/qt/QtApplication.cpp index 1e1c7318..ecc3ae08 100644 --- a/src/lib_gui/qt/QtApplication.cpp +++ b/src/lib_gui/qt/QtApplication.cpp @@ -28,7 +28,7 @@ bool QtApplication::event(QEvent *event) FilePath path(fileEvent->file().toStdWString()); - if (path.exists() && (path.extension() == L".srctrlprj" || path.extension() == L".coatiproject")) + if (path.exists() && path.extension() == L".srctrlprj") { MessageLoadProject(path).dispatch(); return true; diff --git a/src/lib_gui/qt/window/QtMainWindow.cpp b/src/lib_gui/qt/window/QtMainWindow.cpp index 2125c132..aece5c02 100644 --- a/src/lib_gui/qt/window/QtMainWindow.cpp +++ b/src/lib_gui/qt/window/QtMainWindow.cpp @@ -597,7 +597,7 @@ void QtMainWindow::newProjectFromCDB(const FilePath& filePath) void QtMainWindow::openProject() { QString fileName = QtFileDialog::getOpenFileName( - this, tr("Open File"), FilePath(), "Sourcetrail Project Files (*.srctrlprj *.coatiproject)"); + this, tr("Open File"), FilePath(), "Sourcetrail Project Files (*.srctrlprj)"); if (!fileName.isEmpty()) {