From ae4db886f3b24dc0069d33cf55ba1365c70ccfe9 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Tue, 19 Jul 2022 22:46:47 +0200 Subject: [PATCH] Drop Qt5: BareMetal: Get rid of QOverload Change-Id: I023dee34b3b3556376c3cad5cbff919e6a85769c Reviewed-by: hjk --- src/plugins/baremetal/debugserverproviderchooser.cpp | 2 +- .../debugservers/gdb/eblinkgdbserverprovider.cpp | 9 +++------ .../baremetal/debugservers/gdb/gdbserverprovider.cpp | 4 +--- .../debugservers/gdb/jlinkgdbserverprovider.cpp | 6 +++--- .../debugservers/gdb/openocdgdbserverprovider.cpp | 2 +- .../debugservers/gdb/stlinkutilgdbserverprovider.cpp | 6 ++---- .../debugservers/uvsc/jlinkuvscserverprovider.cpp | 6 ++---- .../debugservers/uvsc/stlinkuvscserverprovider.cpp | 6 ++---- .../debugservers/uvsc/uvtargetdeviceselection.cpp | 5 ++--- .../baremetal/debugservers/uvsc/uvtargetdeviceviewer.cpp | 2 +- .../debugservers/uvsc/uvtargetdriverselection.cpp | 2 +- src/plugins/baremetal/idebugserverprovider.cpp | 6 ++---- 12 files changed, 21 insertions(+), 35 deletions(-) diff --git a/src/plugins/baremetal/debugserverproviderchooser.cpp b/src/plugins/baremetal/debugserverproviderchooser.cpp index 0f8ecd2a2d2..0b63d041357 100644 --- a/src/plugins/baremetal/debugserverproviderchooser.cpp +++ b/src/plugins/baremetal/debugserverproviderchooser.cpp @@ -57,7 +57,7 @@ DebugServerProviderChooser::DebugServerProviderChooser( layout->addWidget(m_manageButton); setFocusProxy(m_manageButton); - connect(m_chooser, QOverload::of(&QComboBox::currentIndexChanged), + connect(m_chooser, &QComboBox::currentIndexChanged, this, &DebugServerProviderChooser::currentIndexChanged); connect(m_manageButton, &QAbstractButton::clicked, this, &DebugServerProviderChooser::manageButtonClicked); diff --git a/src/plugins/baremetal/debugservers/gdb/eblinkgdbserverprovider.cpp b/src/plugins/baremetal/debugservers/gdb/eblinkgdbserverprovider.cpp index e098c5e6191..f5cc471ca7f 100644 --- a/src/plugins/baremetal/debugservers/gdb/eblinkgdbserverprovider.cpp +++ b/src/plugins/baremetal/debugservers/gdb/eblinkgdbserverprovider.cpp @@ -304,11 +304,9 @@ EBlinkGdbServerProviderConfigWidget::EBlinkGdbServerProviderConfigWidget( this, &GdbServerProviderConfigWidget::dirty); connect(m_scriptFileChooser, &Utils::PathChooser::rawPathChanged, this, &GdbServerProviderConfigWidget::dirty); - connect(m_verboseLevelSpinBox, - QOverload::of(&QSpinBox::valueChanged), + connect(m_verboseLevelSpinBox, &QSpinBox::valueChanged, this, &GdbServerProviderConfigWidget::dirty); - connect(m_interfaceSpeedSpinBox, - QOverload::of(&QSpinBox::valueChanged), + connect(m_interfaceSpeedSpinBox, &QSpinBox::valueChanged, this, &GdbServerProviderConfigWidget::dirty); connect(m_notUseCacheCheckBox, &QAbstractButton::clicked, this, &GdbServerProviderConfigWidget::dirty); @@ -316,8 +314,7 @@ EBlinkGdbServerProviderConfigWidget::EBlinkGdbServerProviderConfigWidget( this, &GdbServerProviderConfigWidget::dirty); connect(m_resetOnConnectCheckBox, &QAbstractButton::clicked, this, &GdbServerProviderConfigWidget::dirty); - connect(m_interfaceTypeComboBox, - QOverload::of(&QComboBox::currentIndexChanged), + connect(m_interfaceTypeComboBox, &QComboBox::currentIndexChanged, this, &GdbServerProviderConfigWidget::dirty); connect(m_initCommandsTextEdit, &QPlainTextEdit::textChanged, this, &GdbServerProviderConfigWidget::dirty); diff --git a/src/plugins/baremetal/debugservers/gdb/gdbserverprovider.cpp b/src/plugins/baremetal/debugservers/gdb/gdbserverprovider.cpp index 4ac1bb969d7..b71954eb577 100644 --- a/src/plugins/baremetal/debugservers/gdb/gdbserverprovider.cpp +++ b/src/plugins/baremetal/debugservers/gdb/gdbserverprovider.cpp @@ -239,10 +239,8 @@ GdbServerProviderConfigWidget::GdbServerProviderConfigWidget( populateStartupModes(); setFromProvider(); - connect(m_startupModeComboBox, - QOverload::of(&QComboBox::currentIndexChanged), + connect(m_startupModeComboBox, &QComboBox::currentIndexChanged, this, &GdbServerProviderConfigWidget::dirty); - connect(m_peripheralDescriptionFileChooser, &PathChooser::filePathChanged, this, &GdbServerProviderConfigWidget::dirty); } diff --git a/src/plugins/baremetal/debugservers/gdb/jlinkgdbserverprovider.cpp b/src/plugins/baremetal/debugservers/gdb/jlinkgdbserverprovider.cpp index 42f8973d650..37986607392 100644 --- a/src/plugins/baremetal/debugservers/gdb/jlinkgdbserverprovider.cpp +++ b/src/plugins/baremetal/debugservers/gdb/jlinkgdbserverprovider.cpp @@ -280,11 +280,11 @@ JLinkGdbServerProviderConfigWidget::JLinkGdbServerProviderConfigWidget( connect(m_targetInterfaceSpeedComboBox, &QComboBox::currentTextChanged, this, &GdbServerProviderConfigWidget::dirty); - connect(m_hostInterfaceComboBox, QOverload::of(&QComboBox::currentIndexChanged), + connect(m_hostInterfaceComboBox, &QComboBox::currentIndexChanged, this, &JLinkGdbServerProviderConfigWidget::updateAllowedControls); - connect(m_targetInterfaceComboBox, QOverload::of(&QComboBox::currentIndexChanged), + connect(m_targetInterfaceComboBox, &QComboBox::currentIndexChanged, this, &JLinkGdbServerProviderConfigWidget::updateAllowedControls); - connect(m_targetInterfaceSpeedComboBox, QOverload::of(&QComboBox::currentIndexChanged), + connect(m_targetInterfaceSpeedComboBox, &QComboBox::currentIndexChanged, this, &JLinkGdbServerProviderConfigWidget::updateAllowedControls); } diff --git a/src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.cpp b/src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.cpp index 8d6431e0fc8..fae54f5e95d 100644 --- a/src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.cpp +++ b/src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.cpp @@ -247,7 +247,7 @@ OpenOcdGdbServerProviderConfigWidget::OpenOcdGdbServerProviderConfigWidget( connect(m_resetCommandsTextEdit, &QPlainTextEdit::textChanged, this, &GdbServerProviderConfigWidget::dirty); - connect(m_startupModeComboBox, QOverload::of(&QComboBox::currentIndexChanged), + connect(m_startupModeComboBox, &QComboBox::currentIndexChanged, this, &OpenOcdGdbServerProviderConfigWidget::startupModeChanged); } diff --git a/src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.cpp b/src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.cpp index 7cd8d3f7002..dfdc8106e0a 100644 --- a/src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.cpp +++ b/src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.cpp @@ -230,15 +230,13 @@ StLinkUtilGdbServerProviderConfigWidget::StLinkUtilGdbServerProviderConfigWidget connect(m_executableFileChooser, &Utils::PathChooser::rawPathChanged, this, &GdbServerProviderConfigWidget::dirty); - connect(m_verboseLevelSpinBox, - QOverload::of(&QSpinBox::valueChanged), + connect(m_verboseLevelSpinBox, &QSpinBox::valueChanged, this, &GdbServerProviderConfigWidget::dirty); connect(m_extendedModeCheckBox, &QAbstractButton::clicked, this, &GdbServerProviderConfigWidget::dirty); connect(m_resetBoardCheckBox, &QAbstractButton::clicked, this, &GdbServerProviderConfigWidget::dirty); - connect(m_transportLayerComboBox, - QOverload::of(&QComboBox::currentIndexChanged), + connect(m_transportLayerComboBox, &QComboBox::currentIndexChanged, this, &GdbServerProviderConfigWidget::dirty); connect(m_initCommandsTextEdit, &QPlainTextEdit::textChanged, diff --git a/src/plugins/baremetal/debugservers/uvsc/jlinkuvscserverprovider.cpp b/src/plugins/baremetal/debugservers/uvsc/jlinkuvscserverprovider.cpp index 60ba7eff8aa..86054a00b6d 100644 --- a/src/plugins/baremetal/debugservers/uvsc/jlinkuvscserverprovider.cpp +++ b/src/plugins/baremetal/debugservers/uvsc/jlinkuvscserverprovider.cpp @@ -297,13 +297,11 @@ JLinkUvscAdapterOptionsWidget::JLinkUvscAdapterOptionsWidget(QWidget *parent) populatePorts(); - connect(m_portBox, QOverload::of(&QComboBox::currentIndexChanged), - this, [this](int index) { - Q_UNUSED(index); + connect(m_portBox, &QComboBox::currentIndexChanged, this, [this] { populateSpeeds(); emit optionsChanged(); }); - connect(m_speedBox, QOverload::of(&QComboBox::currentIndexChanged), + connect(m_speedBox, &QComboBox::currentIndexChanged, this, &JLinkUvscAdapterOptionsWidget::optionsChanged); } diff --git a/src/plugins/baremetal/debugservers/uvsc/stlinkuvscserverprovider.cpp b/src/plugins/baremetal/debugservers/uvsc/stlinkuvscserverprovider.cpp index 717c7b9ce98..177b07decc6 100644 --- a/src/plugins/baremetal/debugservers/uvsc/stlinkuvscserverprovider.cpp +++ b/src/plugins/baremetal/debugservers/uvsc/stlinkuvscserverprovider.cpp @@ -253,13 +253,11 @@ StLinkUvscAdapterOptionsWidget::StLinkUvscAdapterOptionsWidget(QWidget *parent) populatePorts(); - connect(m_portBox, QOverload::of(&QComboBox::currentIndexChanged), - this, [this](int index) { - Q_UNUSED(index); + connect(m_portBox, &QComboBox::currentIndexChanged, this, [this] { populateSpeeds(); emit optionsChanged(); }); - connect(m_speedBox, QOverload::of(&QComboBox::currentIndexChanged), + connect(m_speedBox, &QComboBox::currentIndexChanged, this, &StLinkUvscAdapterOptionsWidget::optionsChanged); } diff --git a/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceselection.cpp b/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceselection.cpp index 4c287199cdd..28483b89858 100644 --- a/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceselection.cpp +++ b/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceselection.cpp @@ -427,13 +427,12 @@ DeviceSelectionAlgorithmView::DeviceSelectionAlgorithmView(DeviceSelection &sele mapper->addMapping(ramStartEdit, DeviceSelectionAlgorithmItem::RamStartColumn); mapper->addMapping(ramSizeEdit, DeviceSelectionAlgorithmItem::RamSizeColumn); - connect(m_comboBox, QOverload::of(&QComboBox::currentIndexChanged), - this, [mapper, this](int index) { + connect(m_comboBox, &QComboBox::currentIndexChanged, this, [mapper, this](int index) { mapper->setCurrentIndex(index); emit algorithmChanged(index); }); - connect(model, &DeviceSelectionAlgorithmModel::dataChanged, this, [this]() { + connect(model, &DeviceSelectionAlgorithmModel::dataChanged, this, [this] { emit algorithmChanged(-1); }); diff --git a/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceviewer.cpp b/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceviewer.cpp index b35053fc985..c0a120bb105 100644 --- a/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceviewer.cpp +++ b/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceviewer.cpp @@ -136,7 +136,7 @@ DeviceSelector::DeviceSelector(QWidget *parent) const auto detailsPanel = new DeviceSelectorDetailsPanel(m_selection); setWidget(detailsPanel); - connect(toolPanel, &DeviceSelectorToolPanel::clicked, this, [this]() { + connect(toolPanel, &DeviceSelectorToolPanel::clicked, this, [this] { DeviceSelectionDialog dialog(m_toolsIniFile, this); const int result = dialog.exec(); if (result != QDialog::Accepted) diff --git a/src/plugins/baremetal/debugservers/uvsc/uvtargetdriverselection.cpp b/src/plugins/baremetal/debugservers/uvsc/uvtargetdriverselection.cpp index c8ab64a1335..ad5a5053e61 100644 --- a/src/plugins/baremetal/debugservers/uvsc/uvtargetdriverselection.cpp +++ b/src/plugins/baremetal/debugservers/uvsc/uvtargetdriverselection.cpp @@ -132,7 +132,7 @@ DriverSelectionCpuDllView::DriverSelectionCpuDllView(DriverSelection &selection, layout->addWidget(m_comboBox); setLayout(layout); - connect(m_comboBox, QOverload::of(&QComboBox::currentIndexChanged), + connect(m_comboBox, &QComboBox::currentIndexChanged, this, &DriverSelectionCpuDllView::dllChanged); } diff --git a/src/plugins/baremetal/idebugserverprovider.cpp b/src/plugins/baremetal/idebugserverprovider.cpp index 553a0f76568..272d3ca03eb 100644 --- a/src/plugins/baremetal/idebugserverprovider.cpp +++ b/src/plugins/baremetal/idebugserverprovider.cpp @@ -348,10 +348,8 @@ HostWidget::HostWidget(QWidget *parent) layout->addWidget(m_hostLineEdit); layout->addWidget(m_portSpinBox); - connect(m_hostLineEdit, &QLineEdit::textChanged, - this, &HostWidget::dataChanged); - connect(m_portSpinBox, QOverload::of(&QSpinBox::valueChanged), - this, &HostWidget::dataChanged); + connect(m_hostLineEdit, &QLineEdit::textChanged, this, &HostWidget::dataChanged); + connect(m_portSpinBox, &QSpinBox::valueChanged, this, &HostWidget::dataChanged); } void HostWidget::setChannel(const QUrl &channel)