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

ProjectExplorer: Factor out common parts of Kit::{clone(), copyFrom()}

Browse Source 
It's annoying having to update both functions whenever new members are
added.

Change-Id: I799e9f542974095dc5e5f41ece3e037e5d2acd6c
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2019-05-08 13:51:07 +02:00
parent 1b2701205c
commit f436448173
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/plugins/projectexplorer/kit.cpp
View File

@@ -200,41 +200,40 @@ void Kit::unblockNotification()
kitUpdated();
}
void Kit::copyKitCommon(Kit *target, const Kit *source)
{
target->d->m_data = source->d->m_data;
target->d->m_iconPath = source->d->m_iconPath;
target->d->m_deviceTypeForIcon = source->d->m_deviceTypeForIcon;
target->d->m_cachedIcon = source->d->m_cachedIcon;
target->d->m_sticky = source->d->m_sticky;
target->d->m_mutable = source->d->m_mutable;
target->d->m_irrelevantAspects = source->d->m_irrelevantAspects;
}
Kit *Kit::clone(bool keepName) const
{
auto k = new Kit;
copyKitCommon(k, this);
if (keepName)
k->d->m_unexpandedDisplayName = d->m_unexpandedDisplayName;
else
k->d->m_unexpandedDisplayName = newKitName(KitManager::kits());
k->d->m_autodetected = false;
k->d->m_data = d->m_data;
// Do not clone m_fileSystemFriendlyName, needs to be unique
k->d->m_hasError = d->m_hasError;
k->d->m_cachedIcon = d->m_cachedIcon;
k->d->m_iconPath = d->m_iconPath;
k->d->m_deviceTypeForIcon = d->m_deviceTypeForIcon;
k->d->m_sticky = d->m_sticky;
k->d->m_mutable = d->m_mutable;
k->d->m_irrelevantAspects = d->m_irrelevantAspects;
k->d->m_hasError = d->m_hasError; // TODO: Is this intentionally not done for copyFrom()?
return k;
}
void Kit::copyFrom(const Kit *k)
{
KitGuard g(this);
d->m_data = k->d->m_data;
d->m_iconPath = k->d->m_iconPath;
d->m_deviceTypeForIcon = k->d->m_deviceTypeForIcon;
d->m_cachedIcon = k->d->m_cachedIcon;
copyKitCommon(this, k);
d->m_autodetected = k->d->m_autodetected;
d->m_autoDetectionSource = k->d->m_autoDetectionSource;
d->m_unexpandedDisplayName = k->d->m_unexpandedDisplayName;
d->m_fileSystemFriendlyName = k->d->m_fileSystemFriendlyName;
d->m_mustNotify = true;
d->m_sticky = k->d->m_sticky;
d->m_mutable = k->d->m_mutable;
d->m_irrelevantAspects = k->d->m_irrelevantAspects;
}
bool Kit::isValid() const

1
src/plugins/projectexplorer/kit.h
View File

@@ -142,6 +142,7 @@ public:
static QString newKitName(const QString &name, const QList<Kit *> &allKits);
private:
static void copyKitCommon(Kit *target, const Kit *source);
void setSdkProvided(bool sdkProvided);
// Unimplemented.