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
(cherry picked from commit 430a33dcd9)
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2020-06-26 13:59:38 +02:00
parent c9eedbe0f3
commit e1c88116b3
655 changed files with 2115 additions and 2093 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmljseditor/qmljseditor.cpp
View File

@@ -54,7 +54,6 @@
#include <coreplugin/designmode.h>
#include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/icore.h>
#include <coreplugin/id.h>
#include <coreplugin/modemanager.h>
#include <extensionsystem/pluginmanager.h>
@@ -102,6 +101,7 @@ using namespace QmlJS;
using namespace QmlJS::AST;
using namespace QmlJSTools;
using namespace TextEditor;
using namespace Utils;
namespace QmlJSEditor {
@@ -1075,7 +1075,7 @@ QmlJSEditorFactory::QmlJSEditorFactory()
: QmlJSEditorFactory(Constants::C_QMLJSEDITOR_ID)
{}
QmlJSEditorFactory::QmlJSEditorFactory(Core::Id _id)
QmlJSEditorFactory::QmlJSEditorFactory(Utils::Id _id)
{
setId(_id);
setDisplayName(QCoreApplication::translate("OpenWith::Editors", "QMLJS Editor"));

2
src/plugins/qmljseditor/qmljseditor.h
View File

@@ -146,7 +146,7 @@ class QMLJSEDITOR_EXPORT QmlJSEditorFactory : public TextEditor::TextEditorFacto
{
public:
QmlJSEditorFactory();
QmlJSEditorFactory(Core::Id id);
QmlJSEditorFactory(Utils::Id id);
static void decorateEditor(TextEditor::TextEditorWidget *editor);
};

2
src/plugins/qmljseditor/qmljseditordocument.cpp
View File

@@ -648,7 +648,7 @@ void QmlJSEditorDocumentPrivate::cleanSemanticMarks()
} // Internal
QmlJSEditorDocument::QmlJSEditorDocument(Core::Id id)
QmlJSEditorDocument::QmlJSEditorDocument(Utils::Id id)
: d(new Internal::QmlJSEditorDocumentPrivate(this))
{
setId(id);

2
src/plugins/qmljseditor/qmljseditordocument.h
View File

@@ -43,7 +43,7 @@ class QMLJSEDITOR_EXPORT QmlJSEditorDocument : public TextEditor::TextDocument
{
Q_OBJECT
public:
QmlJSEditorDocument(Core::Id id);
QmlJSEditorDocument(Utils::Id id);
~QmlJSEditorDocument() override;
const QmlJSTools::SemanticInfo &semanticInfo() const;

2
src/plugins/qmljseditor/qmljseditorplugin.cpp
View File

@@ -41,7 +41,6 @@
#include <coreplugin/coreconstants.h>
#include <coreplugin/icore.h>
#include <coreplugin/id.h>
#include <coreplugin/fileiconprovider.h>
#include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/actioncontainer.h>
@@ -64,6 +63,7 @@
using namespace QmlJSEditor::Constants;
using namespace ProjectExplorer;
using namespace Core;
using namespace Utils;
namespace QmlJSEditor {
namespace Internal {

2
src/plugins/qmljseditor/qmljstextmark.cpp
View File

@@ -54,7 +54,7 @@ static bool isWarning(QmlJS::Severity::Enum kind)
return false;
}
static Core::Id cartegoryForSeverity(QmlJS::Severity::Enum kind)
static Utils::Id cartegoryForSeverity(QmlJS::Severity::Enum kind)
{
return isWarning(kind) ? QMLJS_WARNING : QMLJS_ERROR;
}

4
src/plugins/qmljseditor/qmltaskmanager.cpp
View File

@@ -60,7 +60,7 @@ QmlTaskManager::QmlTaskManager()
connect(&m_updateDelay, &QTimer::timeout, this, [this] { updateMessagesNow(); });
}
static Tasks convertToTasks(const QList<DiagnosticMessage> &messages, const FilePath &fileName, Core::Id category)
static Tasks convertToTasks(const QList<DiagnosticMessage> &messages, const FilePath &fileName, Utils::Id category)
{
Tasks result;
foreach (const DiagnosticMessage &msg, messages) {
@@ -71,7 +71,7 @@ static Tasks convertToTasks(const QList<DiagnosticMessage> &messages, const File
return result;
}
static Tasks convertToTasks(const QList<StaticAnalysis::Message> &messages, const FilePath &fileName, Core::Id category)
static Tasks convertToTasks(const QList<StaticAnalysis::Message> &messages, const FilePath &fileName, Utils::Id category)
{
QList<DiagnosticMessage> diagnostics;
foreach (const StaticAnalysis::Message &msg, messages)