Drop Qt5: Debugger: Get rid of QOverload

Change-Id: Ic62a3173adeffdfa78a47849cf1ceaa4f59b8091
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

src/plugins/debugger/analyzer/analyzerrunconfigwidget.cpp

@@ -80,9 +80,7 @@ AnalyzerRunConfigWidget::AnalyzerRunConfigWidget(ProjectExplorer::GlobalOrProjec
 
     chooseSettings(aspect->isUsingGlobalSettings() ? 0 : 1);
 
-    connect(settingsCombo, QOverload<int>::of(&QComboBox::activated),
+    connect(settingsCombo, &QComboBox::activated, this, chooseSettings);
-            this, chooseSettings);
-
     connect(restoreButton, &QPushButton::clicked,
             aspect, &ProjectExplorer::GlobalOrProjectAspect::resetProjectToGlobalSettings);
 }

src/plugins/debugger/breakhandler.cpp

@@ -542,8 +542,7 @@ BreakpointDialog::BreakpointDialog(unsigned int enabledParts, QWidget *parent)
     verticalLayout->addWidget(m_buttonBox);
     verticalLayout->setStretchFactor(groupBoxAdvanced, 10);
 
-    connect(m_comboBoxType, QOverload<int>::of(&QComboBox::activated),
+    connect(m_comboBoxType, &QComboBox::activated, this, &BreakpointDialog::typeChanged);
-            this, &BreakpointDialog::typeChanged);
     connect(m_buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
     connect(m_buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
 }

src/plugins/debugger/debuggerdialogs.cpp

@@ -329,7 +329,7 @@ StartApplicationDialog::StartApplicationDialog(QWidget *parent)
             this, &StartApplicationDialog::updateState);
     connect(d->buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
     connect(d->buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
-    connect(d->historyComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged),
+    connect(d->historyComboBox, &QComboBox::currentIndexChanged,
             this, &StartApplicationDialog::historyIndexChanged);
 
     connect(d->channelOverrideEdit, &QLineEdit::textChanged,

src/plugins/debugger/debuggerkitinformation.cpp

@@ -68,7 +68,7 @@ public:
 
         refresh();
         m_comboBox->setToolTip(ki->description());
-        connect(m_comboBox, QOverload<int>::of(&QComboBox::currentIndexChanged),
+        connect(m_comboBox, &QComboBox::currentIndexChanged,
                 this, &DebuggerKitAspectWidget::currentDebuggerChanged);
 
         m_manageButton = createManageButton(ProjectExplorer::Constants::DEBUGGER_SETTINGS_PAGE_ID);

src/plugins/debugger/debuggermainwindow.cpp

@@ -192,7 +192,7 @@ DebuggerMainWindowPrivate::DebuggerMainWindowPrivate(DebuggerMainWindow *parent)
     m_perspectiveChooser->setObjectName("PerspectiveChooser");
     m_perspectiveChooser->setProperty("panelwidget", true);
     m_perspectiveChooser->setSizeAdjustPolicy(QComboBox::AdjustToContents);
-    connect(m_perspectiveChooser, QOverload<int>::of(&QComboBox::activated), this, [this](int item) {
+    connect(m_perspectiveChooser, &QComboBox::activated, this, [this](int item) {
         Perspective *perspective = Perspective::findPerspective(m_perspectiveChooser->itemData(item).toString());
         QTC_ASSERT(perspective, return);
         if (auto subPerspective = Perspective::findPerspective(perspective->d->m_lastActiveSubPerspectiveId))

src/plugins/debugger/enginemanager.cpp

@@ -143,7 +143,7 @@ public:
         if (hideSwitcherUnlessNeeded)
             m_engineChooser->hide();
 
-        connect(m_engineChooser, QOverload<int>::of(&QComboBox::activated),
+        connect(m_engineChooser, &QComboBox::activated,
                 this, &EngineManagerPrivate::activateEngineByIndex);
     }
 

src/plugins/debugger/qml/qmlengine.cpp

@@ -2438,7 +2438,7 @@ void QmlEnginePrivate::stateChanged(State state)
         BreakpointManager::claimBreakpointsForEngine(engine);
 
         // Since the breakpoint claiming is deferred, we need to also defer the connecting
-        QTimer::singleShot(0, this, [this]() {
+        QTimer::singleShot(0, this, [this] {
             /// Start session.
             flushSendBuffer();
             QJsonObject parameters;

src/plugins/debugger/shared/symbolpathsdialog.cpp

@@ -69,8 +69,8 @@ SymbolPathsDialog::SymbolPathsDialog(QWidget *parent) :
     buttonBox->setOrientation(Qt::Horizontal);
     buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
 
-    connect(buttonBox, &QDialogButtonBox::accepted, this, qOverload<>(&QDialog::accept));
+    connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
-    connect(buttonBox, &QDialogButtonBox::rejected, this, qOverload<>(&QDialog::reject));
+    connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
 
     auto horizontalLayout = new QHBoxLayout();
     horizontalLayout->addWidget(m_pixmapLabel);

src/plugins/debugger/stackwindow.cpp

@@ -45,8 +45,7 @@ void StackTreeView::setModel(QAbstractItemModel *model)
     if (model)
         setRootIndex(model->index(0, 0, QModelIndex()));
 
-    connect(static_cast<StackHandler*>(model), &StackHandler::stackChanged,
+    connect(static_cast<StackHandler*>(model), &StackHandler::stackChanged, this, [this] {
-            this, [this]() {
         if (!m_contentsAdjusted)
             adjustForContents();
     });

src/plugins/debugger/threadshandler.cpp

@@ -359,7 +359,7 @@ QPointer<QComboBox> ThreadsHandler::threadSwitcher()
         m_comboBox = new QComboBox;
         m_comboBox->setSizeAdjustPolicy(QComboBox::AdjustToContents);
         m_comboBox->setModel(this);
-        connect(m_comboBox, QOverload<int>::of(&QComboBox::activated), this, [this](int row) {
+        connect(m_comboBox, &QComboBox::activated, this, [this](int row) {
             setData(index(row, 0), {}, BaseTreeView::ItemActivatedRole);
         });
     }

src/plugins/debugger/watchhandler.cpp

@@ -1978,7 +1978,7 @@ QMenu *WatchModel::createFormatMenu(WatchItem *item, QWidget *parent)
                            });
     }
 
-    addAction(this, menu, Tr::tr("Reset All Individual Formats"), true, [this]() {
+    addAction(this, menu, Tr::tr("Reset All Individual Formats"), true, [this] {
         theIndividualFormats.clear();
         saveFormats();
         m_engine->updateLocals();
@@ -2004,7 +2004,7 @@ QMenu *WatchModel::createFormatMenu(WatchItem *item, QWidget *parent)
                            });
     }
 
-    addAction(this, menu, Tr::tr("Reset All Formats for Types"), true, [this]() {
+    addAction(this, menu, Tr::tr("Reset All Formats for Types"), true, [this] {
         theTypeFormats.clear();
         saveFormats();
         m_engine->updateLocals();