From e1b14565facfb6b8f8c28f0c4394421f17bdc231 Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Wed, 10 Feb 2016 15:33:38 +0100 Subject: CppTools: Do not clear project state on session unload Affected functionality was, among others: * Getting the correct project part when opening a file * Fallback project part (merged defines/includes) not up to date * Fallback for "Switch Header/Source" not up to date In the early days sessions switching was probably implemented by "close all projects of session X, open all projects of session Y". That's not the case anymore today. Change-Id: I4c6a80e2eb219615d3ea6fcf07be7c05072c8832 Reviewed-by: Christian Stenger Reviewed-by: Tobias Hunger --- src/plugins/cpptools/cppmodelmanager.cpp | 14 +------------- src/plugins/cpptools/cppmodelmanager.h | 1 - 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp index 7a94dbb5809..3dad9eea301 100644 --- a/src/plugins/cpptools/cppmodelmanager.cpp +++ b/src/plugins/cpptools/cppmodelmanager.cpp @@ -326,8 +326,6 @@ CppModelManager::CppModelManager(QObject *parent) this, SLOT(onAboutToRemoveProject(ProjectExplorer::Project*))); connect(sessionManager, SIGNAL(aboutToLoadSession(QString)), this, SLOT(onAboutToLoadSession())); - connect(sessionManager, SIGNAL(aboutToUnloadSession(QString)), - this, SLOT(onAboutToUnloadSession())); connect(Core::EditorManager::instance(), &Core::EditorManager::currentEditorChanged, this, &CppModelManager::onCurrentEditorChanged); @@ -1061,17 +1059,6 @@ void CppModelManager::onAboutToLoadSession() GC(); } -void CppModelManager::onAboutToUnloadSession() -{ - Core::ProgressManager::cancelTasks(CppTools::Constants::TASK_INDEX); - do { - QMutexLocker locker(&d->m_projectMutex); - d->m_projectToProjectsInfo.clear(); - recalculateProjectPartMappings(); - d->m_dirty = true; - } while (0); -} - void CppModelManager::renameIncludes(const QString &oldFileName, const QString &newFileName) { if (oldFileName.isEmpty() || newFileName.isEmpty()) @@ -1103,6 +1090,7 @@ void CppModelManager::renameIncludes(const QString &oldFileName, const QString & void CppModelManager::onCoreAboutToClose() { + Core::ProgressManager::cancelTasks(CppTools::Constants::TASK_INDEX); d->m_enableGC = false; } diff --git a/src/plugins/cpptools/cppmodelmanager.h b/src/plugins/cpptools/cppmodelmanager.h index 4c10343edac..fb02d45829a 100644 --- a/src/plugins/cpptools/cppmodelmanager.h +++ b/src/plugins/cpptools/cppmodelmanager.h @@ -197,7 +197,6 @@ private slots: // This should be executed in the GUI thread. friend class Tests::ModelManagerTestHelper; void onAboutToLoadSession(); - void onAboutToUnloadSession(); void renameIncludes(const QString &oldFileName, const QString &newFileName); void onProjectAdded(ProjectExplorer::Project *project); void onAboutToRemoveProject(ProjectExplorer::Project *project); -- cgit v1.2.3