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

Plugins: And more Store and Key

Browse Source 
After this one, is compiles with the opt-in macro. Not changed yet,
though.

Change-Id: I29a66ecb5daa71d0d97566b81fd9f47d92f6368a
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
hjk
2023-08-25 13:19:26 +02:00
parent c9fd5465eb
commit d7d78df9da
46 changed files with 246 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/ios/iosdevice.cpp
View File

@@ -131,18 +131,18 @@ void IosDevice::fromMap(const Store &map)
IDevice::fromMap(map);
m_extraInfo.clear();
const QVariantMap vMap = map.value(QLatin1String(Constants::EXTRA_INFO_KEY)).toMap();
const Store vMap = map.value(Constants::EXTRA_INFO_KEY).value<Store>();
for (auto i = vMap.cbegin(), end = vMap.cend(); i != end; ++i)
m_extraInfo.insert(i.key(), i.value().toString());
m_extraInfo.insert(stringFromKey(i.key()), i.value().toString());
}
QVariantMap IosDevice::toMap() const
Store IosDevice::toMap() const
{
QVariantMap res = IDevice::toMap();
QVariantMap vMap;
Store res = IDevice::toMap();
Store vMap;
for (auto i = m_extraInfo.cbegin(), end = m_extraInfo.cend(); i != end; ++i)
vMap.insert(i.key(), i.value());
res.insert(QLatin1String(Constants::EXTRA_INFO_KEY), vMap);
vMap.insert(keyFromString(i.key()), i.value());
res.insert(Constants::EXTRA_INFO_KEY, QVariant::fromValue(vMap));
return res;
}
@@ -153,7 +153,7 @@ QString IosDevice::deviceName() const
QString IosDevice::uniqueDeviceID() const
{
return id().suffixAfter(Utils::Id(Constants::IOS_DEVICE_ID));
return id().suffixAfter(Id(Constants::IOS_DEVICE_ID));
}
QString IosDevice::uniqueInternalDeviceId() const
@@ -543,9 +543,9 @@ IosDeviceFactory::IosDeviceFactory()
setConstructionFunction([] { return IDevice::Ptr(new IosDevice); });
}
bool IosDeviceFactory::canRestore(const QVariantMap &map) const
bool IosDeviceFactory::canRestore(const Store &map) const
{
QVariantMap vMap = map.value(QLatin1String(Constants::EXTRA_INFO_KEY)).toMap();
Store vMap = map.value(Constants::EXTRA_INFO_KEY).value<Store>();
if (vMap.isEmpty() || vMap.value(kDeviceName).toString() == QLatin1String("*unknown*"))
return false; // transient device (probably generated during an activation)
return true;