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/bazaar | |
| 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/bazaar')
| -rw-r--r-- | src/plugins/bazaar/bazaarclient.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/bazaar/bazaarclient.h | 2 | ||||
| -rw-r--r-- | src/plugins/bazaar/bazaarplugin.cpp | 7 |
3 files changed, 6 insertions, 9 deletions
diff --git a/src/plugins/bazaar/bazaarclient.cpp b/src/plugins/bazaar/bazaarclient.cpp index 503eb4db88..84ff8c7d7d 100644 --- a/src/plugins/bazaar/bazaarclient.cpp +++ b/src/plugins/bazaar/bazaarclient.cpp @@ -26,8 +26,6 @@ #include "bazaarclient.h" #include "constants.h" -#include <coreplugin/id.h> - #include <vcsbase/vcsbaseplugin.h> #include <vcsbase/vcsoutputwindow.h> #include <vcsbase/vcsbaseeditorconfig.h> @@ -206,7 +204,7 @@ void BazaarClient::view(const QString &source, const QString &id, const QStringL VcsBaseClient::view(source, id, args); } -Core::Id BazaarClient::vcsEditorKind(VcsCommandTag cmd) const +Utils::Id BazaarClient::vcsEditorKind(VcsCommandTag cmd) const { switch (cmd) { case AnnotateCommand: @@ -216,7 +214,7 @@ Core::Id BazaarClient::vcsEditorKind(VcsCommandTag cmd) const case LogCommand: return Constants::FILELOG_ID; default: - return Core::Id(); + return Utils::Id(); } } diff --git a/src/plugins/bazaar/bazaarclient.h b/src/plugins/bazaar/bazaarclient.h index 4b3c2acc42..801d5c81f5 100644 --- a/src/plugins/bazaar/bazaarclient.h +++ b/src/plugins/bazaar/bazaarclient.h @@ -56,7 +56,7 @@ public: void view(const QString &source, const QString &id, const QStringList &extraOptions = QStringList()) override; - Core::Id vcsEditorKind(VcsCommandTag cmd) const override; + Utils::Id vcsEditorKind(VcsCommandTag cmd) const override; QString vcsCommandString(VcsCommandTag cmd) const override; Utils::ExitCodeInterpreter exitCodeInterpreter(VcsCommandTag cmd) const override; QStringList revisionSpec(const QString &revision) const override; diff --git a/src/plugins/bazaar/bazaarplugin.cpp b/src/plugins/bazaar/bazaarplugin.cpp index 1b0b43d21f..0b58feaca2 100644 --- a/src/plugins/bazaar/bazaarplugin.cpp +++ b/src/plugins/bazaar/bazaarplugin.cpp @@ -44,7 +44,6 @@ #include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/command.h> -#include <coreplugin/id.h> #include <coreplugin/coreconstants.h> #include <coreplugin/icore.h> #include <coreplugin/idocument.h> @@ -147,7 +146,7 @@ public: BazaarPluginPrivate(); QString displayName() const final; - Core::Id id() const final; + Utils::Id id() const final; bool isVcsFileOrDirectory(const Utils::FilePath &fileName) const final; @@ -840,9 +839,9 @@ QString BazaarPluginPrivate::displayName() const return tr("Bazaar"); } -Core::Id BazaarPluginPrivate::id() const +Utils::Id BazaarPluginPrivate::id() const { - return Core::Id(VcsBase::Constants::VCS_ID_BAZAAR); + return Utils::Id(VcsBase::Constants::VCS_ID_BAZAAR); } bool BazaarPluginPrivate::isVcsFileOrDirectory(const Utils::FilePath &fileName) const |