From fe6b954304dbc52d4caf5da0ae276566a17bc20a Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 16 Aug 2019 11:28:47 +0200 Subject: [PATCH] ProjectExplorer: Remove unused DesktopDeviceConfigurationWidget Change-Id: If5717a7acb8aae555370245879afc398d5a05f61 Reviewed-by: Christian Kandeler --- src/plugins/projectexplorer/CMakeLists.txt | 1 - .../devicesupport/desktopdevice.cpp | 1 - .../desktopdeviceconfigurationwidget.cpp | 86 ------------------- .../desktopdeviceconfigurationwidget.h | 51 ----------- .../desktopdeviceconfigurationwidget.ui | 69 --------------- .../projectexplorer/projectexplorer.pro | 3 - .../projectexplorer/projectexplorer.qbs | 3 +- 7 files changed, 1 insertion(+), 213 deletions(-) delete mode 100644 src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.cpp delete mode 100644 src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.h delete mode 100644 src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.ui diff --git a/src/plugins/projectexplorer/CMakeLists.txt b/src/plugins/projectexplorer/CMakeLists.txt index 92935bd3ce8..f3074cef325 100644 --- a/src/plugins/projectexplorer/CMakeLists.txt +++ b/src/plugins/projectexplorer/CMakeLists.txt @@ -45,7 +45,6 @@ add_qtc_plugin(ProjectExplorer deploymentdataview.cpp deploymentdataview.h deploymentdataview.ui desktoprunconfiguration.cpp desktoprunconfiguration.h devicesupport/desktopdevice.cpp devicesupport/desktopdevice.h - devicesupport/desktopdeviceconfigurationwidget.cpp devicesupport/desktopdeviceconfigurationwidget.h devicesupport/desktopdeviceconfigurationwidget.ui devicesupport/desktopdevicefactory.cpp devicesupport/desktopdevicefactory.h devicesupport/desktopdeviceprocess.cpp devicesupport/desktopdeviceprocess.h devicesupport/desktopprocesssignaloperation.cpp devicesupport/desktopprocesssignaloperation.h diff --git a/src/plugins/projectexplorer/devicesupport/desktopdevice.cpp b/src/plugins/projectexplorer/devicesupport/desktopdevice.cpp index 48e7bdf6774..1128e35a3be 100644 --- a/src/plugins/projectexplorer/devicesupport/desktopdevice.cpp +++ b/src/plugins/projectexplorer/devicesupport/desktopdevice.cpp @@ -27,7 +27,6 @@ #include "desktopdeviceprocess.h" #include "deviceprocesslist.h" #include "localprocesslist.h" -#include "desktopdeviceconfigurationwidget.h" #include "desktopprocesssignaloperation.h" #include diff --git a/src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.cpp b/src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.cpp deleted file mode 100644 index fdac2ab2301..00000000000 --- a/src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.cpp +++ /dev/null @@ -1,86 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ - -#include "desktopdeviceconfigurationwidget.h" -#include "ui_desktopdeviceconfigurationwidget.h" -#include - -#include -#include -#include - -#include - -using namespace ProjectExplorer::Constants; - -namespace ProjectExplorer { - -DesktopDeviceConfigurationWidget::DesktopDeviceConfigurationWidget(const IDevice::Ptr &device, - QWidget *parent) : - IDeviceWidget(device, parent), - m_ui(new Ui::DesktopDeviceConfigurationWidget) -{ - m_ui->setupUi(this); - connect(m_ui->freePortsLineEdit, &QLineEdit::textChanged, - this, &DesktopDeviceConfigurationWidget::updateFreePorts); - - initGui(); -} - -DesktopDeviceConfigurationWidget::~DesktopDeviceConfigurationWidget() -{ - delete m_ui; -} - -void DesktopDeviceConfigurationWidget::updateDeviceFromUi() -{ - updateFreePorts(); -} - -void DesktopDeviceConfigurationWidget::updateFreePorts() -{ - device()->setFreePorts(Utils::PortList::fromString(m_ui->freePortsLineEdit->text())); - m_ui->portsWarningLabel->setVisible(!device()->freePorts().hasMore()); -} - -void DesktopDeviceConfigurationWidget::initGui() -{ - QTC_CHECK(device()->machineType() == IDevice::Hardware); - m_ui->machineTypeValueLabel->setText(tr("Physical Device")); - m_ui->freePortsLineEdit->setPlaceholderText( - QString::fromLatin1("eg: %1-%2").arg(DESKTOP_PORT_START).arg(DESKTOP_PORT_END)); - m_ui->portsWarningLabel->setPixmap(Utils::Icons::WARNING.pixmap()); - m_ui->portsWarningLabel->setToolTip(QLatin1String("") - + tr("You will need at least one port for QML debugging.") - + QLatin1String("")); - QRegExpValidator * const portsValidator - = new QRegExpValidator(QRegExp(Utils::PortList::regularExpression()), this); - m_ui->freePortsLineEdit->setValidator(portsValidator); - - m_ui->freePortsLineEdit->setText(device()->freePorts().toString()); - updateFreePorts(); -} - -} // namespace ProjectExplorer diff --git a/src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.h b/src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.h deleted file mode 100644 index ed78b6e8022..00000000000 --- a/src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.h +++ /dev/null @@ -1,51 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ - -#pragma once - -#include "idevicewidget.h" - -namespace ProjectExplorer { -namespace Ui { class DesktopDeviceConfigurationWidget; } - -class DesktopDeviceConfigurationWidget : public IDeviceWidget -{ - Q_OBJECT -public: - explicit DesktopDeviceConfigurationWidget(const IDevice::Ptr &device, QWidget *parent = nullptr); - ~DesktopDeviceConfigurationWidget() override; - - void updateDeviceFromUi() override; - -private: - void updateFreePorts(); - - void initGui(); - -private: - Ui::DesktopDeviceConfigurationWidget *m_ui; -}; - -} // namespace ProjectExplorer diff --git a/src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.ui b/src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.ui deleted file mode 100644 index 3fd9fd184eb..00000000000 --- a/src/plugins/projectexplorer/devicesupport/desktopdeviceconfigurationwidget.ui +++ /dev/null @@ -1,69 +0,0 @@ - - - ProjectExplorer::DesktopDeviceConfigurationWidget - - - - 0 - 0 - 437 - 265 - - - - - - - - - - Machine type: - - - - - - - TextLabel - - - - - - - Free ports: - - - - - - - - - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - diff --git a/src/plugins/projectexplorer/projectexplorer.pro b/src/plugins/projectexplorer/projectexplorer.pro index 3e13607721d..5c6bd5b77fa 100644 --- a/src/plugins/projectexplorer/projectexplorer.pro +++ b/src/plugins/projectexplorer/projectexplorer.pro @@ -135,7 +135,6 @@ HEADERS += projectexplorer.h \ devicesupport/sshdeviceprocess.h \ devicesupport/sshdeviceprocesslist.h \ devicesupport/sshsettingspage.h \ - devicesupport/desktopdeviceconfigurationwidget.h \ devicesupport/desktopprocesssignaloperation.h \ deploymentdata.h \ deploymentdatamodel.h \ @@ -283,7 +282,6 @@ SOURCES += projectexplorer.cpp \ devicesupport/sshdeviceprocess.cpp \ devicesupport/sshdeviceprocesslist.cpp \ devicesupport/sshsettingspage.cpp \ - devicesupport/desktopdeviceconfigurationwidget.cpp \ devicesupport/desktopprocesssignaloperation.cpp \ deployablefile.cpp \ deploymentdata.cpp \ @@ -322,7 +320,6 @@ FORMS += \ devicesupport/devicefactoryselectiondialog.ui \ devicesupport/devicesettingswidget.ui \ devicesupport/devicetestdialog.ui \ - devicesupport/desktopdeviceconfigurationwidget.ui \ customparserconfigdialog.ui \ makestep.ui diff --git a/src/plugins/projectexplorer/projectexplorer.qbs b/src/plugins/projectexplorer/projectexplorer.qbs index c4bc7efd39c..8d6578ba313 100644 --- a/src/plugins/projectexplorer/projectexplorer.qbs +++ b/src/plugins/projectexplorer/projectexplorer.qbs @@ -227,8 +227,7 @@ Project { "sshdeviceprocess.cpp", "sshdeviceprocess.h", "sshdeviceprocesslist.cpp", "sshdeviceprocesslist.h", "sshsettingspage.cpp", "sshsettingspage.h", - "desktopprocesssignaloperation.cpp", "desktopprocesssignaloperation.h", - "desktopdeviceconfigurationwidget.cpp", "desktopdeviceconfigurationwidget.h", "desktopdeviceconfigurationwidget.ui" + "desktopprocesssignaloperation.cpp", "desktopprocesssignaloperation.h" ] }