From 216f3dd243cef16fdb2c088d51e067968dd3564a Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Wed, 30 Nov 2022 09:01:35 +0100 Subject: [PATCH] AdvancedDockingSystem: Add context objects into connections (cherry picked from commit d701cd5dbe938000ec82c58898cceff208d08ed7) Change-Id: I564b9ffe6c7809a6d50a172062c52558f3023fc1 Reviewed-by: Tim Jenssen --- .../dockareatitlebar.cpp | 2 +- .../advanceddockingsystem/workspacedialog.cpp | 2 +- .../advanceddockingsystem/workspaceview.cpp | 22 +++++++------------ 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/src/libs/advanceddockingsystem/dockareatitlebar.cpp b/src/libs/advanceddockingsystem/dockareatitlebar.cpp index 039b33eaaf4..e050f7446d5 100644 --- a/src/libs/advanceddockingsystem/dockareatitlebar.cpp +++ b/src/libs/advanceddockingsystem/dockareatitlebar.cpp @@ -222,7 +222,7 @@ namespace ADS floatingWidget = floatingDockContainer = new FloatingDockContainer(m_dockArea); } else { auto w = new FloatingDragPreview(m_dockArea); - QObject::connect(w, &FloatingDragPreview::draggingCanceled, [=]() { + QObject::connect(w, &FloatingDragPreview::draggingCanceled, q, [this] { m_dragState = DraggingInactive; }); floatingWidget = w; diff --git a/src/libs/advanceddockingsystem/workspacedialog.cpp b/src/libs/advanceddockingsystem/workspacedialog.cpp index 6594e05d7ca..481f597e8a3 100644 --- a/src/libs/advanceddockingsystem/workspacedialog.cpp +++ b/src/libs/advanceddockingsystem/workspacedialog.cpp @@ -71,7 +71,7 @@ WorkspaceNameInputDialog::WorkspaceNameInputDialog(DockManager *manager, QWidget m_okButton = buttons->button(QDialogButtonBox::Ok); m_switchToButton = new QPushButton; buttons->addButton(m_switchToButton, QDialogButtonBox::AcceptRole); - connect(m_switchToButton, &QPushButton::clicked, [this]() { m_usedSwitchTo = true; }); + connect(m_switchToButton, &QPushButton::clicked, this, [this] { m_usedSwitchTo = true; }); connect(buttons, &QDialogButtonBox::accepted, this, &QDialog::accept); connect(buttons, &QDialogButtonBox::rejected, this, &QDialog::reject); hlayout->addWidget(buttons); diff --git a/src/libs/advanceddockingsystem/workspaceview.cpp b/src/libs/advanceddockingsystem/workspaceview.cpp index 41d0dfb28ab..b1c381fc309 100644 --- a/src/libs/advanceddockingsystem/workspaceview.cpp +++ b/src/libs/advanceddockingsystem/workspaceview.cpp @@ -68,25 +68,19 @@ WorkspaceView::WorkspaceView(QWidget *parent) m_workspaceModel.index(0, m_workspaceModel.columnCount() - 1)); selectionModel()->select(firstRow, QItemSelectionModel::QItemSelectionModel::SelectCurrent); - connect(this, &Utils::TreeView::activated, [this](const QModelIndex &index) { + connect(this, &Utils::TreeView::activated, this, [this](const QModelIndex &index) { emit workspaceActivated(m_workspaceModel.workspaceAt(index.row())); }); - connect(selectionModel(), &QItemSelectionModel::selectionChanged, [this] { + connect(selectionModel(), &QItemSelectionModel::selectionChanged, this, [this] { emit workspacesSelected(selectedWorkspaces()); }); - connect(&m_workspaceModel, - &WorkspaceModel::workspaceSwitched, - this, - &WorkspaceView::workspaceSwitched); - connect(&m_workspaceModel, - &WorkspaceModel::modelReset, - this, - &WorkspaceView::selectActiveWorkspace); - connect(&m_workspaceModel, - &WorkspaceModel::workspaceCreated, - this, - &WorkspaceView::selectWorkspace); + connect(&m_workspaceModel, &WorkspaceModel::workspaceSwitched, + this, &WorkspaceView::workspaceSwitched); + connect(&m_workspaceModel, &WorkspaceModel::modelReset, + this, &WorkspaceView::selectActiveWorkspace); + connect(&m_workspaceModel, &WorkspaceModel::workspaceCreated, + this, &WorkspaceView::selectWorkspace); } void WorkspaceView::createNewWorkspace()