IDevice: Make fromMap() / toMap() protected

Change-Id: I9a8f1caddffaf4e0f446ccc4f08f1110b6c003d4
Reviewed-by: Qt CI Bot <[email protected]>
Reviewed-by: hjk <[email protected]>
Reviewed-by: <[email protected]>

8 files changed, 24 insertions, 16 deletions

diff --git a/src/plugins/android/androiddevice.h b/src/plugins/android/androiddevice.h
index a9133de3f32..e98d4c003bb 100644
--- a/src/plugins/android/androiddevice.h
+++ b/src/plugins/android/androiddevice.h
@@ -46,8 +46,6 @@ class AndroidDevice final : public ProjectExplorer::IDevice
 public:
     AndroidDevice();
 
-    void fromMap(const QVariantMap &map) override;
-
     static IDevice::Ptr create();
     static AndroidDeviceInfo androidDeviceInfoFromIDevice(const IDevice *dev);
     static void setAndroidDeviceInfoExtras(IDevice *dev, const AndroidDeviceInfo &info);
@@ -74,6 +72,9 @@ public:
     QString openGlStatusString() const;
     AndroidConfig::OpenGl openGlStatus() const;
 
+protected:
+    void fromMap(const QVariantMap &map) final;
+
 private:
     void addEmulatorActionsIfNotFound();
     ProjectExplorer::IDevice::DeviceInfo deviceInformation() const override;
diff --git a/src/plugins/baremetal/baremetaldevice.h b/src/plugins/baremetal/baremetaldevice.h
index 88c42d75f24..f10af5d4c5c 100644
--- a/src/plugins/baremetal/baremetaldevice.h
+++ b/src/plugins/baremetal/baremetaldevice.h
@@ -57,6 +57,7 @@ public:
     void setDebugServerProviderId(const QString &id);
     void unregisterDebugServerProvider(IDebugServerProvider *provider);
 
+protected:
     void fromMap(const QVariantMap &map) final;
     QVariantMap toMap() const final;
 
diff --git a/src/plugins/boot2qt/qdbdevice.h b/src/plugins/boot2qt/qdbdevice.h
index 5cf64c52551..30d66e4cec9 100644
--- a/src/plugins/boot2qt/qdbdevice.h
+++ b/src/plugins/boot2qt/qdbdevice.h
@@ -49,11 +49,12 @@ public:
     void setSerialNumber(const QString &serial);
     QString serialNumber() const;
 
+    void setupDefaultNetworkSettings(const QString &host);
+
+protected:
     void fromMap(const QVariantMap &map) final;
     QVariantMap toMap() const final;
 
-    void setupDefaultNetworkSettings(const QString &host);
-
 private:
     QdbDevice();
 
diff --git a/src/plugins/docker/dockerdevice.h b/src/plugins/docker/dockerdevice.h
index c4d0efe703b..369cc42c0b0 100644
--- a/src/plugins/docker/dockerdevice.h
+++ b/src/plugins/docker/dockerdevice.h
@@ -119,13 +119,15 @@ public:
     Utils::FilePath mapFromLocalAccess(const Utils::FilePath &filePath) const;
     Utils::FilePath mapFromLocalAccess(const QString &filePath) const;
 
+protected:
+    void fromMap(const QVariantMap &map) final;
+    QVariantMap toMap() const final;
+
 private:
     Utils::FilePaths findFilesWithFind(const Utils::FilePath &filePath,
                                        const QStringList &nameFilters,
                                        QDir::Filters filters,
                                        QDir::SortFlags sort) const;
-    void fromMap(const QVariantMap &map) final;
-    QVariantMap toMap() const final;
 
     void aboutToBeRemoved() const final;
 
diff --git a/src/plugins/ios/iosdevice.h b/src/plugins/ios/iosdevice.h
index 80674de526c..a4b914cf9cd 100644
--- a/src/plugins/ios/iosdevice.h
+++ b/src/plugins/ios/iosdevice.h
@@ -55,8 +55,6 @@ public:
     ProjectExplorer::IDeviceWidget *createWidget() override;
     ProjectExplorer::DeviceProcessSignalOperation::Ptr signalOperation() const override;
 
-    void fromMap(const QVariantMap &map) override;
-    QVariantMap toMap() const override;
     QString deviceName() const;
     QString uniqueDeviceID() const;
     QString uniqueInternalDeviceId() const;
@@ -68,6 +66,9 @@ public:
     static QString name();
 
 protected:
+    void fromMap(const QVariantMap &map) final;
+    QVariantMap toMap() const final;
+
     friend class IosDeviceFactory;
     friend class Ios::Internal::IosDeviceManager;
     IosDevice();
diff --git a/src/plugins/projectexplorer/devicesupport/idevice.h b/src/plugins/projectexplorer/devicesupport/idevice.h
index 978c08a25a6..c36091b5543 100644
--- a/src/plugins/projectexplorer/devicesupport/idevice.h
+++ b/src/plugins/projectexplorer/devicesupport/idevice.h
@@ -193,9 +193,6 @@ public:
     void setDeviceState(const DeviceState state);
     QString deviceStateToString() const;
 
-    virtual void fromMap(const QVariantMap &map);
-    virtual QVariantMap toMap() const;
-
     static Utils::Id typeFromMap(const QVariantMap &map);
     static Utils::Id idFromMap(const QVariantMap &map);
 
@@ -289,6 +286,9 @@ public:
 protected:
     IDevice();
 
+    virtual void fromMap(const QVariantMap &map);
+    virtual QVariantMap toMap() const;
+
     using OpenTerminal = std::function<void(const Utils::Environment &, const Utils::FilePath &)>;
     void setOpenTerminal(const OpenTerminal &openTerminal);
     void setDisplayType(const QString &type);
diff --git a/src/plugins/qnx/qnxdevice.h b/src/plugins/qnx/qnxdevice.h
index 75666868db0..68ee45356e0 100644
--- a/src/plugins/qnx/qnxdevice.h
+++ b/src/plugins/qnx/qnxdevice.h
@@ -51,10 +51,10 @@ public:
 
     int qnxVersion() const;
 
-    void fromMap(const QVariantMap &map) override;
-    QVariantMap toMap() const override;
-
 protected:
+    void fromMap(const QVariantMap &map) final;
+    QVariantMap toMap() const final;
+
     QString interruptProcessByNameCommandLine(const QString &filePath) const;
     QString killProcessByNameCommandLine(const QString &filePath) const;
 
diff --git a/src/plugins/winrt/winrtdevice.h b/src/plugins/winrt/winrtdevice.h
index b1063f5c4cd..37d81131557 100644
--- a/src/plugins/winrt/winrtdevice.h
+++ b/src/plugins/winrt/winrtdevice.h
@@ -43,13 +43,15 @@ public:
 
     ProjectExplorer::IDeviceWidget *createWidget() override;
     ProjectExplorer::DeviceProcessSignalOperation::Ptr signalOperation() const override;
-    void fromMap(const QVariantMap &map) override;
-    QVariantMap toMap() const override;
 
     static QString displayNameForType(Utils::Id type);
     int deviceId() const { return m_deviceId; }
     void setDeviceId(int deviceId) { m_deviceId = deviceId; }
 
+protected:
+    void fromMap(const QVariantMap &map) final;
+    QVariantMap toMap() const final;
+
 private:
     WinRtDevice();