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

2
src/plugins/qmljstools/qmljscodestylepreferencesfactory.cpp
View File

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

2
src/plugins/qmljstools/qmljscodestylepreferencesfactory.h
View File

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

4
src/plugins/qmljstools/qmljstoolsplugin.cpp
View File

@@ -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);
});