From 24b8e654a0d6485d447da54ba017a1eb9ec3f22d Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Thu, 26 Mar 2020 15:15:07 +0100 Subject: Fix assorted QComboBox::currentIndexChanged overload compile errors Change-Id: I9d1c9126b526161aa58c9068bca30ef6dd1ac7fb Reviewed-by: Friedemann Kleint --- src/assistant/assistant/bookmarkdialog.cpp | 2 +- src/assistant/assistant/preferencesdialog.cpp | 4 ++-- src/designer/src/components/formeditor/dpi_chooser.cpp | 2 +- src/designer/src/components/formeditor/embeddedoptionspage.cpp | 2 +- src/designer/src/designer/qdesigner_appearanceoptions.cpp | 2 +- src/designer/src/lib/shared/formlayoutmenu.cpp | 2 +- src/designer/src/lib/shared/newformwidget.cpp | 2 +- src/designer/src/lib/shared/previewconfigurationwidget.cpp | 2 +- src/shared/fontpanel/fontpanel.cpp | 6 +++--- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/assistant/assistant/bookmarkdialog.cpp b/src/assistant/assistant/bookmarkdialog.cpp index 1ffe6dc84..8207da04e 100644 --- a/src/assistant/assistant/bookmarkdialog.cpp +++ b/src/assistant/assistant/bookmarkdialog.cpp @@ -60,7 +60,7 @@ BookmarkDialog::BookmarkDialog(BookmarkModel *sourceModel, const QString &title, bookmarkProxyModel = new BookmarkFilterModel(this); bookmarkProxyModel->setSourceModel(bookmarkModel); ui.bookmarkFolders->setModel(bookmarkProxyModel); - connect(ui.bookmarkFolders, QOverload::of(&QComboBox::currentIndexChanged), + connect(ui.bookmarkFolders, QOverload::of(&QComboBox::currentIndexChanged), this, QOverload::of(&BookmarkDialog::currentIndexChanged)); bookmarkTreeModel = new BookmarkTreeModel(this); diff --git a/src/assistant/assistant/preferencesdialog.cpp b/src/assistant/assistant/preferencesdialog.cpp index 5dd24a102..ebd2a96e8 100644 --- a/src/assistant/assistant/preferencesdialog.cpp +++ b/src/assistant/assistant/preferencesdialog.cpp @@ -200,13 +200,13 @@ void PreferencesDialog::updateFontSettingsPage() const QList &appCombos = m_appFontPanel->findChildren(); for (QComboBox* box : appCombos) { - connect(box, QOverload::of(&QComboBox::currentIndexChanged), + connect(box, QOverload::of(&QComboBox::currentIndexChanged), this, &PreferencesDialog::appFontSettingChanged); } const QList &browserCombos = m_browserFontPanel->findChildren(); for (QComboBox* box : browserCombos) { - connect(box, QOverload::of(&QComboBox::currentIndexChanged), + connect(box, QOverload::of(&QComboBox::currentIndexChanged), this, &PreferencesDialog::browserFontSettingChanged); } } diff --git a/src/designer/src/components/formeditor/dpi_chooser.cpp b/src/designer/src/components/formeditor/dpi_chooser.cpp index a254bf12a..5e2f9f605 100644 --- a/src/designer/src/components/formeditor/dpi_chooser.cpp +++ b/src/designer/src/components/formeditor/dpi_chooser.cpp @@ -94,7 +94,7 @@ DPI_Chooser::DPI_Chooser(QWidget *parent) : setFocusProxy(m_predefinedCombo); m_predefinedCombo->setEditable(false); m_predefinedCombo->setCurrentIndex(0); - connect(m_predefinedCombo, QOverload::of(&QComboBox::currentIndexChanged), + connect(m_predefinedCombo, QOverload::of(&QComboBox::currentIndexChanged), this, &DPI_Chooser::syncSpinBoxes); // top row with predefined settings QVBoxLayout *vBoxLayout = new QVBoxLayout; diff --git a/src/designer/src/components/formeditor/embeddedoptionspage.cpp b/src/designer/src/components/formeditor/embeddedoptionspage.cpp index 062fc6e4f..85cc1f930 100644 --- a/src/designer/src/components/formeditor/embeddedoptionspage.cpp +++ b/src/designer/src/components/formeditor/embeddedoptionspage.cpp @@ -145,7 +145,7 @@ void EmbeddedOptionsControlPrivate::init(EmbeddedOptionsControl *q) m_profileCombo->setEditable(false); hLayout->addWidget(m_profileCombo); m_profileCombo->addItem(EmbeddedOptionsControl::tr("None")); - EmbeddedOptionsControl::connect(m_profileCombo, QOverload::of(&QComboBox::currentIndexChanged), + EmbeddedOptionsControl::connect(m_profileCombo, QOverload::of(&QComboBox::currentIndexChanged), m_q, &EmbeddedOptionsControl::slotProfileIndexChanged); m_addButton->setIcon(createIconSet(QString::fromUtf8("plus.png"))); diff --git a/src/designer/src/designer/qdesigner_appearanceoptions.cpp b/src/designer/src/designer/qdesigner_appearanceoptions.cpp index fbcfacc6e..66eb49c9f 100644 --- a/src/designer/src/designer/qdesigner_appearanceoptions.cpp +++ b/src/designer/src/designer/qdesigner_appearanceoptions.cpp @@ -65,7 +65,7 @@ QDesignerAppearanceOptionsWidget::QDesignerAppearanceOptionsWidget(QWidget *pare m_ui->m_uiModeCombo->addItem(tr("Docked Window"), QVariant(DockedMode)); m_ui->m_uiModeCombo->addItem(tr("Multiple Top-Level Windows"), QVariant(TopLevelMode)); - connect(m_ui->m_uiModeCombo, QOverload::of(&QComboBox::currentIndexChanged), + connect(m_ui->m_uiModeCombo, QOverload::of(&QComboBox::currentIndexChanged), this, &QDesignerAppearanceOptionsWidget::slotUiModeComboChanged); m_ui->m_fontPanel->setCheckable(true); diff --git a/src/designer/src/lib/shared/formlayoutmenu.cpp b/src/designer/src/lib/shared/formlayoutmenu.cpp index 58631b5db..48d6ee488 100644 --- a/src/designer/src/lib/shared/formlayoutmenu.cpp +++ b/src/designer/src/lib/shared/formlayoutmenu.cpp @@ -154,7 +154,7 @@ FormLayoutRowDialog::FormLayoutRowDialog(QDesignerFormEditorInterface *core, m_ui.fieldClassComboBox->addItems(fieldWidgetClasses(core)); m_ui.fieldClassComboBox->setCurrentIndex(0); connect(m_ui.fieldClassComboBox, - QOverload::of(&QComboBox::currentIndexChanged), + QOverload::of(&QComboBox::currentIndexChanged), this, &FormLayoutRowDialog::fieldClassChanged); updateOkButton(); diff --git a/src/designer/src/lib/shared/newformwidget.cpp b/src/designer/src/lib/shared/newformwidget.cpp index 67e08c475..dda60fd16 100644 --- a/src/designer/src/lib/shared/newformwidget.cpp +++ b/src/designer/src/lib/shared/newformwidget.cpp @@ -179,7 +179,7 @@ NewFormWidget::NewFormWidget(QDesignerFormEditorInterface *core, QWidget *parent m_deviceProfiles = settings.deviceProfiles(); m_ui->profileComboBox->addItem(tr("None")); connect(m_ui->profileComboBox, - QOverload::of(&QComboBox::currentIndexChanged), + QOverload::of(&QComboBox::currentIndexChanged), this, &NewFormWidget::slotDeviceProfileIndexChanged); if (m_deviceProfiles.isEmpty()) { m_ui->profileComboBox->setEnabled(false); diff --git a/src/designer/src/lib/shared/previewconfigurationwidget.cpp b/src/designer/src/lib/shared/previewconfigurationwidget.cpp index 1f7649975..4aa68d083 100644 --- a/src/designer/src/lib/shared/previewconfigurationwidget.cpp +++ b/src/designer/src/lib/shared/previewconfigurationwidget.cpp @@ -317,7 +317,7 @@ PreviewConfigurationWidget::PreviewConfigurationWidget(QDesignerFormEditorInterf this, &PreviewConfigurationWidget::slotEditAppStyleSheet); connect(m_impl->skinRemoveButton(), &QAbstractButton::clicked, this, &PreviewConfigurationWidget::slotDeleteSkinEntry); - connect(m_impl->skinCombo(), QOverload::of(&QComboBox::currentIndexChanged), + connect(m_impl->skinCombo(), QOverload::of(&QComboBox::currentIndexChanged), this, &PreviewConfigurationWidget::slotSkinChanged); m_impl->retrieveSettings(); diff --git a/src/shared/fontpanel/fontpanel.cpp b/src/shared/fontpanel/fontpanel.cpp index 325dad205..2645d992e 100644 --- a/src/shared/fontpanel/fontpanel.cpp +++ b/src/shared/fontpanel/fontpanel.cpp @@ -68,7 +68,7 @@ FontPanel::FontPanel(QWidget *parentWidget) : writingSystems.push_front(QFontDatabase::Any); for (QFontDatabase::WritingSystem ws : qAsConst(writingSystems)) m_writingSystemComboBox->addItem(QFontDatabase::writingSystemName(ws), QVariant(ws)); - connect(m_writingSystemComboBox, QOverload::of(&QComboBox::currentIndexChanged), + connect(m_writingSystemComboBox, QOverload::of(&QComboBox::currentIndexChanged), this, &FontPanel::slotWritingSystemChanged); formLayout->addRow(tr("&Writing system"), m_writingSystemComboBox); @@ -77,12 +77,12 @@ FontPanel::FontPanel(QWidget *parentWidget) : formLayout->addRow(tr("&Family"), m_familyComboBox); m_styleComboBox->setEditable(false); - connect(m_styleComboBox, QOverload::of(&QComboBox::currentIndexChanged), + connect(m_styleComboBox, QOverload::of(&QComboBox::currentIndexChanged), this, &FontPanel::slotStyleChanged); formLayout->addRow(tr("&Style"), m_styleComboBox); m_pointSizeComboBox->setEditable(false); - connect(m_pointSizeComboBox, QOverload::of(&QComboBox::currentIndexChanged), + connect(m_pointSizeComboBox, QOverload::of(&QComboBox::currentIndexChanged), this, &FontPanel::slotPointSizeChanged); formLayout->addRow(tr("&Point size"), m_pointSizeComboBox); -- cgit v1.2.3