diff options
Diffstat (limited to 'src')
37 files changed, 87 insertions, 115 deletions
diff --git a/src/plugins/baremetal/baremetalrunconfiguration.h b/src/plugins/baremetal/baremetalrunconfiguration.h index 62ffaf5d34..94b0ec6c83 100644 --- a/src/plugins/baremetal/baremetalrunconfiguration.h +++ b/src/plugins/baremetal/baremetalrunconfiguration.h @@ -37,7 +37,7 @@ class BareMetalRunConfiguration : public ProjectExplorer::RunConfiguration Q_OBJECT Q_DISABLE_COPY(BareMetalRunConfiguration) - friend class ProjectExplorer::IRunConfigurationFactory; + friend class ProjectExplorer::RunConfigurationFactory; friend class BareMetalRunConfigurationWidget; public: diff --git a/src/plugins/baremetal/baremetalrunconfigurationfactory.cpp b/src/plugins/baremetal/baremetalrunconfigurationfactory.cpp index 729ee5aeb6..6de804890d 100644 --- a/src/plugins/baremetal/baremetalrunconfigurationfactory.cpp +++ b/src/plugins/baremetal/baremetalrunconfigurationfactory.cpp @@ -40,10 +40,8 @@ namespace Internal { // BareMetalRunConfigurationFactory -BareMetalRunConfigurationFactory::BareMetalRunConfigurationFactory(QObject *parent) : - IRunConfigurationFactory(parent) +BareMetalRunConfigurationFactory::BareMetalRunConfigurationFactory() { - setObjectName("BareMetalRunConfigurationFactory"); registerRunConfiguration<BareMetalRunConfiguration>(BareMetalRunConfiguration::IdPrefix); addSupportedTargetDeviceType(BareMetal::Constants::BareMetalOsType); } @@ -58,11 +56,9 @@ QList<RunConfigurationCreationInfo> BareMetalRunConfigurationFactory::availableC // BareMetalCustomRunConfigurationFactory -BareMetalCustomRunConfigurationFactory::BareMetalCustomRunConfigurationFactory(QObject *parent) : - FixedRunConfigurationFactory(BareMetalCustomRunConfiguration::tr("Custom Executable)"), - true, parent) +BareMetalCustomRunConfigurationFactory::BareMetalCustomRunConfigurationFactory() : + FixedRunConfigurationFactory(BareMetalCustomRunConfiguration::tr("Custom Executable)"), true) { - setObjectName("BareMetalCustomRunConfigurationFactory"); registerRunConfiguration<BareMetalCustomRunConfiguration>("BareMetal.CustomRunConfig"); addSupportedTargetDeviceType(BareMetal::Constants::BareMetalOsType); } diff --git a/src/plugins/baremetal/baremetalrunconfigurationfactory.h b/src/plugins/baremetal/baremetalrunconfigurationfactory.h index d3de78e70f..cb6fc097ff 100644 --- a/src/plugins/baremetal/baremetalrunconfigurationfactory.h +++ b/src/plugins/baremetal/baremetalrunconfigurationfactory.h @@ -30,12 +30,12 @@ namespace BareMetal { namespace Internal { -class BareMetalRunConfigurationFactory : public ProjectExplorer::IRunConfigurationFactory +class BareMetalRunConfigurationFactory : public ProjectExplorer::RunConfigurationFactory { Q_OBJECT public: - explicit BareMetalRunConfigurationFactory(QObject *parent = nullptr); + BareMetalRunConfigurationFactory(); QList<ProjectExplorer::RunConfigurationCreationInfo> availableCreators(ProjectExplorer::Target *parent) const override; @@ -46,7 +46,7 @@ class BareMetalCustomRunConfigurationFactory : public ProjectExplorer::FixedRunC Q_OBJECT public: - explicit BareMetalCustomRunConfigurationFactory(QObject *parent = nullptr); + BareMetalCustomRunConfigurationFactory(); }; } // namespace Internal diff --git a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp index c5a26508ca..ae5c81234a 100644 --- a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp +++ b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp @@ -230,10 +230,8 @@ CMakeRunConfigurationWidget::CMakeRunConfigurationWidget(CMakeRunConfiguration * } // Factory -CMakeRunConfigurationFactory::CMakeRunConfigurationFactory(QObject *parent) : - IRunConfigurationFactory(parent) +CMakeRunConfigurationFactory::CMakeRunConfigurationFactory() { - setObjectName("CMakeRunConfigurationFactory"); registerRunConfiguration<CMakeRunConfiguration>(CMAKE_RC_PREFIX); addSupportedProjectType(CMakeProjectManager::Constants::CMAKEPROJECT_ID); } diff --git a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.h b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.h index f13ef97322..e44d1ea53e 100644 --- a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.h +++ b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.h @@ -76,12 +76,12 @@ public: explicit CMakeRunConfigurationWidget(CMakeRunConfiguration *cmakeRunConfiguration, QWidget *parent = 0); }; -class CMakeRunConfigurationFactory : public ProjectExplorer::IRunConfigurationFactory +class CMakeRunConfigurationFactory : public ProjectExplorer::RunConfigurationFactory { Q_OBJECT public: - explicit CMakeRunConfigurationFactory(QObject *parent = 0); + CMakeRunConfigurationFactory(); QList<ProjectExplorer::RunConfigurationCreationInfo> availableCreators(ProjectExplorer::Target *parent) const override; diff --git a/src/plugins/ios/iosrunfactories.cpp b/src/plugins/ios/iosrunfactories.cpp index 9a310d8b4d..1b73477dda 100644 --- a/src/plugins/ios/iosrunfactories.cpp +++ b/src/plugins/ios/iosrunfactories.cpp @@ -42,10 +42,8 @@ using namespace QmakeProjectManager; namespace Ios { namespace Internal { -IosRunConfigurationFactory::IosRunConfigurationFactory(QObject *parent) - : QmakeRunConfigurationFactory(parent) +IosRunConfigurationFactory::IosRunConfigurationFactory() { - setObjectName("IosRunConfigurationFactory"); registerRunConfiguration<IosRunConfiguration>(Constants::IOS_RC_ID_PREFIX); addSupportedTargetDeviceType(Constants::IOS_DEVICE_TYPE); addSupportedTargetDeviceType(Constants::IOS_SIMULATOR_TYPE); diff --git a/src/plugins/ios/iosrunfactories.h b/src/plugins/ios/iosrunfactories.h index a6736286de..08159b2456 100644 --- a/src/plugins/ios/iosrunfactories.h +++ b/src/plugins/ios/iosrunfactories.h @@ -41,7 +41,7 @@ class IosRunConfigurationFactory : public QmakeProjectManager::QmakeRunConfigura Q_OBJECT public: - explicit IosRunConfigurationFactory(QObject *parent = 0); + IosRunConfigurationFactory(); QList<ProjectExplorer::RunConfigurationCreationInfo> availableCreators(ProjectExplorer::Target *parent) const override; diff --git a/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp b/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp index 9436abfca9..b6a873ca8f 100644 --- a/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp +++ b/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp @@ -302,10 +302,9 @@ Abi CustomExecutableRunConfiguration::abi() const // Factory -CustomExecutableRunConfigurationFactory::CustomExecutableRunConfigurationFactory(QObject *parent) : - FixedRunConfigurationFactory(tr("Custom Executable"), parent) +CustomExecutableRunConfigurationFactory::CustomExecutableRunConfigurationFactory() : + FixedRunConfigurationFactory(tr("Custom Executable")) { - setObjectName("CustomExecutableRunConfigurationFactory"); registerRunConfiguration<CustomExecutableRunConfiguration>(CUSTOM_EXECUTABLE_ID); } diff --git a/src/plugins/projectexplorer/customexecutablerunconfiguration.h b/src/plugins/projectexplorer/customexecutablerunconfiguration.h index 9349f630c0..dfdb0c680f 100644 --- a/src/plugins/projectexplorer/customexecutablerunconfiguration.h +++ b/src/plugins/projectexplorer/customexecutablerunconfiguration.h @@ -40,7 +40,7 @@ class PROJECTEXPLORER_EXPORT CustomExecutableRunConfiguration : public RunConfig Q_OBJECT // the configuration widget needs to setExecutable setWorkingDirectory and setCommandLineArguments friend class Internal::CustomExecutableConfigurationWidget; - friend class ProjectExplorer::IRunConfigurationFactory; + friend class ProjectExplorer::RunConfigurationFactory; public: explicit CustomExecutableRunConfiguration(Target *target); @@ -89,7 +89,7 @@ class CustomExecutableRunConfigurationFactory : public FixedRunConfigurationFact Q_OBJECT public: - explicit CustomExecutableRunConfigurationFactory(QObject *parent = nullptr); + CustomExecutableRunConfigurationFactory(); }; } // namespace ProjectExplorer diff --git a/src/plugins/projectexplorer/project.cpp b/src/plugins/projectexplorer/project.cpp index 12b58236f9..3ffd238dac 100644 --- a/src/plugins/projectexplorer/project.cpp +++ b/src/plugins/projectexplorer/project.cpp @@ -404,7 +404,7 @@ bool Project::copySteps(Target *sourceTarget, Target *newTarget) } foreach (RunConfiguration *sourceRc, sourceTarget->runConfigurations()) { - RunConfiguration *newRc = IRunConfigurationFactory::clone(newTarget, sourceRc); + RunConfiguration *newRc = RunConfigurationFactory::clone(newTarget, sourceRc); if (!newRc) { runconfigurationError << sourceRc->displayName(); continue; diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp index a6a5607b3f..48c4cf123d 100644 --- a/src/plugins/projectexplorer/runconfiguration.cpp +++ b/src/plugins/projectexplorer/runconfiguration.cpp @@ -430,25 +430,24 @@ Utils::OutputFormatter *RunConfiguration::createOutputFormatter() const Translates the types to names to display to the user. */ -static QList<IRunConfigurationFactory *> g_runConfigurationFactories; +static QList<RunConfigurationFactory *> g_runConfigurationFactories; -IRunConfigurationFactory::IRunConfigurationFactory(QObject *parent) : - QObject(parent) +RunConfigurationFactory::RunConfigurationFactory() { g_runConfigurationFactories.append(this); } -IRunConfigurationFactory::~IRunConfigurationFactory() +RunConfigurationFactory::~RunConfigurationFactory() { g_runConfigurationFactories.removeOne(this); } -const QList<IRunConfigurationFactory *> IRunConfigurationFactory::allRunConfigurationFactories() +const QList<RunConfigurationFactory *> RunConfigurationFactory::allRunConfigurationFactories() { return g_runConfigurationFactories; } -QString IRunConfigurationFactory::decoratedTargetName(const QString targetName, Target *target) +QString RunConfigurationFactory::decoratedTargetName(const QString targetName, Target *target) { QString displayName; if (!targetName.isEmpty()) @@ -469,7 +468,7 @@ QString IRunConfigurationFactory::decoratedTargetName(const QString targetName, } QList<RunConfigurationCreationInfo> -IRunConfigurationFactory::availableCreators(Target *parent) const +RunConfigurationFactory::availableCreators(Target *parent) const { return Utils::transform(parent->applicationTargets().list, [parent, this](const BuildTargetInfo &ti) { const QString displayName = decoratedTargetName(ti.targetName, parent); @@ -483,34 +482,34 @@ IRunConfigurationFactory::availableCreators(Target *parent) const Not calling this function or using an empty list means no restriction. */ -void IRunConfigurationFactory::setSupportedTargetDeviceTypes(const QList<Core::Id> &ids) +void RunConfigurationFactory::setSupportedTargetDeviceTypes(const QList<Core::Id> &ids) { m_supportedTargetDeviceTypes = ids; } -void IRunConfigurationFactory::addSupportedTargetDeviceType(Core::Id id) +void RunConfigurationFactory::addSupportedTargetDeviceType(Core::Id id) { m_supportedTargetDeviceTypes.append(id); } -void IRunConfigurationFactory::addSupportedProjectType(Core::Id id) +void RunConfigurationFactory::addSupportedProjectType(Core::Id id) { m_supportedProjectTypes.append(id); } RunConfigurationCreationInfo -IRunConfigurationFactory::convert(const BuildTargetInfo &ti) const +RunConfigurationFactory::convert(const BuildTargetInfo &ti) const { return convert(QFileInfo(ti.targetName).completeBaseName(), ti.targetName); } RunConfigurationCreationInfo -IRunConfigurationFactory::convert(const QString &displayName, const QString &targetName) const +RunConfigurationFactory::convert(const QString &displayName, const QString &targetName) const { return RunConfigurationCreationInfo(this, runConfigurationBaseId(), targetName, displayName); } -bool IRunConfigurationFactory::canHandle(Target *target) const +bool RunConfigurationFactory::canHandle(Target *target) const { const Project *project = target->project(); Kit *kit = target->kit(); @@ -530,12 +529,12 @@ bool IRunConfigurationFactory::canHandle(Target *target) const return true; } -bool IRunConfigurationFactory::canCreateHelper(Target *, const QString &) const +bool RunConfigurationFactory::canCreateHelper(Target *, const QString &) const { return true; } -RunConfiguration *IRunConfigurationFactory::create(Target *parent, +RunConfiguration *RunConfigurationFactory::create(Target *parent, const RunConfigurationCreationInfo &info) const { if (!canHandle(parent)) @@ -563,9 +562,9 @@ RunConfiguration *IRunConfigurationFactory::create(Target *parent, return rc; } -RunConfiguration *IRunConfigurationFactory::restore(Target *parent, const QVariantMap &map) +RunConfiguration *RunConfigurationFactory::restore(Target *parent, const QVariantMap &map) { - for (IRunConfigurationFactory *factory : g_runConfigurationFactories) { + for (RunConfigurationFactory *factory : g_runConfigurationFactories) { if (factory->canHandle(parent)) { const Core::Id id = idFromMap(map); if (id.name().startsWith(factory->m_runConfigBaseId.name())) { @@ -581,20 +580,18 @@ RunConfiguration *IRunConfigurationFactory::restore(Target *parent, const QVaria return nullptr; } -RunConfiguration *IRunConfigurationFactory::clone(Target *parent, RunConfiguration *source) +RunConfiguration *RunConfigurationFactory::clone(Target *parent, RunConfiguration *source) { return restore(parent, source->toMap()); } -const QList<IRunConfigurationFactory *> IRunConfigurationFactory::allFactories() +const QList<RunConfigurationFactory *> RunConfigurationFactory::allFactories() { return g_runConfigurationFactories; } FixedRunConfigurationFactory::FixedRunConfigurationFactory(const QString &displayName, - bool addDeviceName, - QObject *parent) : - IRunConfigurationFactory(parent), + bool addDeviceName) : m_fixedBuildTarget(displayName), m_decorateTargetName(addDeviceName) { } diff --git a/src/plugins/projectexplorer/runconfiguration.h b/src/plugins/projectexplorer/runconfiguration.h index 6bd2be45dc..96db3d5d64 100644 --- a/src/plugins/projectexplorer/runconfiguration.h +++ b/src/plugins/projectexplorer/runconfiguration.h @@ -48,7 +48,7 @@ namespace ProjectExplorer { class Abi; class BuildConfiguration; class IRunConfigurationAspect; -class IRunConfigurationFactory; +class RunConfigurationFactory; class RunConfiguration; class RunConfigurationCreationInfo; class RunConfigWidget; @@ -274,7 +274,7 @@ protected: private: static void addAspectFactory(const AspectFactory &aspectFactory); - friend class IRunConfigurationFactory; + friend class RunConfigurationFactory; QList<IRunConfigurationAspect *> m_aspects; }; @@ -283,7 +283,7 @@ class RunConfigurationCreationInfo { public: enum CreationMode {AlwaysCreate, ManualCreationOnly}; - RunConfigurationCreationInfo(const IRunConfigurationFactory *factory, + RunConfigurationCreationInfo(const RunConfigurationFactory *factory, Core::Id id, QString extra, QString displayName, CreationMode creationMode = AlwaysCreate) @@ -293,22 +293,22 @@ public: creationMode(creationMode) {} - const IRunConfigurationFactory *factory = nullptr; + const RunConfigurationFactory *factory = nullptr; Core::Id id; QString extra; QString displayName; CreationMode creationMode = AlwaysCreate; }; -class PROJECTEXPLORER_EXPORT IRunConfigurationFactory : public QObject +class PROJECTEXPLORER_EXPORT RunConfigurationFactory : public QObject { Q_OBJECT public: - explicit IRunConfigurationFactory(QObject *parent = nullptr); - ~IRunConfigurationFactory(); + RunConfigurationFactory(); + ~RunConfigurationFactory(); - static const QList<IRunConfigurationFactory *> allRunConfigurationFactories(); + static const QList<RunConfigurationFactory *> allRunConfigurationFactories(); virtual QList<RunConfigurationCreationInfo> availableCreators(Target *parent) const; @@ -318,7 +318,7 @@ public: static RunConfiguration *restore(Target *parent, const QVariantMap &map); static RunConfiguration *clone(Target *parent, RunConfiguration *source); - static const QList<IRunConfigurationFactory *> allFactories(); + static const QList<RunConfigurationFactory *> allFactories(); Core::Id runConfigurationBaseId() const { return m_runConfigBaseId; } @@ -351,14 +351,13 @@ private: QList<Core::Id> m_supportedTargetDeviceTypes; }; -class PROJECTEXPLORER_EXPORT FixedRunConfigurationFactory : public IRunConfigurationFactory +class PROJECTEXPLORER_EXPORT FixedRunConfigurationFactory : public RunConfigurationFactory { Q_OBJECT public: explicit FixedRunConfigurationFactory(const QString &displayName, - bool addDeviceName = false, - QObject *parent = nullptr); + bool addDeviceName = false); QList<RunConfigurationCreationInfo> availableCreators(Target *parent) const override; diff --git a/src/plugins/projectexplorer/runsettingspropertiespage.cpp b/src/plugins/projectexplorer/runsettingspropertiespage.cpp index 1ea1daeeeb..98d54cbb1b 100644 --- a/src/plugins/projectexplorer/runsettingspropertiespage.cpp +++ b/src/plugins/projectexplorer/runsettingspropertiespage.cpp @@ -57,7 +57,7 @@ namespace Internal { struct FactoryAndId { - IRunConfigurationFactory *factory; + RunConfigurationFactory *factory; Core::Id id; }; @@ -238,7 +238,7 @@ void RunSettingsWidget::aboutToShowAddMenu() this, &RunSettingsWidget::cloneRunConfiguration); } QList<QAction *> menuActions; - for (IRunConfigurationFactory *factory : IRunConfigurationFactory::allRunConfigurationFactories()) { + for (RunConfigurationFactory *factory : RunConfigurationFactory::allRunConfigurationFactories()) { if (!factory->canHandle(m_target)) continue; const QList<RunConfigurationCreationInfo> items = factory->availableCreators(m_target); @@ -276,7 +276,7 @@ void RunSettingsWidget::cloneRunConfiguration() if (name.isEmpty()) return; - RunConfiguration *newRc = IRunConfigurationFactory::clone(m_target, activeRunConfiguration); + RunConfiguration *newRc = RunConfigurationFactory::clone(m_target, activeRunConfiguration); if (!newRc) return; diff --git a/src/plugins/projectexplorer/target.cpp b/src/plugins/projectexplorer/target.cpp index 5b533b91ee..fabf653de0 100644 --- a/src/plugins/projectexplorer/target.cpp +++ b/src/plugins/projectexplorer/target.cpp @@ -540,7 +540,7 @@ void Target::updateDefaultRunConfigurations() QList<RunConfigurationCreationInfo> allAvailableFactories; QList<RunConfigurationCreationInfo> autoCreateFactories; - for (IRunConfigurationFactory *rcFactory : IRunConfigurationFactory::allFactories()) { + for (RunConfigurationFactory *rcFactory : RunConfigurationFactory::allFactories()) { if (rcFactory->canHandle(this)) { const QList<RunConfigurationCreationInfo> creators = rcFactory->availableCreators(this); for (const RunConfigurationCreationInfo &creator : creators) { @@ -815,7 +815,7 @@ bool Target::fromMap(const QVariantMap &map) // Ignore missing RCs: We will just populate them using the default ones. QVariantMap valueMap = map.value(key).toMap(); - RunConfiguration *rc = IRunConfigurationFactory::restore(this, valueMap); + RunConfiguration *rc = RunConfigurationFactory::restore(this, valueMap); if (!rc) continue; QTC_CHECK(rc->id().withSuffix(rc->extraId()) == ProjectExplorer::idFromMap(valueMap)); diff --git a/src/plugins/projectexplorer/target.h b/src/plugins/projectexplorer/target.h index f3ed83ebf3..8f4e544db2 100644 --- a/src/plugins/projectexplorer/target.h +++ b/src/plugins/projectexplorer/target.h @@ -41,7 +41,7 @@ class DeployConfiguration; class DeployConfigurationFactory; class DeploymentData; class IBuildConfigurationFactory; -class IRunConfigurationFactory; +class RunConfigurationFactory; class Kit; class NamedWidget; class Project; diff --git a/src/plugins/pythoneditor/pythoneditorplugin.cpp b/src/plugins/pythoneditor/pythoneditorplugin.cpp index 939946c859..464b089f31 100644 --- a/src/plugins/pythoneditor/pythoneditorplugin.cpp +++ b/src/plugins/pythoneditor/pythoneditorplugin.cpp @@ -162,7 +162,7 @@ public: void setInterpreter(const QString &interpreter) { m_interpreter = interpreter; } private: - friend class ProjectExplorer::IRunConfigurationFactory; + friend class ProjectExplorer::RunConfigurationFactory; QString defaultDisplayName() const; @@ -270,12 +270,11 @@ PythonRunConfigurationWidget::PythonRunConfigurationWidget(PythonRunConfiguratio }); } -class PythonRunConfigurationFactory : public IRunConfigurationFactory +class PythonRunConfigurationFactory : public RunConfigurationFactory { public: PythonRunConfigurationFactory() { - setObjectName("PythonRunConfigurationFactory"); registerRunConfiguration<PythonRunConfiguration>(PythonRunConfigurationPrefix); addSupportedProjectType(PythonProjectId); } diff --git a/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp b/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp index 8978e2e0b6..9c064fdd40 100644 --- a/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp +++ b/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp @@ -368,10 +368,8 @@ void QbsRunConfigurationWidget::setExecutableLineText(const QString &text) // QbsRunConfigurationFactory: // -------------------------------------------------------------------- -QbsRunConfigurationFactory::QbsRunConfigurationFactory(QObject *parent) : - IRunConfigurationFactory(parent) +QbsRunConfigurationFactory::QbsRunConfigurationFactory() { - setObjectName("QbsRunConfigurationFactory"); registerRunConfiguration<QbsRunConfiguration>(QBS_RC_PREFIX); addSupportedProjectType(Constants::PROJECT_ID); addSupportedTargetDeviceType(ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE); diff --git a/src/plugins/qbsprojectmanager/qbsrunconfiguration.h b/src/plugins/qbsprojectmanager/qbsrunconfiguration.h index 3a39d67c7b..161bdde0b3 100644 --- a/src/plugins/qbsprojectmanager/qbsrunconfiguration.h +++ b/src/plugins/qbsprojectmanager/qbsrunconfiguration.h @@ -47,7 +47,7 @@ class QbsRunConfiguration : public ProjectExplorer::RunConfiguration // to change the display name and arguments and set the userenvironmentchanges friend class QbsRunConfigurationWidget; - friend class ProjectExplorer::IRunConfigurationFactory; + friend class ProjectExplorer::RunConfigurationFactory; public: explicit QbsRunConfiguration(ProjectExplorer::Target *target); @@ -109,12 +109,12 @@ private: bool m_isShown = false; }; -class QbsRunConfigurationFactory : public ProjectExplorer::IRunConfigurationFactory +class QbsRunConfigurationFactory : public ProjectExplorer::RunConfigurationFactory { Q_OBJECT public: - explicit QbsRunConfigurationFactory(QObject *parent = 0); + QbsRunConfigurationFactory(); bool canCreateHelper(ProjectExplorer::Target *parent, const QString &suffix) const override; diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidrunfactories.cpp b/src/plugins/qmakeandroidsupport/qmakeandroidrunfactories.cpp index e76a9fed8c..c319e2501c 100644 --- a/src/plugins/qmakeandroidsupport/qmakeandroidrunfactories.cpp +++ b/src/plugins/qmakeandroidsupport/qmakeandroidrunfactories.cpp @@ -48,8 +48,7 @@ namespace Internal { static const char ANDROID_RC_ID_PREFIX[] = "Qt4ProjectManager.AndroidRunConfiguration:"; -QmakeAndroidRunConfigurationFactory::QmakeAndroidRunConfigurationFactory(QObject *parent) - : IRunConfigurationFactory(parent) +QmakeAndroidRunConfigurationFactory::QmakeAndroidRunConfigurationFactory() { registerRunConfiguration<QmakeAndroidRunConfiguration>(ANDROID_RC_ID_PREFIX); addSupportedProjectType(QmakeProjectManager::Constants::QMAKEPROJECT_ID); diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidrunfactories.h b/src/plugins/qmakeandroidsupport/qmakeandroidrunfactories.h index 73dc1a735a..51c7708e37 100644 --- a/src/plugins/qmakeandroidsupport/qmakeandroidrunfactories.h +++ b/src/plugins/qmakeandroidsupport/qmakeandroidrunfactories.h @@ -27,17 +27,15 @@ #include <projectexplorer/runconfiguration.h> -namespace ProjectExplorer { class Target; } - namespace QmakeAndroidSupport { namespace Internal { -class QmakeAndroidRunConfigurationFactory : public ProjectExplorer::IRunConfigurationFactory +class QmakeAndroidRunConfigurationFactory : public ProjectExplorer::RunConfigurationFactory { Q_OBJECT public: - explicit QmakeAndroidRunConfigurationFactory(QObject *parent = nullptr); + QmakeAndroidRunConfigurationFactory(); QList<ProjectExplorer::RunConfigurationCreationInfo> availableCreators(ProjectExplorer::Target *parent) const; diff --git a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp index 2c0bacfe72..c26d785e18 100644 --- a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp +++ b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp @@ -428,10 +428,8 @@ QPair<QString, QString> DesktopQmakeRunConfiguration::extractWorkingDirAndExecut /// This class is used to restore run settings (saved in .user files) /// -DesktopQmakeRunConfigurationFactory::DesktopQmakeRunConfigurationFactory(QObject *parent) : - QmakeRunConfigurationFactory(parent) +DesktopQmakeRunConfigurationFactory::DesktopQmakeRunConfigurationFactory() { - setObjectName("DesktopQmakeRunConfigurationFactory"); registerRunConfiguration<DesktopQmakeRunConfiguration>(QMAKE_RC_PREFIX); addSupportedProjectType(QmakeProjectManager::Constants::QMAKEPROJECT_ID); addSupportedTargetDeviceType(ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE); diff --git a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.h b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.h index 7451d02161..c938031dea 100644 --- a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.h +++ b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.h @@ -136,7 +136,7 @@ class DesktopQmakeRunConfigurationFactory : public QmakeRunConfigurationFactory Q_OBJECT public: - explicit DesktopQmakeRunConfigurationFactory(QObject *parent = 0); + DesktopQmakeRunConfigurationFactory(); bool canCreateHelper(ProjectExplorer::Target *parent, const QString &suffix) const override; diff --git a/src/plugins/qmakeprojectmanager/qmakenodes.cpp b/src/plugins/qmakeprojectmanager/qmakenodes.cpp index e349081924..787dc4304d 100644 --- a/src/plugins/qmakeprojectmanager/qmakenodes.cpp +++ b/src/plugins/qmakeprojectmanager/qmakenodes.cpp @@ -45,7 +45,7 @@ static QList<RunConfiguration *> qmakeRunConfigurationsForNode(Target *t, const return result; // Project was not set up yet. const FileName file = node->filePath(); - for (auto factory : IRunConfigurationFactory::allRunConfigurationFactories()) { + for (auto factory : RunConfigurationFactory::allRunConfigurationFactories()) { if (auto qmakeFactory = qobject_cast<QmakeRunConfigurationFactory *>(factory)) { if (qmakeFactory->canHandle(t)) { result.append(Utils::filtered(t->runConfigurations(), [qmakeFactory, file](RunConfiguration *rc) { diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp index 0c1e7982c5..6fa535633b 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp @@ -785,7 +785,7 @@ bool QmakeProject::hasApplicationProFile(const FileName &path) const } QList<RunConfigurationCreationInfo> -QmakeProject::runConfigurationCreators(const IRunConfigurationFactory *factory, +QmakeProject::runConfigurationCreators(const RunConfigurationFactory *factory, const QList<ProjectType> &projectTypes) { QList<ProjectType> realTypes = projectTypes; diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.h b/src/plugins/qmakeprojectmanager/qmakeproject.h index c5a9fb32dc..bef8859e02 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.h +++ b/src/plugins/qmakeprojectmanager/qmakeproject.h @@ -74,7 +74,7 @@ public: bool hasApplicationProFile(const Utils::FileName &path) const; QList<ProjectExplorer::RunConfigurationCreationInfo> runConfigurationCreators - (const ProjectExplorer::IRunConfigurationFactory *factory, + (const ProjectExplorer::RunConfigurationFactory *factory, const QList<ProjectType> &projectTypes = {}); static void notifyChanged(const Utils::FileName &name); diff --git a/src/plugins/qmakeprojectmanager/qmakerunconfigurationfactory.cpp b/src/plugins/qmakeprojectmanager/qmakerunconfigurationfactory.cpp index 212fbaa788..2c100d122e 100644 --- a/src/plugins/qmakeprojectmanager/qmakerunconfigurationfactory.cpp +++ b/src/plugins/qmakeprojectmanager/qmakerunconfigurationfactory.cpp @@ -25,12 +25,9 @@ #include "qmakerunconfigurationfactory.h" -using namespace ProjectExplorer; - namespace QmakeProjectManager { -QmakeRunConfigurationFactory::QmakeRunConfigurationFactory(QObject *parent) : - ProjectExplorer::IRunConfigurationFactory(parent) +QmakeRunConfigurationFactory::QmakeRunConfigurationFactory() { } } // namespace QmakeProjectManager diff --git a/src/plugins/qmakeprojectmanager/qmakerunconfigurationfactory.h b/src/plugins/qmakeprojectmanager/qmakerunconfigurationfactory.h index 8756269295..6a9ebe842f 100644 --- a/src/plugins/qmakeprojectmanager/qmakerunconfigurationfactory.h +++ b/src/plugins/qmakeprojectmanager/qmakerunconfigurationfactory.h @@ -33,12 +33,12 @@ namespace Utils { class FileName; } namespace QmakeProjectManager { -class QMAKEPROJECTMANAGER_EXPORT QmakeRunConfigurationFactory : public ProjectExplorer::IRunConfigurationFactory +class QMAKEPROJECTMANAGER_EXPORT QmakeRunConfigurationFactory : public ProjectExplorer::RunConfigurationFactory { Q_OBJECT public: - explicit QmakeRunConfigurationFactory(QObject *parent = nullptr); + QmakeRunConfigurationFactory(); virtual bool hasRunConfigForProFile(ProjectExplorer::RunConfiguration *rc, const Utils::FileName &n) const = 0; }; diff --git a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp index 2877a027f7..87bce94ee9 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp @@ -47,7 +47,8 @@ bool QmlProjectPlugin::initialize(const QStringList &, QString *errorMessage) { Q_UNUSED(errorMessage) - new Internal::QmlProjectRunConfigurationFactory(this); + auto rcFactory = new QmlProjectRunConfigurationFactory; + rcFactory->setParent(this); ProjectManager::registerProjectType<QmlProject>(QmlJSTools::Constants::QMLPROJECT_MIMETYPE); Core::FileIconProvider::registerIconOverlayForSuffix(":/qmlproject/images/qmlproject.png", "qmlproject"); diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h index 7e8181c0ab..db52eb36f5 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h +++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h @@ -41,7 +41,7 @@ namespace Internal { class QmlProjectRunConfigurationWidget; } class QMLPROJECTMANAGER_EXPORT QmlProjectRunConfiguration : public ProjectExplorer::RunConfiguration { Q_OBJECT - friend class ProjectExplorer::IRunConfigurationFactory; + friend class ProjectExplorer::RunConfigurationFactory; friend class Internal::QmlProjectRunConfigurationWidget; friend class QmlProject; // to call updateEnabled() diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationfactory.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationfactory.cpp index 05d8e89606..274d6d1b49 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationfactory.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationfactory.cpp @@ -31,10 +31,9 @@ namespace QmlProjectManager { namespace Internal { -QmlProjectRunConfigurationFactory::QmlProjectRunConfigurationFactory(QObject *parent) : - ProjectExplorer::FixedRunConfigurationFactory(tr("QML Scene"), false, parent) +QmlProjectRunConfigurationFactory::QmlProjectRunConfigurationFactory() : + ProjectExplorer::FixedRunConfigurationFactory(tr("QML Scene"), false) { - setObjectName("QmlProjectRunConfigurationFactory"); registerRunConfiguration<QmlProjectRunConfiguration>(Constants::QML_SCENE_RC_ID); addSupportedProjectType(QmlProjectManager::Constants::QML_PROJECT_ID); } diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationfactory.h b/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationfactory.h index d7c78fa205..f5633ce8d9 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationfactory.h +++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationfactory.h @@ -35,7 +35,7 @@ class QmlProjectRunConfigurationFactory : public ProjectExplorer::FixedRunConfig Q_OBJECT public: - explicit QmlProjectRunConfigurationFactory(QObject *parent = nullptr); + QmlProjectRunConfigurationFactory(); }; } // namespace Internal diff --git a/src/plugins/qnx/qnxrunconfigurationfactory.cpp b/src/plugins/qnx/qnxrunconfigurationfactory.cpp index 3b4f7ff57a..1418c736d1 100644 --- a/src/plugins/qnx/qnxrunconfigurationfactory.cpp +++ b/src/plugins/qnx/qnxrunconfigurationfactory.cpp @@ -32,8 +32,7 @@ namespace Qnx { namespace Internal { -QnxRunConfigurationFactory::QnxRunConfigurationFactory(QObject *parent) : - ProjectExplorer::IRunConfigurationFactory(parent) +QnxRunConfigurationFactory::QnxRunConfigurationFactory() { registerRunConfiguration<QnxRunConfiguration>(Constants::QNX_QNX_RUNCONFIGURATION_PREFIX); addSupportedTargetDeviceType(Constants::QNX_QNX_OS_TYPE); diff --git a/src/plugins/qnx/qnxrunconfigurationfactory.h b/src/plugins/qnx/qnxrunconfigurationfactory.h index 8ddcd6516e..85e89cbe0c 100644 --- a/src/plugins/qnx/qnxrunconfigurationfactory.h +++ b/src/plugins/qnx/qnxrunconfigurationfactory.h @@ -30,11 +30,11 @@ namespace Qnx { namespace Internal { -class QnxRunConfigurationFactory : public ProjectExplorer::IRunConfigurationFactory +class QnxRunConfigurationFactory : public ProjectExplorer::RunConfigurationFactory { Q_OBJECT public: - explicit QnxRunConfigurationFactory(QObject *parent = nullptr); + QnxRunConfigurationFactory(); }; } // namespace Internal diff --git a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp index 7b5c9ad7e1..de41bc32c0 100644 --- a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp +++ b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp @@ -157,7 +157,7 @@ bool RemoteLinuxRunConfiguration::fromMap(const QVariantMap &map) QString RemoteLinuxRunConfiguration::defaultDisplayName() const { - return IRunConfigurationFactory::decoratedTargetName(d->targetName, target()); + return RunConfigurationFactory::decoratedTargetName(d->targetName, target()); } QString RemoteLinuxRunConfiguration::arguments() const diff --git a/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp b/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp index 293cb6b015..c91b36fb8e 100644 --- a/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp +++ b/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp @@ -36,21 +36,18 @@ namespace Internal { // RemoteLinuxRunConfigurationFactory -RemoteLinuxRunConfigurationFactory::RemoteLinuxRunConfigurationFactory(QObject *parent) - : IRunConfigurationFactory(parent) +RemoteLinuxRunConfigurationFactory::RemoteLinuxRunConfigurationFactory() { - setObjectName("RemoteLinuxRunConfigurationFactory"); registerRunConfiguration<RemoteLinuxRunConfiguration>(RemoteLinuxRunConfiguration::IdPrefix); addSupportedTargetDeviceType(RemoteLinux::Constants::GenericLinuxOsType); } // RemoteLinuxCustomRunConfigurationFactory -RemoteLinuxCustomRunConfigurationFactory::RemoteLinuxCustomRunConfigurationFactory(QObject *parent) +RemoteLinuxCustomRunConfigurationFactory::RemoteLinuxCustomRunConfigurationFactory() : FixedRunConfigurationFactory(RemoteLinuxCustomRunConfiguration::runConfigDefaultDisplayName(), - true, parent) + true) { - setObjectName("RemoteLinuxCustomRunConfiguration"); registerRunConfiguration<RemoteLinuxCustomRunConfiguration> (RemoteLinuxCustomRunConfiguration::runConfigId()); addSupportedTargetDeviceType(RemoteLinux::Constants::GenericLinuxOsType); diff --git a/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.h b/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.h index 0a5273c94b..82d9991d87 100644 --- a/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.h +++ b/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.h @@ -30,12 +30,12 @@ namespace RemoteLinux { namespace Internal { -class RemoteLinuxRunConfigurationFactory : public ProjectExplorer::IRunConfigurationFactory +class RemoteLinuxRunConfigurationFactory : public ProjectExplorer::RunConfigurationFactory { Q_OBJECT public: - explicit RemoteLinuxRunConfigurationFactory(QObject *parent = nullptr); + RemoteLinuxRunConfigurationFactory(); }; class RemoteLinuxCustomRunConfigurationFactory : public ProjectExplorer::FixedRunConfigurationFactory @@ -43,7 +43,7 @@ class RemoteLinuxCustomRunConfigurationFactory : public ProjectExplorer::FixedRu Q_OBJECT public: - explicit RemoteLinuxCustomRunConfigurationFactory(QObject *parent = nullptr); + RemoteLinuxCustomRunConfigurationFactory(); }; } // namespace Internal diff --git a/src/plugins/winrt/winrtrunfactories.h b/src/plugins/winrt/winrtrunfactories.h index 705e415946..b6548633dd 100644 --- a/src/plugins/winrt/winrtrunfactories.h +++ b/src/plugins/winrt/winrtrunfactories.h @@ -32,7 +32,7 @@ namespace WinRt { namespace Internal { -class WinRtRunConfigurationFactory : public ProjectExplorer::IRunConfigurationFactory +class WinRtRunConfigurationFactory : public ProjectExplorer::RunConfigurationFactory { Q_OBJECT public: |