feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Core/Utils: Migrate further to Utils::Id

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/cvs/cvsplugin.cpp
View File

@@ -56,7 +56,6 @@
#include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/actioncontainer.h>
#include <coreplugin/actionmanager/command.h>
#include <coreplugin/id.h>
#include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/locator/commandlocator.h>
#include <coreplugin/vcsmanager.h>
@@ -214,13 +213,13 @@ public:
return Utils::defaultExitCodeInterpreter;
}
Core::Id vcsEditorKind(VcsCommandTag cmd) const override
Utils::Id vcsEditorKind(VcsCommandTag cmd) const override
{
switch (cmd) {
case DiffCommand:
return "CVS Diff Editor"; // TODO: replace by string from cvsconstants.h
default:
return Core::Id();
return Utils::Id();
}
}
};
@@ -235,7 +234,7 @@ public:
// IVersionControl
QString displayName() const final { return QLatin1String("cvs"); }
Core::Id id() const final;
Utils::Id id() const final;
bool isVcsFileOrDirectory(const Utils::FilePath &fileName) const final;
@@ -305,7 +304,7 @@ private:
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);
CvsResponse runCvs(const QString &workingDirectory,
@@ -401,9 +400,9 @@ public:
};
};
Core::Id CvsPluginPrivate::id() const
Utils::Id CvsPluginPrivate::id() const
{
return Core::Id(VcsBase::Constants::VCS_ID_CVS);
return Utils::Id(VcsBase::Constants::VCS_ID_CVS);
}
bool CvsPluginPrivate::isVcsFileOrDirectory(const Utils::FilePath &fileName) const
@@ -1471,7 +1470,7 @@ CvsResponse CvsPluginPrivate::runCvs(const QString &workingDirectory,
}
IEditor *CvsPluginPrivate::showOutputInEditor(const QString& title, const QString &output,
Core::Id id, const QString &source,
Utils::Id id, const QString &source,
QTextCodec *codec)
{
QString s = title;