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

QmlDesinger: Replace some [&] captures with [this]

Browse Source 
Change-Id: Idb53feea3c8961c0343a147d8a71bf692af7847a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Jarek Kobus
2024-07-26 09:23:59 +02:00
committed by hjk
parent 9747564bab
commit e42c68a3b2
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/languageclient/languageclientmanager.cpp
View File

@@ -68,7 +68,7 @@ LanguageClientManager::LanguageClientManager(QObject *parent)
connect(ProjectManager::instance(), &ProjectManager::projectAdded, connect(ProjectManager::instance(), &ProjectManager::projectAdded,
this, &LanguageClientManager::projectAdded); this, &LanguageClientManager::projectAdded);
connect(ProjectManager::instance(), &ProjectManager::projectRemoved, connect(ProjectManager::instance(), &ProjectManager::projectRemoved,
this, [&](Project *project) { project->disconnect(this); }); this, [this](Project *project) { project->disconnect(this); });
ExtensionSystem::PluginManager::addObject(this); ExtensionSystem::PluginManager::addObject(this);
} }

2
src/plugins/qmldesigner/components/annotationeditor/annotationeditorwidget.cpp
View File

@@ -42,7 +42,7 @@ AnnotationEditorWidget::AnnotationEditorWidget(QWidget *parent,
ui->tabWidget->setCurrentIndex(index); ui->tabWidget->setCurrentIndex(index);
}); });
connect(ui->statusAddButton, &QPushButton::clicked, this, [&](bool) { connect(ui->statusAddButton, &QPushButton::clicked, this, [this] {
setStatusVisibility(true); setStatusVisibility(true);
}); });

2
src/plugins/qmldesigner/components/contentlibrary/contentlibraryview.cpp
View File

