Core/Utils: Migrate further to Utils::Id

The coreplugin/id.h header is kept for downstream for now.

Change-Id: I8c44590f7b988b3770ecdc177c40783e12353e66
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2020-06-26 13:59:38 +02:00
parent 4924392620
commit 430a33dcd9
655 changed files with 2115 additions and 2093 deletions

View File

@@ -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