diff options
author | hjk <hjk@qt.io> | 2020-06-26 13:59:38 +0200 |
---|---|---|
committer | hjk <hjk@qt.io> | 2020-07-06 11:15:18 +0000 |
commit | e1c88116b397ecac2ef0f0678a419790a3e40402 (patch) | |
tree | 830be4b2f1aabad0522c7e01287ec9197b55e4cf /src/plugins/projectexplorer/runcontrol.h | |
parent | c9eedbe0f387f33e5e455af03a795d2114528543 (diff) |
Core/Utils: Migrate further to Utils::Id
The coreplugin/id.h header is kept for downstream for now.
Change-Id: I8c44590f7b988b3770ecdc177c40783e12353e66
(cherry picked from commit 430a33dcd9ac80ddb848e41f8f059102857c88aa)
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/projectexplorer/runcontrol.h')
-rw-r--r-- | src/plugins/projectexplorer/runcontrol.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/plugins/projectexplorer/runcontrol.h b/src/plugins/projectexplorer/runcontrol.h index 242f3b3b15..6926ec4c58 100644 --- a/src/plugins/projectexplorer/runcontrol.h +++ b/src/plugins/projectexplorer/runcontrol.h @@ -74,7 +74,7 @@ public: QString workingDirectory; Utils::Environment environment; IDevice::ConstPtr device; // Override the kit's device. Keep unset by default. - QHash<Core::Id, QVariant> extraData; + QHash<Utils::Id, QVariant> extraData; // FIXME: Not necessarily a display name QString displayName() const { return executable.toString(); } @@ -146,13 +146,13 @@ public: using WorkerCreator = std::function<RunWorker *(RunControl *)>; RunWorkerFactory(const WorkerCreator &producer, - const QList<Core::Id> &runModes, - const QList<Core::Id> &runConfigs = {}, - const QList<Core::Id> &deviceTypes = {}); + const QList<Utils::Id> &runModes, + const QList<Utils::Id> &runConfigs = {}, + const QList<Utils::Id> &deviceTypes = {}); ~RunWorkerFactory(); - bool canRun(Core::Id runMode, Core::Id deviceType, const QString &runConfigId) const; + bool canRun(Utils::Id runMode, Utils::Id deviceType, const QString &runConfigId) const; WorkerCreator producer() const { return m_producer; } template <typename Worker> @@ -166,9 +166,9 @@ public: private: WorkerCreator m_producer; - QList<Core::Id> m_supportedRunModes; - QList<Core::Id> m_supportedRunConfigurations; - QList<Core::Id> m_supportedDeviceTypes; + QList<Utils::Id> m_supportedRunModes; + QList<Utils::Id> m_supportedRunConfigurations; + QList<Utils::Id> m_supportedDeviceTypes; }; /** @@ -184,7 +184,7 @@ class PROJECTEXPLORER_EXPORT RunControl : public QObject Q_OBJECT public: - explicit RunControl(Core::Id mode); + explicit RunControl(Utils::Id mode); ~RunControl() override; void setRunConfiguration(RunConfiguration *runConfig); @@ -223,7 +223,7 @@ public: Project *project() const; Kit *kit() const; const Utils::MacroExpander *macroExpander() const; - ProjectConfigurationAspect *aspect(Core::Id id) const; + ProjectConfigurationAspect *aspect(Utils::Id id) const; template <typename T> T *aspect() const { return runConfiguration() ? runConfiguration()->aspect<T>() : nullptr; } @@ -233,13 +233,13 @@ public: Utils::FilePath buildDirectory() const; Utils::Environment buildEnvironment() const; - QVariantMap settingsData(Core::Id id) const; + QVariantMap settingsData(Utils::Id id) const; Utils::FilePath targetFilePath() const; Utils::FilePath projectFilePath() const; QList<Utils::OutputLineParser *> createOutputParsers() const; - Core::Id runMode() const; + Utils::Id runMode() const; const Runnable &runnable() const; void setRunnable(const Runnable &runnable); @@ -249,10 +249,10 @@ public: const QString &cancelButtonText = QString(), bool *prompt = nullptr); - RunWorker *createWorker(Core::Id workerId); + RunWorker *createWorker(Utils::Id workerId); bool createMainWorker(); - static bool canRun(Core::Id runMode, Core::Id deviceType, Core::Id runConfigId); + static bool canRun(Utils::Id runMode, Utils::Id deviceType, Utils::Id runConfigId); signals: void appendMessage(const QString &msg, Utils::OutputFormat format); |