diff --git a/src/blackgui/components/audiosetupcomponent.cpp b/src/blackgui/components/audiosetupcomponent.cpp index aff13eb99..4031abfc3 100644 --- a/src/blackgui/components/audiosetupcomponent.cpp +++ b/src/blackgui/components/audiosetupcomponent.cpp @@ -59,9 +59,9 @@ namespace BlackGui ui->cb_SetupAudioLoopback->setChecked(sGui->getIContextAudio()->isAudioLoopbackEnabled()); // the connects depend on initAudioDeviceLists - c = connect(ui->cb_SetupAudioInputDevice, static_cast (&QComboBox::currentIndexChanged), this, &CAudioSetupComponent::onAudioDeviceSelected); + c = connect(ui->cb_SetupAudioInputDevice, qOverload(&QComboBox::currentIndexChanged), this, &CAudioSetupComponent::onAudioDeviceSelected); Q_ASSERT(c); - c = connect(ui->cb_SetupAudioOutputDevice, static_cast (&QComboBox::currentIndexChanged), this, &CAudioSetupComponent::onAudioDeviceSelected); + c = connect(ui->cb_SetupAudioOutputDevice, qOverload(&QComboBox::currentIndexChanged), this, &CAudioSetupComponent::onAudioDeviceSelected); Q_ASSERT(c); // context diff --git a/src/blackgui/components/audiovolumecomponent.cpp b/src/blackgui/components/audiovolumecomponent.cpp index cde91f8b3..3971c87e8 100644 --- a/src/blackgui/components/audiovolumecomponent.cpp +++ b/src/blackgui/components/audiovolumecomponent.cpp @@ -39,7 +39,7 @@ namespace BlackGui c = connect(ui->hs_Volume, &QSlider::valueChanged, this, &CAudioVolumeComponent::ps_changeOutputVolumeFromSlider); Q_ASSERT(c); Q_UNUSED(c); - c = connect(ui->sb_Volume, static_cast (&QSpinBox::valueChanged), this, &CAudioVolumeComponent::ps_changeOutputVolumeFromSpinBox); + c = connect(ui->sb_Volume, qOverload(&QSpinBox::valueChanged), this, &CAudioVolumeComponent::ps_changeOutputVolumeFromSpinBox); Q_ASSERT(c); Q_UNUSED(c); c = connect(ui->pb_Volume100, &QPushButton::clicked, this, &CAudioVolumeComponent::ps_setVolume100); diff --git a/src/blackgui/components/colorselector.cpp b/src/blackgui/components/colorselector.cpp index 4fc1f9d99..9e888aa8a 100644 --- a/src/blackgui/components/colorselector.cpp +++ b/src/blackgui/components/colorselector.cpp @@ -57,7 +57,7 @@ namespace BlackGui completer->setMaxVisibleItems(10); completer->setCompletionMode(QCompleter::PopupCompletion); ui->le_Color->setCompleter(completer); - connect(completer, static_cast(&QCompleter::activated), this, &CColorSelector::setColorByName); + connect(completer, qOverload(&QCompleter::activated), this, &CColorSelector::setColorByName); } CColorSelector::~CColorSelector() { } diff --git a/src/blackgui/components/dbaircrafticaoselectorcomponent.cpp b/src/blackgui/components/dbaircrafticaoselectorcomponent.cpp index ab5f452ef..f5be51eaf 100644 --- a/src/blackgui/components/dbaircrafticaoselectorcomponent.cpp +++ b/src/blackgui/components/dbaircrafticaoselectorcomponent.cpp @@ -201,7 +201,7 @@ namespace BlackGui c->setCompletionMode(QCompleter::PopupCompletion); c->setMaxVisibleItems(10); c->popup()->setMinimumWidth(175); - connect(c, static_cast(&QCompleter::activated), this, &CDbAircraftIcaoSelectorComponent::onCompleterActivated); + connect(c, qOverload(&QCompleter::activated), this, &CDbAircraftIcaoSelectorComponent::onCompleterActivated); ui->le_Aircraft->setCompleter(c); m_completerIcaoDescription.reset(c); // deletes any old completer diff --git a/src/blackgui/components/dbairlineicaoselectorbase.cpp b/src/blackgui/components/dbairlineicaoselectorbase.cpp index a7c990228..ba1988fb1 100644 --- a/src/blackgui/components/dbairlineicaoselectorbase.cpp +++ b/src/blackgui/components/dbairlineicaoselectorbase.cpp @@ -141,7 +141,7 @@ namespace BlackGui { QCompleter *c = this->createCompleter(); Q_ASSERT_X(c, Q_FUNC_INFO, "missing converter"); - connect(c, static_cast(&QCompleter::activated), this, &CDbAirlineIcaoSelectorBase::onCompleterActivated); + connect(c, qOverload(&QCompleter::activated), this, &CDbAirlineIcaoSelectorBase::onCompleterActivated); m_completer.reset(c); // deletes any old completer } else diff --git a/src/blackgui/components/dbcountryselectorcomponent.cpp b/src/blackgui/components/dbcountryselectorcomponent.cpp index b9aefe30d..748281962 100644 --- a/src/blackgui/components/dbcountryselectorcomponent.cpp +++ b/src/blackgui/components/dbcountryselectorcomponent.cpp @@ -165,7 +165,7 @@ namespace BlackGui c->setCaseSensitivity(Qt::CaseInsensitive); c->setCompletionMode(QCompleter::PopupCompletion); c->setMaxVisibleItems(10); - connect(c, static_cast(&QCompleter::activated), this, &CDbCountrySelectorComponent::onCompleterActivated); + connect(c, qOverload(&QCompleter::activated), this, &CDbCountrySelectorComponent::onCompleterActivated); ui->le_CountryName->setCompleter(c); m_completerCountryNames.reset(c); // deletes any old completer diff --git a/src/blackgui/components/dbdistributorselectorcomponent.cpp b/src/blackgui/components/dbdistributorselectorcomponent.cpp index cecb85025..f0440503d 100644 --- a/src/blackgui/components/dbdistributorselectorcomponent.cpp +++ b/src/blackgui/components/dbdistributorselectorcomponent.cpp @@ -184,7 +184,7 @@ namespace BlackGui c->setCaseSensitivity(Qt::CaseInsensitive); c->setCompletionMode(QCompleter::PopupCompletion); c->setMaxVisibleItems(10); - connect(c, static_cast(&QCompleter::activated), this, &CDbDistributorSelectorComponent::onCompleterActivated); + connect(c, qOverload(&QCompleter::activated), this, &CDbDistributorSelectorComponent::onCompleterActivated); ui->le_Distributor->setCompleter(c); m_completerDistributors.reset(c); // deletes any old completer diff --git a/src/blackgui/components/dbliveryselectorcomponent.cpp b/src/blackgui/components/dbliveryselectorcomponent.cpp index 1347c977c..351eb206e 100644 --- a/src/blackgui/components/dbliveryselectorcomponent.cpp +++ b/src/blackgui/components/dbliveryselectorcomponent.cpp @@ -196,7 +196,7 @@ namespace BlackGui c->setCaseSensitivity(Qt::CaseInsensitive); c->setCompletionMode(QCompleter::PopupCompletion); c->setMaxVisibleItems(10); - connect(c, static_cast(&QCompleter::activated), this, &CDbLiverySelectorComponent::onCompleterActivated); + connect(c, qOverload(&QCompleter::activated), this, &CDbLiverySelectorComponent::onCompleterActivated); ui->le_Livery->setCompleter(c); m_completerLiveries.reset(c); // deletes any old completer diff --git a/src/blackgui/components/hotkeydialog.cpp b/src/blackgui/components/hotkeydialog.cpp index 9ce8460a0..977d19635 100644 --- a/src/blackgui/components/hotkeydialog.cpp +++ b/src/blackgui/components/hotkeydialog.cpp @@ -100,7 +100,7 @@ namespace BlackGui connect(ui->pb_Accept, &QPushButton::clicked, this, &CHotkeyDialog::accept); connect(ui->pb_Cancel, &QPushButton::clicked, this, &CHotkeyDialog::reject); connect(ui->tv_Actions->selectionModel(), &QItemSelectionModel::selectionChanged, this, &CHotkeyDialog::changeSelectedAction); - connect(ui->cb_Identifier, static_cast(&QComboBox::currentIndexChanged), this, &CHotkeyDialog::changeApplicableMachine); + connect(ui->cb_Identifier, qOverload(&QComboBox::currentIndexChanged), this, &CHotkeyDialog::changeApplicableMachine); if (sGui) { @@ -116,7 +116,7 @@ namespace BlackGui CKeySelectionBox::CKeySelectionBox(QWidget *parent) : CHorizontalComboBox(parent) { - connect(this, static_cast(&CKeySelectionBox::currentIndexChanged), this, &CKeySelectionBox::updateSelectedIndex); + connect(this, qOverload(&CKeySelectionBox::currentIndexChanged), this, &CKeySelectionBox::updateSelectedIndex); } void CKeySelectionBox::setSelectedIndex(int index) diff --git a/src/blackgui/components/selcalcodeselector.cpp b/src/blackgui/components/selcalcodeselector.cpp index caacc5c2b..663bec5c0 100644 --- a/src/blackgui/components/selcalcodeselector.cpp +++ b/src/blackgui/components/selcalcodeselector.cpp @@ -35,8 +35,8 @@ namespace BlackGui ui->cb_SelcalPairs1->setStyleSheet("combobox-popup: 0;"); ui->cb_SelcalPairs2->setStyleSheet("combobox-popup: 0;"); - connect(ui->cb_SelcalPairs1, static_cast(&QComboBox::currentIndexChanged), this, &CSelcalCodeSelector::selcalIndexChanged); - connect(ui->cb_SelcalPairs2, static_cast(&QComboBox::currentIndexChanged), this, &CSelcalCodeSelector::selcalIndexChanged); + connect(ui->cb_SelcalPairs1, qOverload(&QComboBox::currentIndexChanged), this, &CSelcalCodeSelector::selcalIndexChanged); + connect(ui->cb_SelcalPairs2, qOverload(&QComboBox::currentIndexChanged), this, &CSelcalCodeSelector::selcalIndexChanged); } CSelcalCodeSelector::~CSelcalCodeSelector() diff --git a/src/blackgui/components/settingsguicomponent.cpp b/src/blackgui/components/settingsguicomponent.cpp index 575a12950..06e60b82e 100644 --- a/src/blackgui/components/settingsguicomponent.cpp +++ b/src/blackgui/components/settingsguicomponent.cpp @@ -38,7 +38,7 @@ namespace BlackGui // Widget style connect(ui->hs_SettingsGuiOpacity, &QSlider::valueChanged, this, &CSettingsGuiComponent::changedWindowsOpacity); - connect(ui->cb_SettingsGuiWidgetStyle, static_cast(&QComboBox::currentIndexChanged), + connect(ui->cb_SettingsGuiWidgetStyle, qOverload(&QComboBox::currentIndexChanged), this, &CSettingsGuiComponent::widgetStyleChanged); // selection diff --git a/src/blackgui/components/weathercomponent.cpp b/src/blackgui/components/weathercomponent.cpp index 56fd36216..f9cfc7afb 100644 --- a/src/blackgui/components/weathercomponent.cpp +++ b/src/blackgui/components/weathercomponent.cpp @@ -197,8 +197,7 @@ namespace BlackGui void CWeatherComponent::setupConnections() { // UI connections - connect(ui->cb_weatherScenario, static_cast(&QComboBox::currentIndexChanged), - this, &CWeatherComponent::setWeatherScenario); + connect(ui->cb_weatherScenario, qOverload(&QComboBox::currentIndexChanged), this, &CWeatherComponent::setWeatherScenario); connect(m_coordinateDialog.data(), &CCoordinateDialog::changedCoordinate, this, &CWeatherComponent::updateWeatherInformation); connect(ui->cb_UseOwnAcftPosition, &QCheckBox::toggled, this, &CWeatherComponent::toggleUseOwnAircraftPosition); connect(&m_weatherUpdateTimer, &QTimer::timeout, this, &CWeatherComponent::updateWeatherInformation); diff --git a/src/blackgui/infoarea.cpp b/src/blackgui/infoarea.cpp index 38e6912e6..f97dcf502 100644 --- a/src/blackgui/infoarea.cpp +++ b/src/blackgui/infoarea.cpp @@ -129,8 +129,7 @@ namespace BlackGui signalMapperToggleFloating->setMapping(toggleFloatingMenuAction, i); } - // new syntax not yet possible because of overloaded signal - c = connect(signalMapperToggleFloating, static_cast(&QSignalMapper::mapped), this, &CInfoArea::toggleFloatingByIndex); + c = connect(signalMapperToggleFloating, qOverload(&QSignalMapper::mapped), this, &CInfoArea::toggleFloatingByIndex); BLACK_VERIFY_X(c, Q_FUNC_INFO, "Cannot connect mapper"); // do not make that shutdown reason in a release build menu->addMenu(subMenuDisplay); diff --git a/src/blackgui/pluginselector.cpp b/src/blackgui/pluginselector.cpp index 39f580843..72ddd4bd8 100644 --- a/src/blackgui/pluginselector.cpp +++ b/src/blackgui/pluginselector.cpp @@ -28,8 +28,8 @@ namespace BlackGui QVBoxLayout *layout = new QVBoxLayout; setLayout(layout); - connect(m_detailsButtonMapper, static_cast(&QSignalMapper::mapped), this, &CPluginSelector::pluginDetailsRequested); - connect(m_configButtonMapper, static_cast(&QSignalMapper::mapped), this, &CPluginSelector::pluginConfigRequested); + connect(m_detailsButtonMapper, qOverload(&QSignalMapper::mapped), this, &CPluginSelector::pluginDetailsRequested); + connect(m_configButtonMapper, qOverload(&QSignalMapper::mapped), this, &CPluginSelector::pluginConfigRequested); } void CPluginSelector::addPlugin(const QString &identifier, const QString &name, bool hasConfig, bool enabled) @@ -62,13 +62,13 @@ namespace BlackGui { QPushButton *config = new QPushButton("..."); m_configButtonMapper->setMapping(config, identifier); - connect(config, &QPushButton::clicked, m_configButtonMapper, static_cast(&QSignalMapper::map)); + connect(config, &QPushButton::clicked, m_configButtonMapper, qOverload<>(&QSignalMapper::map)); pw->layout()->addWidget(config); } QPushButton *details = new QPushButton("?"); m_detailsButtonMapper->setMapping(details, identifier); - connect(details, &QPushButton::clicked, m_detailsButtonMapper, static_cast(&QSignalMapper::map)); + connect(details, &QPushButton::clicked, m_detailsButtonMapper, qOverload<>(&QSignalMapper::map)); pw->layout()->addWidget(details); layout->setStretch(0, 1);