AdvancedDockingSystem: Add context objects into connections

Change-Id: I564b9ffe6c7809a6d50a172062c52558f3023fc1
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>

3 files changed, 10 insertions, 16 deletions

diff --git a/src/libs/advanceddockingsystem/dockareatitlebar.cpp b/src/libs/advanceddockingsystem/dockareatitlebar.cpp
index 039b33eaaf..e050f7446d 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 c868564b7a..2eed211bae 100644
--- a/src/libs/advanceddockingsystem/workspacedialog.cpp
+++ b/src/libs/advanceddockingsystem/workspacedialog.cpp
@@ -74,7 +74,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);
 
diff --git a/src/libs/advanceddockingsystem/workspaceview.cpp b/src/libs/advanceddockingsystem/workspaceview.cpp
index 702794fba9..a03141a249 100644
--- a/src/libs/advanceddockingsystem/workspaceview.cpp
+++ b/src/libs/advanceddockingsystem/workspaceview.cpp
@@ -60,25 +60,19 @@ WorkspaceView::WorkspaceView(DockManager *manager, 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()