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

Utils: Rename most FilePath::{from,to}Variant uses to {from,to}Settings

Browse Source 
Specifies the main purpose more clearly. The remaining ones a "true"
(internal) variants in models and as action data.

Change-Id: I8dd3c846e419f29d88283c2f48268ef6685b19fe
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2023-01-03 12:31:52 +01:00
parent ca4af940b1
commit 66c08a824d
59 changed files with 154 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -259,7 +259,7 @@ QVariantMap ToolChain::toMap() const
if (!d->m_targetAbiKey.isEmpty())
result.insert(d->m_targetAbiKey, d->m_targetAbi.toString());
if (!d->m_compilerCommandKey.isEmpty())
result.insert(d->m_compilerCommandKey, d->m_compilerCommand.toVariant());
result.insert(d->m_compilerCommandKey, d->m_compilerCommand.toSettings());
return result;
}
@@ -382,7 +382,7 @@ bool ToolChain::fromMap(const QVariantMap &data)
if (!d->m_targetAbiKey.isEmpty())
d->m_targetAbi = Abi::fromString(data.value(d->m_targetAbiKey).toString());
d->m_compilerCommand = FilePath::fromVariant(data.value(d->m_compilerCommandKey));
d->m_compilerCommand = FilePath::fromSettings(data.value(d->m_compilerCommandKey));
d->m_isValid.reset();
return true;
@@ -695,16 +695,16 @@ static QString badToolchainTimestampKey() { return {"Timestamp"}; }
QVariantMap BadToolchain::toMap() const
{
return {{badToolchainFilePathKey(), filePath.toVariant()},
{badToolchainSymlinkTargetKey(), symlinkTarget.toVariant()},
return {{badToolchainFilePathKey(), filePath.toSettings()},
{badToolchainSymlinkTargetKey(), symlinkTarget.toSettings()},
{badToolchainTimestampKey(), timestamp.toMSecsSinceEpoch()}};
}
BadToolchain BadToolchain::fromMap(const QVariantMap &map)
{
return {
FilePath::fromVariant(map.value(badToolchainFilePathKey())),
FilePath::fromVariant(map.value(badToolchainSymlinkTargetKey())),
FilePath::fromSettings(map.value(badToolchainFilePathKey())),
FilePath::fromSettings(map.value(badToolchainSymlinkTargetKey())),
QDateTime::fromMSecsSinceEpoch(map.value(badToolchainTimestampKey()).toLongLong())
};
}