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/subversion | |
| 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/subversion')
| -rw-r--r-- | src/plugins/subversion/subversionclient.h | 2 | ||||
| -rw-r--r-- | src/plugins/subversion/subversionplugin.cpp | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/plugins/subversion/subversionclient.h b/src/plugins/subversion/subversionclient.h index 5af77fcd1d..705efbc273 100644 --- a/src/plugins/subversion/subversionclient.h +++ b/src/plugins/subversion/subversionclient.h @@ -72,7 +72,7 @@ public: static QStringList escapeFiles(const QStringList &files); protected: - Core::Id vcsEditorKind(VcsCommandTag cmd) const override; + Utils::Id vcsEditorKind(VcsCommandTag cmd) const override; private: SubversionDiffEditorController *findOrCreateDiffEditor(const QString &documentId, const QString &source, diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp index ab7cf17285..60754a8c33 100644 --- a/src/plugins/subversion/subversionplugin.cpp +++ b/src/plugins/subversion/subversionplugin.cpp @@ -50,7 +50,6 @@ #include <coreplugin/documentmanager.h> #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/icore.h> -#include <coreplugin/id.h> #include <coreplugin/locator/commandlocator.h> #include <coreplugin/messagemanager.h> @@ -207,7 +206,7 @@ public: // IVersionControl QString displayName() const final; - Core::Id id() const final; + Utils::Id id() const final; bool isVcsFileOrDirectory(const Utils::FilePath &fileName) const final; bool managesDirectory(const QString &directory, QString *topLevel) const final; @@ -281,7 +280,7 @@ private: inline bool isCommitEditorOpen() const; Core::IEditor *showOutputInEditor(const QString &title, const QString &output, - Core::Id id, const QString &source, + Utils::Id id, const QString &source, QTextCodec *codec); void filelog(const QString &workingDir, @@ -1209,9 +1208,9 @@ QString SubversionPluginPrivate::displayName() const return QLatin1String("subversion"); } -Core::Id SubversionPluginPrivate::id() const +Utils::Id SubversionPluginPrivate::id() const { - return Core::Id(VcsBase::Constants::VCS_ID_SUBVERSION); + return Utils::Id(VcsBase::Constants::VCS_ID_SUBVERSION); } bool SubversionPluginPrivate::isVcsFileOrDirectory(const Utils::FilePath &fileName) const |