From 1e615d7acf2216e18338c43946cddfd3179dcebd Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 21 Feb 2019 09:11:53 +0100 Subject: [PATCH] Qnx: Inline only use of QnxDeviceFactory::deviceType() And add a comment to the secondary use of Constants::QNX_QNX_OS_TYPE as device type. Change-Id: I1ae4bda890c87500a23e1df5cb7fa6e4f1079c96 Reviewed-by: Christian Kandeler --- src/plugins/qnx/qnxconstants.h | 2 +- src/plugins/qnx/qnxdevice.cpp | 5 ----- src/plugins/qnx/qnxdevice.h | 2 -- src/plugins/qnx/qnxplugin.cpp | 2 +- 4 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/plugins/qnx/qnxconstants.h b/src/plugins/qnx/qnxconstants.h index ecd31d6b3db..05c5a17618b 100644 --- a/src/plugins/qnx/qnxconstants.h +++ b/src/plugins/qnx/qnxconstants.h @@ -41,7 +41,7 @@ const char QNX_QNX_RUNCONFIGURATION_PREFIX[] = "Qt4ProjectManager.QNX.QNXRunConf const char QNX_QNX_DEPLOYCONFIGURATION_ID[] = "Qt4ProjectManager.QNX.QNXDeployConfiguration"; -const char QNX_QNX_OS_TYPE[] = "QnxOsType"; +const char QNX_QNX_OS_TYPE[] = "QnxOsType"; // Also used for device type. const char QNX_DEBUG_EXECUTABLE[] = "pdebug"; diff --git a/src/plugins/qnx/qnxdevice.cpp b/src/plugins/qnx/qnxdevice.cpp index 9b4a7542ffe..0765cfac65a 100644 --- a/src/plugins/qnx/qnxdevice.cpp +++ b/src/plugins/qnx/qnxdevice.cpp @@ -201,10 +201,5 @@ ProjectExplorer::IDevice::Ptr QnxDeviceFactory::create() const return wizard.device(); } -Core::Id QnxDeviceFactory::deviceType() -{ - return Core::Id(Constants::QNX_QNX_OS_TYPE); -} - } // namespace Internal } // namespace Qnx diff --git a/src/plugins/qnx/qnxdevice.h b/src/plugins/qnx/qnxdevice.h index ea0eab27378..328c32d4391 100644 --- a/src/plugins/qnx/qnxdevice.h +++ b/src/plugins/qnx/qnxdevice.h @@ -78,8 +78,6 @@ public: QnxDeviceFactory(); ProjectExplorer::IDevice::Ptr create() const override; - - static Core::Id deviceType(); }; } // namespace Internal diff --git a/src/plugins/qnx/qnxplugin.cpp b/src/plugins/qnx/qnxplugin.cpp index 3d64e720bfa..65b62a675c0 100644 --- a/src/plugins/qnx/qnxplugin.cpp +++ b/src/plugins/qnx/qnxplugin.cpp @@ -88,7 +88,7 @@ public: setConfigBaseId(Constants::QNX_QNX_DEPLOYCONFIGURATION_ID); setDefaultDisplayName(QCoreApplication::translate("Qnx::Internal::QnxDeployConfiguration", "Deploy to QNX Device")); - addSupportedTargetDeviceType(QnxDeviceFactory::deviceType()); + addSupportedTargetDeviceType(Constants::QNX_QNX_OS_TYPE); setUseDeploymentDataView(); addInitialStep(DeviceCheckBuildStep::stepId());