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

ProjectExplorer: Change ToolChain::toMap() signature

Browse Source 
... to something similar to AspectContainer::toMap() as
preparation for later aspectification.

Change-Id: Ic60060ad1a7eb1aba58ded01221b016c684db073
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
hjk
2023-07-20 16:41:45 +02:00
parent 580d605fd3
commit c1309f9417
13 changed files with 34 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/projectexplorer/toolchain.cpp
View File

@@ -226,7 +226,9 @@ ToolChain *ToolChain::clone() const
if (f->supportedToolChainType() == d->m_typeId) {
ToolChain *tc = f->create();
QTC_ASSERT(tc, return nullptr);
tc->fromMap(toMap());
QVariantMap data;
toMap(data);
tc->fromMap(data);
// New ID for the clone. It's different.
tc->d->m_id = QUuid::createUuid().toByteArray();
return tc;
@@ -242,9 +244,8 @@ ToolChain *ToolChain::clone() const
Make sure to call this function when deriving.
*/
QVariantMap ToolChain::toMap() const
void ToolChain::toMap(QVariantMap &result) const
{
QVariantMap result;
QString idToSave = d->m_typeId.toString() + QLatin1Char(':') + QString::fromUtf8(id());
result.insert(QLatin1String(ID_KEY), idToSave);
result.insert(QLatin1String(DISPLAY_NAME_KEY), displayName());
@@ -265,7 +266,6 @@ QVariantMap ToolChain::toMap() const
result.insert(d->m_targetAbiKey, d->m_targetAbi.toString());
if (!d->m_compilerCommandKey.isEmpty())
result.insert(d->m_compilerCommandKey, d->m_compilerCommand.toSettings());
return result;
}
void ToolChain::toolChainUpdated()