diff --git a/src/plugins/qnx/qnxdevice.cpp b/src/plugins/qnx/qnxdevice.cpp index 83021ea5d57..49cd195ccdb 100644 --- a/src/plugins/qnx/qnxdevice.cpp +++ b/src/plugins/qnx/qnxdevice.cpp @@ -78,20 +78,6 @@ class QnxPortsGatheringMethod : public PortsGatheringMethod }; QnxDevice::QnxDevice() -{ - init(); -} - -QnxDevice::QnxDevice(const QString &name, Origin origin, Core::Id id) -{ - setupId(origin, id); - setDisplayName(name); - init(); -} - -QnxDevice::QnxDevice(const QnxDevice &other) = default; - -void QnxDevice::init() { addDeviceAction({tr("Deploy Qt libraries..."), [](const IDevice::Ptr &device, QWidget *parent) { QnxDeployQtLibrariesDialog dialog(device, parent); @@ -99,16 +85,6 @@ void QnxDevice::init() }}); } -QnxDevice::Ptr QnxDevice::create() -{ - return Ptr(new QnxDevice); -} - -QnxDevice::Ptr QnxDevice::create(const QString &name, Origin origin, Core::Id id) -{ - return Ptr(new QnxDevice(name, origin, id)); -} - QString QnxDevice::displayType() const { return tr("QNX"); diff --git a/src/plugins/qnx/qnxdevice.h b/src/plugins/qnx/qnxdevice.h index 72f9b5a2b33..5a120d92b15 100644 --- a/src/plugins/qnx/qnxdevice.h +++ b/src/plugins/qnx/qnxdevice.h @@ -39,9 +39,7 @@ public: using Ptr = QSharedPointer; using ConstPtr = QSharedPointer; - static Ptr create(); - static Ptr create(const QString &name, - Origin origin = ManuallyAdded, Core::Id id = Core::Id()); + static Ptr create() { return Ptr(new QnxDevice); } ProjectExplorer::IDevice::Ptr clone() const override; ProjectExplorer::PortsGatheringMethod::Ptr portsGatheringMethod() const override; @@ -60,17 +58,13 @@ public: QVariantMap toMap() const override; protected: - QnxDevice(); - QnxDevice(const QString &name, - Origin origin, Core::Id id); - QnxDevice(const QnxDevice &other); - QString interruptProcessByNameCommandLine(const QString &filePath) const; QString killProcessByNameCommandLine(const QString &filePath) const; private: + QnxDevice(); + void updateVersionNumber() const; - void init(); mutable int m_versionNumber = 0; }; diff --git a/src/plugins/qnx/qnxdevicefactory.cpp b/src/plugins/qnx/qnxdevicefactory.cpp index ba025df8d16..02e2e454659 100644 --- a/src/plugins/qnx/qnxdevicefactory.cpp +++ b/src/plugins/qnx/qnxdevicefactory.cpp @@ -41,7 +41,7 @@ QnxDeviceFactory::QnxDeviceFactory() setCombinedIcon(":/qnx/images/qnxdevicesmall.png", ":/qnx/images/qnxdevice.png"); setCanCreate(true); - setConstructionFunction([] { return QnxDevice::create(); }); + setConstructionFunction(&QnxDevice::create); } ProjectExplorer::IDevice::Ptr QnxDeviceFactory::create() const diff --git a/src/plugins/qnx/qnxdevicewizard.cpp b/src/plugins/qnx/qnxdevicewizard.cpp index e4aa8c66642..89fbb06c641 100644 --- a/src/plugins/qnx/qnxdevicewizard.cpp +++ b/src/plugins/qnx/qnxdevicewizard.cpp @@ -52,7 +52,9 @@ QnxDeviceWizard::QnxDeviceWizard(QWidget *parent) : m_finalPage->setCommitPage(true); QSsh::SshConnectionParameters sshParams; sshParams.timeout = 10; - m_device = QnxDevice::create(tr("QNX Device")); + m_device = QnxDevice::create(); + m_device->setupId(IDevice::ManuallyAdded); + m_device->setDisplayName(tr("QNX Device")); m_device->setType(Constants::QNX_QNX_OS_TYPE); m_device->setMachineType(IDevice::Hardware); m_device->setSshParameters(sshParams);