diff options
Diffstat (limited to 'src/plugins/projectexplorer')
-rw-r--r-- | src/plugins/projectexplorer/addrunconfigdialog.cpp | 2 | ||||
-rw-r--r-- | src/plugins/projectexplorer/projectexplorer.cpp | 6 | ||||
-rw-r--r-- | src/plugins/projectexplorer/runconfiguration.cpp | 5 | ||||
-rw-r--r-- | src/plugins/projectexplorer/runconfiguration.h | 18 | ||||
-rw-r--r-- | src/plugins/projectexplorer/runsettingspropertiespage.cpp | 4 | ||||
-rw-r--r-- | src/plugins/projectexplorer/target.cpp | 6 |
6 files changed, 19 insertions, 22 deletions
diff --git a/src/plugins/projectexplorer/addrunconfigdialog.cpp b/src/plugins/projectexplorer/addrunconfigdialog.cpp index bc57e1c5448..080d6df538f 100644 --- a/src/plugins/projectexplorer/addrunconfigdialog.cpp +++ b/src/plugins/projectexplorer/addrunconfigdialog.cpp @@ -184,7 +184,7 @@ void AddRunConfigDialog::accept() const TreeItem * const item = model->itemForIndex(proxyModel->mapToSource(selected.first())); QTC_ASSERT(item, return); m_creationInfo = static_cast<const CandidateTreeItem *>(item)->creationInfo(); - QTC_ASSERT(m_creationInfo.id.isValid(), return); + QTC_ASSERT(m_creationInfo.factory, return); QDialog::accept(); } diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index 1ff8f6d230f..e0c9f82b415 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -624,7 +624,7 @@ public: RunWorkerFactory m_customExecutableRunWorkerFactory{ RunWorkerFactory::make<SimpleTargetRunner>(), {Constants::NORMAL_RUN_MODE}, - {m_customExecutableRunConfigFactory.id()} + {m_customExecutableRunConfigFactory.runConfigurationId()} }; ProjectFileWizardExtension m_projectFileWizardExtension; @@ -657,7 +657,9 @@ public: RunWorkerFactory desktopRunWorkerFactory{ RunWorkerFactory::make<SimpleTargetRunner>(), {ProjectExplorer::Constants::NORMAL_RUN_MODE}, - {qmakeRunConfigFactory.id(), qbsRunConfigFactory.id(), cmakeRunConfigFactory.id()} + {qmakeRunConfigFactory.runConfigurationId(), + qbsRunConfigFactory.runConfigurationId(), + cmakeRunConfigFactory.runConfigurationId()} }; }; diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp index 69f6dc86069..2a1d879646e 100644 --- a/src/plugins/projectexplorer/runconfiguration.cpp +++ b/src/plugins/projectexplorer/runconfiguration.cpp @@ -458,7 +458,6 @@ RunConfigurationFactory::availableCreators(Target *target) const displayName = decoratedTargetName(displayName, target); RunConfigurationCreationInfo rci; rci.factory = this; - rci.id = m_runConfigBaseId; rci.buildKey = ti.buildKey; rci.projectFilePath = ti.projectFilePath; rci.displayName = displayName; @@ -532,7 +531,6 @@ RunConfiguration *RunConfigurationFactory::create(Target *target) const RunConfiguration *RunConfigurationCreationInfo::create(Target *target) const { QTC_ASSERT(factory->canHandle(target), return nullptr); - QTC_ASSERT(id == factory->runConfigurationBaseId(), return nullptr); RunConfiguration *rc = factory->create(target); if (!rc) @@ -550,7 +548,7 @@ RunConfiguration *RunConfigurationFactory::restore(Target *parent, const QVarian for (RunConfigurationFactory *factory : g_runConfigurationFactories) { if (factory->canHandle(parent)) { const Core::Id id = idFromMap(map); - if (id.name().startsWith(factory->m_runConfigBaseId.name())) { + if (id.name().startsWith(factory->m_runConfigurationId.name())) { RunConfiguration *rc = factory->create(parent); if (rc->fromMap(map)) { rc->update(); @@ -601,7 +599,6 @@ FixedRunConfigurationFactory::availableCreators(Target *parent) const : m_fixedBuildTarget; RunConfigurationCreationInfo rci; rci.factory = this; - rci.id = runConfigurationBaseId(); rci.displayName = displayName; return {rci}; } diff --git a/src/plugins/projectexplorer/runconfiguration.h b/src/plugins/projectexplorer/runconfiguration.h index e896968c106..20fa04b647e 100644 --- a/src/plugins/projectexplorer/runconfiguration.h +++ b/src/plugins/projectexplorer/runconfiguration.h @@ -207,7 +207,6 @@ public: RunConfiguration *create(Target *target) const; const RunConfigurationFactory *factory = nullptr; - Core::Id id; QString buildKey; QString displayName; QString displayNameUniquifier; @@ -228,8 +227,7 @@ public: static RunConfiguration *clone(Target *parent, RunConfiguration *source); static const QList<RunConfigurationCreationInfo> creatorsForTarget(Target *parent); - Core::Id id() const { return m_runConfigBaseId; } - Core::Id runConfigurationBaseId() const { return m_runConfigBaseId; } + Core::Id runConfigurationId() const { return m_runConfigurationId; } static QString decoratedTargetName(const QString &targetName, Target *kit); @@ -239,16 +237,16 @@ protected: using RunConfigurationCreator = std::function<RunConfiguration *(Target *)>; template <class RunConfig> - void registerRunConfiguration(Core::Id runConfigBaseId) + void registerRunConfiguration(Core::Id runConfigurationId) { - m_creator = [runConfigBaseId](Target *t) -> RunConfiguration * { - return new RunConfig(t, runConfigBaseId); + m_creator = [runConfigurationId](Target *t) -> RunConfiguration * { + return new RunConfig(t, runConfigurationId); }; - m_runConfigBaseId = runConfigBaseId; + m_runConfigurationId = runConfigurationId; } - void addSupportedProjectType(Core::Id id); - void addSupportedTargetDeviceType(Core::Id id); + void addSupportedProjectType(Core::Id projectTypeId); + void addSupportedTargetDeviceType(Core::Id deviceTypeId); void setDecorateDisplayNames(bool on); private: @@ -257,7 +255,7 @@ private: friend class RunConfigurationCreationInfo; RunConfigurationCreator m_creator; - Core::Id m_runConfigBaseId; + Core::Id m_runConfigurationId; QList<Core::Id> m_supportedProjectTypes; QList<Core::Id> m_supportedTargetDeviceTypes; bool m_decorateDisplayNames = false; diff --git a/src/plugins/projectexplorer/runsettingspropertiespage.cpp b/src/plugins/projectexplorer/runsettingspropertiespage.cpp index 0c772028936..002652c779d 100644 --- a/src/plugins/projectexplorer/runsettingspropertiespage.cpp +++ b/src/plugins/projectexplorer/runsettingspropertiespage.cpp @@ -201,11 +201,11 @@ void RunSettingsWidget::showAddRunConfigDialog() if (dlg.exec() != QDialog::Accepted) return; RunConfigurationCreationInfo rci = dlg.creationInfo(); - QTC_ASSERT(rci.id.isValid(), return); + QTC_ASSERT(rci.factory, return); RunConfiguration *newRC = rci.create(m_target); if (!newRC) return; - QTC_CHECK(newRC->id() == rci.id); + QTC_CHECK(newRC->id() == rci.factory->runConfigurationId()); m_target->addRunConfiguration(newRC); m_target->setActiveRunConfiguration(newRC); m_removeRunToolButton->setEnabled(m_target->runConfigurations().size() > 1); diff --git a/src/plugins/projectexplorer/target.cpp b/src/plugins/projectexplorer/target.cpp index e46f259f8a3..c7d07b0238f 100644 --- a/src/plugins/projectexplorer/target.cpp +++ b/src/plugins/projectexplorer/target.cpp @@ -625,7 +625,7 @@ void Target::updateDefaultRunConfigurations() bool present = false; for (const RunConfigurationCreationInfo &item : creators) { QString buildKey = rc->buildKey(); - if (item.id == rc->id() && item.buildKey == buildKey) { + if (item.factory->runConfigurationId() == rc->id() && item.buildKey == buildKey) { existing.append(item); present = true; } @@ -643,7 +643,7 @@ void Target::updateDefaultRunConfigurations() continue; bool exists = false; for (const RunConfigurationCreationInfo &ex : existing) { - if (ex.id == item.id && ex.buildKey == item.buildKey) + if (ex.factory == item.factory && ex.buildKey == item.buildKey) exists = true; } if (exists) @@ -652,7 +652,7 @@ void Target::updateDefaultRunConfigurations() RunConfiguration *rc = item.create(this); if (!rc) continue; - QTC_CHECK(rc->id() == item.id); + QTC_CHECK(rc->id() == item.factory->runConfigurationId()); if (!rc->isConfigured()) newUnconfigured << rc; else |