diff options
author | hjk <hjk@qt.io> | 2020-06-26 13:59:38 +0200 |
---|---|---|
committer | hjk <hjk@qt.io> | 2020-07-06 06:07:13 +0000 |
commit | 430a33dcd9ac80ddb848e41f8f059102857c88aa (patch) | |
tree | 9af1619701306a6bad6a06645091f2d3b2838e9c /src/plugins/qmljstools | |
parent | 492439262079dcf1d5c503208b905be8c82a694b (diff) |
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>
Diffstat (limited to 'src/plugins/qmljstools')
-rw-r--r-- | src/plugins/qmljstools/qmljscodestylepreferencesfactory.cpp | 2 | ||||
-rw-r--r-- | src/plugins/qmljstools/qmljscodestylepreferencesfactory.h | 2 | ||||
-rw-r--r-- | src/plugins/qmljstools/qmljstoolsplugin.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/qmljstools/qmljscodestylepreferencesfactory.cpp b/src/plugins/qmljstools/qmljscodestylepreferencesfactory.cpp index c822e274101..f47833d49e7 100644 --- a/src/plugins/qmljstools/qmljscodestylepreferencesfactory.cpp +++ b/src/plugins/qmljstools/qmljscodestylepreferencesfactory.cpp @@ -56,7 +56,7 @@ static const char *defaultPreviewText = QmlJSCodeStylePreferencesFactory::QmlJSCodeStylePreferencesFactory() = default; -Core::Id QmlJSCodeStylePreferencesFactory::languageId() +Utils::Id QmlJSCodeStylePreferencesFactory::languageId() { return Constants::QML_JS_SETTINGS_ID; } diff --git a/src/plugins/qmljstools/qmljscodestylepreferencesfactory.h b/src/plugins/qmljstools/qmljscodestylepreferencesfactory.h index 111103f243b..42f904be7cd 100644 --- a/src/plugins/qmljstools/qmljscodestylepreferencesfactory.h +++ b/src/plugins/qmljstools/qmljscodestylepreferencesfactory.h @@ -34,7 +34,7 @@ class QmlJSCodeStylePreferencesFactory : public TextEditor::ICodeStylePreference public: QmlJSCodeStylePreferencesFactory(); - Core::Id languageId() override; + Utils::Id languageId() override; QString displayName() override; TextEditor::ICodeStylePreferences *createCodeStyle() const override; QWidget *createEditor(TextEditor::ICodeStylePreferences *settings, diff --git a/src/plugins/qmljstools/qmljstoolsplugin.cpp b/src/plugins/qmljstools/qmljstoolsplugin.cpp index b66e98500dd..fcf51036247 100644 --- a/src/plugins/qmljstools/qmljstoolsplugin.cpp +++ b/src/plugins/qmljstools/qmljstoolsplugin.cpp @@ -105,13 +105,13 @@ QmlJSToolsPluginPrivate::QmlJSToolsPluginPrivate() // Watch task progress connect(ProgressManager::instance(), &ProgressManager::taskStarted, this, - [this](Core::Id type) { + [this](Utils::Id type) { if (type == QmlJS::Constants::TASK_INDEX) resetCodeModelAction.setEnabled(false); }); connect(ProgressManager::instance(), &ProgressManager::allTasksFinished, - [this](Core::Id type) { + [this](Utils::Id type) { if (type == QmlJS::Constants::TASK_INDEX) resetCodeModelAction.setEnabled(true); }); |