@@ -86,7 +86,7 @@ WidgetInfo ContentLibraryView::widgetInfo()
}); });
}); });
connect(m_widget, &ContentLibraryWidget::updateSceneEnvStateRequested, this, [&]() { connect(m_widget, &ContentLibraryWidget::updateSceneEnvStateRequested, this, [this] {
ModelNode activeSceneEnv = m_createTexture.resolveSceneEnv(m_sceneId); ModelNode activeSceneEnv = m_createTexture.resolveSceneEnv(m_sceneId);
const bool sceneEnvExists = activeSceneEnv.isValid(); const bool sceneEnvExists = activeSceneEnv.isValid();
m_widget->texturesModel()->setHasSceneEnv(sceneEnvExists); m_widget->texturesModel()->setHasSceneEnv(sceneEnvExists);

12
src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp
View File

@@ -64,7 +64,7 @@ WidgetInfo MaterialBrowserView::widgetInfo()
// custom notifications below are sent to the MaterialEditor // custom notifications below are sent to the MaterialEditor
MaterialBrowserModel *matBrowserModel = m_widget->materialBrowserModel().data(); MaterialBrowserModel *matBrowserModel = m_widget->materialBrowserModel().data();
connect(matBrowserModel, &MaterialBrowserModel::selectedIndexChanged, this, [&] (int idx) { connect(matBrowserModel, &MaterialBrowserModel::selectedIndexChanged, this, [this](int idx) {
ModelNode matNode = m_widget->materialBrowserModel()->materialAt(idx); ModelNode matNode = m_widget->materialBrowserModel()->materialAt(idx);
emitCustomNotification("selected_material_changed", {matNode}, {}); emitCustomNotification("selected_material_changed", {matNode}, {});
}); });
@@ -79,7 +79,7 @@ WidgetInfo MaterialBrowserView::widgetInfo()
emitCustomNotification("rename_material", {material}, {newName}); emitCustomNotification("rename_material", {material}, {newName});
}); });
connect(matBrowserModel, &MaterialBrowserModel::addNewMaterialTriggered, this, [&] { connect(matBrowserModel, &MaterialBrowserModel::addNewMaterialTriggered, this, [this] {
emitCustomNotification("add_new_material"); emitCustomNotification("add_new_material");
}); });
@@ -153,7 +153,7 @@ WidgetInfo MaterialBrowserView::widgetInfo()
// custom notifications below are sent to the TextureEditor // custom notifications below are sent to the TextureEditor
MaterialBrowserTexturesModel *texturesModel = m_widget->materialBrowserTexturesModel().data(); MaterialBrowserTexturesModel *texturesModel = m_widget->materialBrowserTexturesModel().data();
connect(texturesModel, &MaterialBrowserTexturesModel::selectedIndexChanged, this, [&] (int idx) { connect(texturesModel, &MaterialBrowserTexturesModel::selectedIndexChanged, this, [this](int idx) {
ModelNode texNode = m_widget->materialBrowserTexturesModel()->textureAt(idx); ModelNode texNode = m_widget->materialBrowserTexturesModel()->textureAt(idx);
emitCustomNotification("selected_texture_changed", {texNode}); emitCustomNotification("selected_texture_changed", {texNode});
}); });
@@ -177,17 +177,17 @@ WidgetInfo MaterialBrowserView::widgetInfo()
applyTextureToModel3D(m_selectedModels[0], texture); applyTextureToModel3D(m_selectedModels[0], texture);
}); });
connect(texturesModel, &MaterialBrowserTexturesModel::addNewTextureTriggered, this, [&] { connect(texturesModel, &MaterialBrowserTexturesModel::addNewTextureTriggered, this, [this] {
emitCustomNotification("add_new_texture"); emitCustomNotification("add_new_texture");
}); });
connect(texturesModel, &MaterialBrowserTexturesModel::updateSceneEnvStateRequested, this, [&]() { connect(texturesModel, &MaterialBrowserTexturesModel::updateSceneEnvStateRequested, this, [this] {
ModelNode activeSceneEnv = CreateTexture(this).resolveSceneEnv(m_sceneId); ModelNode activeSceneEnv = CreateTexture(this).resolveSceneEnv(m_sceneId);
const bool sceneEnvExists = activeSceneEnv.isValid(); const bool sceneEnvExists = activeSceneEnv.isValid();
m_widget->materialBrowserTexturesModel()->setHasSceneEnv(sceneEnvExists); m_widget->materialBrowserTexturesModel()->setHasSceneEnv(sceneEnvExists);
}); });
connect(texturesModel, &MaterialBrowserTexturesModel::updateModelSelectionStateRequested, this, [&]() { connect(texturesModel, &MaterialBrowserTexturesModel::updateModelSelectionStateRequested, this, [this] {
bool hasModel = false; bool hasModel = false;
if (m_selectedModels.size() == 1) if (m_selectedModels.size() == 1)
hasModel = getMaterialOfModel(m_selectedModels.at(0)).isValid(); hasModel = getMaterialOfModel(m_selectedModels.at(0)).isValid();

4
src/plugins/qmldesigner/components/materialbrowser/materialbrowserwidget.cpp
View File

@@ -192,12 +192,12 @@ MaterialBrowserWidget::MaterialBrowserWidget(AsynchronousImageCache &imageCache,
m_qmlSourceUpdateShortcut = new QShortcut(QKeySequence(Qt::CTRL | Qt::Key_F8), this); m_qmlSourceUpdateShortcut = new QShortcut(QKeySequence(Qt::CTRL | Qt::Key_F8), this);
connect(m_qmlSourceUpdateShortcut, &QShortcut::activated, this, &MaterialBrowserWidget::reloadQmlSource); connect(m_qmlSourceUpdateShortcut, &QShortcut::activated, this, &MaterialBrowserWidget::reloadQmlSource);
connect(m_materialBrowserModel, &MaterialBrowserModel::isEmptyChanged, this, [&] { connect(m_materialBrowserModel, &MaterialBrowserModel::isEmptyChanged, this, [this] {
if (m_materialBrowserModel->isEmpty()) if (m_materialBrowserModel->isEmpty())
focusMaterialSection(false); focusMaterialSection(false);
}); });
connect(m_materialBrowserTexturesModel, &MaterialBrowserTexturesModel::isEmptyChanged, this, [&] { connect(m_materialBrowserTexturesModel, &MaterialBrowserTexturesModel::isEmptyChanged, this, [this] {
if (m_materialBrowserTexturesModel->isEmpty()) if (m_materialBrowserTexturesModel->isEmpty())
focusMaterialSection(true); focusMaterialSection(true);
}); });