ProjectExplorer: Base IDevice::osType on a data member

Change-Id: I969563e6e62895a51fb4692c8eb0bab278f0ecae
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

4 files changed, 3 insertions, 12 deletions

diff --git a/src/plugins/ios/iosdevice.cpp b/src/plugins/ios/iosdevice.cpp
index 314e1de88cd..f5ceb1bb9f4 100644
--- a/src/plugins/ios/iosdevice.cpp
+++ b/src/plugins/ios/iosdevice.cpp
@@ -86,6 +86,7 @@ IosDevice::IosDevice()
     setDefaultDisplayName(IosDevice::name());
     setDisplayType(QCoreApplication::translate("Ios::Internal::IosDevice", "iOS"));
     setMachineType(IDevice::Hardware);
+    setOsType(Utils::OsTypeMac);
     setDeviceState(DeviceDisconnected);
     Utils::PortList ports;
     ports.addRange(Utils::Port(Constants::IOS_DEVICE_PORT_START),
@@ -101,6 +102,7 @@ IosDevice::IosDevice(const QString &uid)
     setDefaultDisplayName(IosDevice::name());
     setDisplayType(QCoreApplication::translate("Ios::Internal::IosDevice", "iOS"));
     setMachineType(IDevice::Hardware);
+    setOsType(Utils::OsTypeMac);
     setDeviceState(DeviceDisconnected);
 }
 
@@ -174,11 +176,6 @@ bool IosDevice::canAutoDetectPorts() const
     return true;
 }
 
-Utils::OsType IosDevice::osType() const
-{
-    return Utils::OsTypeMac;
-}
-
 
 // IosDeviceManager
 
diff --git a/src/plugins/ios/iosdevice.h b/src/plugins/ios/iosdevice.h
index beb731da328..90588f65d9b 100644
--- a/src/plugins/ios/iosdevice.h
+++ b/src/plugins/ios/iosdevice.h
@@ -59,7 +59,6 @@ public:
     QString osVersion() const;
     Utils::Port nextPort() const;
     bool canAutoDetectPorts() const override;
-    Utils::OsType osType() const override;
 
     static QString name();
 
diff --git a/src/plugins/ios/iossimulator.cpp b/src/plugins/ios/iossimulator.cpp
index 4b88838d1f3..84eebaae0f7 100644
--- a/src/plugins/ios/iossimulator.cpp
+++ b/src/plugins/ios/iossimulator.cpp
@@ -50,6 +50,7 @@ IosSimulator::IosSimulator(Core::Id id)
     setupId(IDevice::AutoDetected, id);
     setType(Constants::IOS_SIMULATOR_TYPE);
     setMachineType(IDevice::Emulator);
+    setOsType(Utils::OsTypeMac);
     setDefaultDisplayName(QCoreApplication::translate("Ios::Internal::IosSimulator",
                                                       "iOS Simulator"));
     setDisplayType(QCoreApplication::translate("Ios::Internal::IosSimulator", "iOS Simulator"));
@@ -102,11 +103,6 @@ bool IosSimulator::canAutoDetectPorts() const
     return true;
 }
 
-Utils::OsType IosSimulator::osType() const
-{
-    return Utils::OsTypeMac;
-}
-
 // IosDeviceType
 
 IosDeviceType::IosDeviceType(IosDeviceType::Type type, const QString &identifier, const QString &displayName) :
diff --git a/src/plugins/ios/iossimulator.h b/src/plugins/ios/iossimulator.h
index be6652e4178..6d21acc4e68 100644
--- a/src/plugins/ios/iossimulator.h
+++ b/src/plugins/ios/iossimulator.h
@@ -73,7 +73,6 @@ public:
     ProjectExplorer::DeviceProcessSignalOperation::Ptr signalOperation() const override;
     Utils::Port nextPort() const;
     bool canAutoDetectPorts() const override;
-    Utils::OsType osType() const override;
 
 protected:
     friend class IosSimulatorFactory;