Utils: Use numberedKey(Key, int) more wildly

Will ease transition to a key class that doen's have ::number()

Change-Id: Ib2f2957c916f41b0731a2033422bfbf7e429bcc8
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>

1 files changed, 3 insertions, 3 deletions

diff --git a/src/plugins/baremetal/debugserverprovidermanager.cpp b/src/plugins/baremetal/debugserverprovidermanager.cpp
index 5ef3147e47..536b279700 100644
--- a/src/plugins/baremetal/debugserverprovidermanager.cpp
+++ b/src/plugins/baremetal/debugserverprovidermanager.cpp
@@ -90,7 +90,7 @@ void DebugServerProviderManager::restoreProviders()
 
     const int count = data.value(countKeyC, 0).toInt();
     for (int i = 0; i < count; ++i) {
-        const Key key = dataKeyC + Key::number(i);
+        const Key key = numberedKey(dataKeyC, i);
         if (!data.contains(key))
             break;
 
@@ -132,8 +132,8 @@ void DebugServerProviderManager::saveProviders()
             p->toMap(tmp);
             if (tmp.isEmpty())
                 continue;
-            const Key key = dataKeyC + Key::number(count);
-            data.insert(key, QVariant::fromValue(tmp));
+            const Key key = numberedKey(dataKeyC, count);
+            data.insert(key, variantFromStore(tmp));
             ++count;
         }
     }