diff --git a/src/plugins/remotelinux/remotelinux.pro b/src/plugins/remotelinux/remotelinux.pro index 1abcf3dfde2..2ff6623ed64 100644 --- a/src/plugins/remotelinux/remotelinux.pro +++ b/src/plugins/remotelinux/remotelinux.pro @@ -15,7 +15,6 @@ HEADERS += \ genericlinuxdeviceconfigurationwizard.h \ genericlinuxdeviceconfigurationfactory.h \ remotelinuxrunconfigurationwidget.h \ - remotelinuxrunconfigurationfactory.h \ remotelinuxdebugsupport.h \ genericlinuxdeviceconfigurationwizardpages.h \ abstractremotelinuxdeploystep.h \ @@ -60,7 +59,6 @@ SOURCES += \ genericlinuxdeviceconfigurationwizard.cpp \ genericlinuxdeviceconfigurationfactory.cpp \ remotelinuxrunconfigurationwidget.cpp \ - remotelinuxrunconfigurationfactory.cpp \ remotelinuxdebugsupport.cpp \ genericlinuxdeviceconfigurationwizardpages.cpp \ abstractremotelinuxdeploystep.cpp \ diff --git a/src/plugins/remotelinux/remotelinux.qbs b/src/plugins/remotelinux/remotelinux.qbs index 7b64a407ff0..f823f083e82 100644 --- a/src/plugins/remotelinux/remotelinux.qbs +++ b/src/plugins/remotelinux/remotelinux.qbs @@ -92,8 +92,6 @@ Project { "remotelinuxqmltoolingsupport.h", "remotelinuxrunconfiguration.cpp", "remotelinuxrunconfiguration.h", - "remotelinuxrunconfigurationfactory.cpp", - "remotelinuxrunconfigurationfactory.h", "remotelinuxrunconfigurationwidget.cpp", "remotelinuxrunconfigurationwidget.h", "remotelinuxsignaloperation.cpp", diff --git a/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.cpp b/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.cpp index 9f5a3c32f20..5701905b6aa 100644 --- a/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.cpp +++ b/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.cpp @@ -25,6 +25,7 @@ #include "remotelinuxcustomrunconfiguration.h" +#include "remotelinux_constants.h" #include "remotelinuxenvironmentaspect.h" #include "ui_remotelinuxcustomrunconfigurationwidget.h" @@ -202,6 +203,17 @@ QVariantMap RemoteLinuxCustomRunConfiguration::toMap() const return map; } +// RemoteLinuxCustomRunConfigurationFactory + +RemoteLinuxCustomRunConfigurationFactory::RemoteLinuxCustomRunConfigurationFactory() + : FixedRunConfigurationFactory(RemoteLinuxCustomRunConfiguration::runConfigDefaultDisplayName(), + true) +{ + registerRunConfiguration + (RemoteLinuxCustomRunConfiguration::runConfigId()); + addSupportedTargetDeviceType(RemoteLinux::Constants::GenericLinuxOsType); +} + } // namespace Internal } // namespace RemoteLinux diff --git a/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.h b/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.h index 22f943efd96..7e30d339824 100644 --- a/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.h +++ b/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.h @@ -61,5 +61,13 @@ private: QString m_workingDirectory; }; +class RemoteLinuxCustomRunConfigurationFactory : public ProjectExplorer::FixedRunConfigurationFactory +{ + Q_OBJECT + +public: + RemoteLinuxCustomRunConfigurationFactory(); +}; + } // namespace Internal } // namespace RemoteLinux diff --git a/src/plugins/remotelinux/remotelinuxplugin.cpp b/src/plugins/remotelinux/remotelinuxplugin.cpp index 4d3f31db813..2f67ae25e98 100644 --- a/src/plugins/remotelinux/remotelinuxplugin.cpp +++ b/src/plugins/remotelinux/remotelinuxplugin.cpp @@ -33,7 +33,6 @@ #include "remotelinuxdebugsupport.h" #include "remotelinuxdeployconfiguration.h" #include "remotelinuxrunconfiguration.h" -#include "remotelinuxrunconfigurationfactory.h" #include "genericdirectuploadstep.h" #include "remotelinuxcheckforfreediskspacestep.h" diff --git a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp index 2e1e18055b4..3e190e0ceab 100644 --- a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp +++ b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp @@ -25,6 +25,7 @@ #include "remotelinuxrunconfiguration.h" +#include "remotelinux_constants.h" #include "remotelinuxenvironmentaspect.h" #include "remotelinuxrunconfigurationwidget.h" @@ -200,4 +201,13 @@ void RemoteLinuxRunConfiguration::handleBuildSystemDataUpdated() const char *RemoteLinuxRunConfiguration::IdPrefix = "RemoteLinuxRunConfiguration:"; + +// RemoteLinuxRunConfigurationFactory + +RemoteLinuxRunConfigurationFactory::RemoteLinuxRunConfigurationFactory() +{ + registerRunConfiguration(RemoteLinuxRunConfiguration::IdPrefix); + addSupportedTargetDeviceType(RemoteLinux::Constants::GenericLinuxOsType); +} + } // namespace RemoteLinux diff --git a/src/plugins/remotelinux/remotelinuxrunconfiguration.h b/src/plugins/remotelinux/remotelinuxrunconfiguration.h index 947e22ba26d..6032e107148 100644 --- a/src/plugins/remotelinux/remotelinuxrunconfiguration.h +++ b/src/plugins/remotelinux/remotelinuxrunconfiguration.h @@ -82,4 +82,12 @@ private: Internal::RemoteLinuxRunConfigurationPrivate * const d; }; +class RemoteLinuxRunConfigurationFactory : public ProjectExplorer::RunConfigurationFactory +{ + Q_OBJECT + +public: + RemoteLinuxRunConfigurationFactory(); +}; + } // namespace RemoteLinux diff --git a/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp b/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp deleted file mode 100644 index c91b36fb8e1..00000000000 --- a/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp +++ /dev/null @@ -1,57 +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 "remotelinuxrunconfigurationfactory.h" - -#include "remotelinux_constants.h" -#include "remotelinuxcustomrunconfiguration.h" -#include "remotelinuxrunconfiguration.h" - -using namespace ProjectExplorer; - -namespace RemoteLinux { -namespace Internal { - -// RemoteLinuxRunConfigurationFactory - -RemoteLinuxRunConfigurationFactory::RemoteLinuxRunConfigurationFactory() -{ - registerRunConfiguration(RemoteLinuxRunConfiguration::IdPrefix); - addSupportedTargetDeviceType(RemoteLinux::Constants::GenericLinuxOsType); -} - -// RemoteLinuxCustomRunConfigurationFactory - -RemoteLinuxCustomRunConfigurationFactory::RemoteLinuxCustomRunConfigurationFactory() - : FixedRunConfigurationFactory(RemoteLinuxCustomRunConfiguration::runConfigDefaultDisplayName(), - true) -{ - registerRunConfiguration - (RemoteLinuxCustomRunConfiguration::runConfigId()); - addSupportedTargetDeviceType(RemoteLinux::Constants::GenericLinuxOsType); -} - -} // namespace Internal -} // namespace RemoteLinux diff --git a/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.h b/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.h deleted file mode 100644 index 82d9991d874..00000000000 --- a/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.h +++ /dev/null @@ -1,50 +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 - -namespace RemoteLinux { -namespace Internal { - -class RemoteLinuxRunConfigurationFactory : public ProjectExplorer::RunConfigurationFactory -{ - Q_OBJECT - -public: - RemoteLinuxRunConfigurationFactory(); -}; - -class RemoteLinuxCustomRunConfigurationFactory : public ProjectExplorer::FixedRunConfigurationFactory -{ - Q_OBJECT - -public: - RemoteLinuxCustomRunConfigurationFactory(); -}; - -} // namespace Internal -} // namespace RemoteLinux