Utils: Introduce variantFromStore and storeFromVariant

These are functional replacements for
  QVariant::fromValue(QVariantMap) (or QVariant::fromValue(Store)) and
  QVariant::toMap() (or QVariant::toValue<Store>())

We will have a few code paths in the end that need to explicitly
operarate on both QVariantMap and Store (e.g. actual reading/writing
to keep format compatibility etc), so these can't in the end be
simple to/fromValue(OneType) but need an internal 'if' or such.

Change-Id: I954f3cb24fa8fe123162b72bbd25d891dd19b768
Reviewed-by: Marcus Tillmanns <[email protected]>

1 files changed, 2 insertions, 2 deletions

diff --git a/src/plugins/ios/iosdevice.cpp b/src/plugins/ios/iosdevice.cpp
index 4499be94175..6315f6d5817 100644
--- a/src/plugins/ios/iosdevice.cpp
+++ b/src/plugins/ios/iosdevice.cpp
@@ -131,7 +131,7 @@ void IosDevice::fromMap(const Store &map)
     IDevice::fromMap(map);
 
     m_extraInfo.clear();
-    const Store vMap = map.value(Constants::EXTRA_INFO_KEY).value<Store>();
+    const Store vMap = storeFromVariant(map.value(Constants::EXTRA_INFO_KEY));
     for (auto i = vMap.cbegin(), end = vMap.cend(); i != end; ++i)
         m_extraInfo.insert(stringFromKey(i.key()), i.value().toString());
 }
@@ -142,7 +142,7 @@ Store IosDevice::toMap() const
     Store vMap;
     for (auto i = m_extraInfo.cbegin(), end = m_extraInfo.cend(); i != end; ++i)
         vMap.insert(keyFromString(i.key()), i.value());
-    res.insert(Constants::EXTRA_INFO_KEY, QVariant::fromValue(vMap));
+    res.insert(Constants::EXTRA_INFO_KEY, variantFromStore(vMap));
     return res;
 }