feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ProjectExplorer: Use Guard in favor of setIsUpdating

Browse Source 
Change-Id: I4f8448205fe0f90d0b8554f0911e66aa74cbe9b5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tobias Hunger
2016-08-24 14:56:40 +02:00
parent 34c8a5d592
commit b8c83c45ac
3 changed files with 26 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/projectexplorer/projectimporter.cpp
View File

@@ -53,7 +53,7 @@ void ProjectImporter::markTemporary(Kit *k)
{
QTC_ASSERT(!k->hasValue(KIT_IS_TEMPORARY), return);
bool oldIsUpdating = setIsUpdating(true);
UpdateGuard guard(*this);
const QString name = k->displayName();
k->setUnexpandedDisplayName(QCoreApplication::translate("ProjectExplorer::ProjectImporter",
@@ -62,8 +62,6 @@ void ProjectImporter::markTemporary(Kit *k)
k->setValue(KIT_TEMPORARY_NAME, k->displayName());
k->setValue(KIT_FINAL_NAME, name);
k->setValue(KIT_IS_TEMPORARY, true);
setIsUpdating(oldIsUpdating);
}
void ProjectImporter::makePermanent(Kit *k)
@@ -71,7 +69,7 @@ void ProjectImporter::makePermanent(Kit *k)
if (!k->hasValue(KIT_IS_TEMPORARY))
return;
bool oldIsUpdating = setIsUpdating(true);
UpdateGuard guard(*this);
k->removeKey(KIT_IS_TEMPORARY);
k->removeKey(TEMPORARY_OF_PROJECTS);
@@ -80,8 +78,6 @@ void ProjectImporter::makePermanent(Kit *k)
k->setUnexpandedDisplayName(k->value(KIT_FINAL_NAME).toString());
k->removeKey(KIT_TEMPORARY_NAME);
k->removeKey(KIT_FINAL_NAME);
setIsUpdating(oldIsUpdating);
}
void ProjectImporter::cleanupKit(Kit *k)
@@ -94,15 +90,10 @@ void ProjectImporter::addProject(Kit *k)
if (!k->hasValue(KIT_IS_TEMPORARY))
return;
UpdateGuard guard(*this);
QStringList projects = k->value(TEMPORARY_OF_PROJECTS, QStringList()).toStringList();
projects.append(m_projectPath); // note: There can be more than one instance of the project added!
bool oldIsUpdating = setIsUpdating(true);
k->setValueSilently(TEMPORARY_OF_PROJECTS, projects);
setIsUpdating(oldIsUpdating);
}
void ProjectImporter::removeProject(Kit *k, const QString &path)
@@ -110,17 +101,14 @@ void ProjectImporter::removeProject(Kit *k, const QString &path)
if (!k->hasValue(KIT_IS_TEMPORARY))
return;
UpdateGuard guard(*this);
QStringList projects = k->value(TEMPORARY_OF_PROJECTS, QStringList()).toStringList();
projects.removeOne(path);
bool oldIsUpdating = setIsUpdating(true);
if (projects.isEmpty())
KitManager::deregisterKit(k);
else
k->setValueSilently(TEMPORARY_OF_PROJECTS, projects);
setIsUpdating(oldIsUpdating);
}
bool ProjectImporter::isTemporaryKit(Kit *k)