From cd065dc69f04e84e3f2c866d8e9346d2dfd2c6a5 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Mon, 27 Sep 2021 08:56:11 +0200 Subject: [PATCH] Not necessary to use qoverload here --- src/collectionpage/collectionexpirywidget.cpp | 4 ++-- src/filter/dialog/selectthunderbirdfilterfileswidget.cpp | 2 +- src/filter/filteractions/filteractionaddheader.cpp | 2 +- .../filteractions/filteractionaddtoaddressbook.cpp | 9 +++------ src/filter/filteractions/filteractionforward.cpp | 2 +- src/filter/filteractions/filteractionremoveheader.cpp | 2 +- src/filter/filteractions/filteractionrewriteheader.cpp | 2 +- src/filter/filteractions/filteractionsettransport.cpp | 2 +- src/filter/tests/filterimporterexportergui.cpp | 2 +- src/folder/folderselectiondialog.cpp | 5 +---- 10 files changed, 13 insertions(+), 19 deletions(-) diff --git a/src/collectionpage/collectionexpirywidget.cpp b/src/collectionpage/collectionexpirywidget.cpp index 21de64d..4815d44 100644 --- a/src/collectionpage/collectionexpirywidget.cpp +++ b/src/collectionpage/collectionexpirywidget.cpp @@ -70,10 +70,10 @@ CollectionExpiryWidget::CollectionExpiryWidget(QWidget *parent) auto formLayout = new QFormLayout(this); formLayout->setContentsMargins({}); - connect(mExpireReadMailSB, qOverload(&KPluralHandlingSpinBox::valueChanged), this, &CollectionExpiryWidget::slotChanged); + connect(mExpireReadMailSB, &KPluralHandlingSpinBox::valueChanged, this, &CollectionExpiryWidget::slotChanged); formLayout->addRow(i18n("Expire read messages after:"), mExpireReadMailSB); - connect(mExpireUnreadMailSB, qOverload(&KPluralHandlingSpinBox::valueChanged), this, &CollectionExpiryWidget::slotChanged); + connect(mExpireUnreadMailSB, &KPluralHandlingSpinBox::valueChanged, this, &CollectionExpiryWidget::slotChanged); formLayout->addRow(i18n("Expire unread messages after:"), mExpireUnreadMailSB); connect(mExpireMailWithInvalidDateCB, &QCheckBox::toggled, this, &CollectionExpiryWidget::slotChanged); diff --git a/src/filter/dialog/selectthunderbirdfilterfileswidget.cpp b/src/filter/dialog/selectthunderbirdfilterfileswidget.cpp index da1aa7d..bceb6ca 100644 --- a/src/filter/dialog/selectthunderbirdfilterfileswidget.cpp +++ b/src/filter/dialog/selectthunderbirdfilterfileswidget.cpp @@ -19,7 +19,7 @@ SelectThunderbirdFilterFilesWidget::SelectThunderbirdFilterFilesWidget(const QSt { ui->setupUi(this); connect(ui->buttonGroup, &QButtonGroup::buttonClicked, this, &SelectThunderbirdFilterFilesWidget::slotButtonClicked); - connect(ui->profiles, qOverload(&KComboBox::currentIndexChanged), this, &SelectThunderbirdFilterFilesWidget::slotProfileChanged); + connect(ui->profiles, &KComboBox::currentIndexChanged, this, &SelectThunderbirdFilterFilesWidget::slotProfileChanged); ui->listFiles->setSelectionMode(QAbstractItemView::MultiSelection); QString defaultProfile; diff --git a/src/filter/filteractions/filteractionaddheader.cpp b/src/filter/filteractions/filteractionaddheader.cpp index 5c4ddfd..05ad1b2 100644 --- a/src/filter/filteractions/filteractionaddheader.cpp +++ b/src/filter/filteractions/filteractionaddheader.cpp @@ -85,7 +85,7 @@ QWidget *FilterActionAddHeader::createParamWidget(QWidget *parent) const layout->addWidget(lineEdit, 1); setParamWidgetValue(widget); - connect(comboBox, qOverload(&KComboBox::currentIndexChanged), this, &FilterActionAddHeader::filterActionModified); + connect(comboBox, &KComboBox::currentIndexChanged, this, &FilterActionAddHeader::filterActionModified); connect(comboBox->lineEdit(), &QLineEdit::textChanged, this, &FilterAction::filterActionModified); connect(lineEdit, &QLineEdit::textChanged, this, &FilterActionAddHeader::filterActionModified); diff --git a/src/filter/filteractions/filteractionaddtoaddressbook.cpp b/src/filter/filteractions/filteractionaddtoaddressbook.cpp index 8234421..4837bca 100644 --- a/src/filter/filteractions/filteractionaddtoaddressbook.cpp +++ b/src/filter/filteractions/filteractionaddtoaddressbook.cpp @@ -132,8 +132,8 @@ QWidget *FilterActionAddToAddressBook::createParamWidget(QWidget *parent) const i18n("This defines the preferred address book.\n" "If it is not accessible, the filter will fallback to the default address book.")); layout->addWidget(collectionComboBox, 1, 2); - connect(headerCombo, qOverload(&KComboBox::currentIndexChanged), this, &FilterActionAddToAddressBook::filterActionModified); - connect(collectionComboBox, qOverload(&Akonadi::CollectionComboBox::activated), this, &FilterActionAddToAddressBook::filterActionModified); + connect(headerCombo, &KComboBox::currentIndexChanged, this, &FilterActionAddToAddressBook::filterActionModified); + connect(collectionComboBox, &Akonadi::CollectionComboBox::activated, this, &FilterActionAddToAddressBook::filterActionModified); connect(categoryEdit, &Akonadi::TagWidget::selectionChanged, this, &FilterActionAddToAddressBook::filterActionModified); setParamWidgetValue(widget); @@ -202,10 +202,7 @@ void FilterActionAddToAddressBook::applyParamWidgetValue(QWidget *paramWidget) // we use the previously 'stored' value from the 'collectionId' property if (collection.isValid()) { mCollectionId = collection.id(); - connect(collectionComboBox, - qOverload(&Akonadi::CollectionComboBox::currentIndexChanged), - this, - &FilterActionAddToAddressBook::filterActionModified); + connect(collectionComboBox, &Akonadi::CollectionComboBox::currentIndexChanged, this, &FilterActionAddToAddressBook::filterActionModified); } else { const QVariant value = collectionComboBox->property("collectionId"); if (value.isValid()) { diff --git a/src/filter/filteractions/filteractionforward.cpp b/src/filter/filteractions/filteractionforward.cpp index f92666a..a09349d 100644 --- a/src/filter/filteractions/filteractionforward.cpp +++ b/src/filter/filteractions/filteractionforward.cpp @@ -110,7 +110,7 @@ QWidget *FilterActionForward::createParamWidget(QWidget *parent) const templateCombo->setEnabled(templateCombo->count() > 1); templateCombo->setToolTip(i18n("The template used when forwarding")); templateCombo->setWhatsThis(i18n("Set the forwarding template that will be used with this filter.")); - connect(templateCombo, qOverload(&KComboBox::currentIndexChanged), this, &FilterActionForward::filterActionModified); + connect(templateCombo, &KComboBox::currentIndexChanged, this, &FilterActionForward::filterActionModified); connect(addressRequester, &Akonadi::EmailAddressRequester::textChanged, this, &FilterActionForward::filterActionModified); return addressAndTemplate; diff --git a/src/filter/filteractions/filteractionremoveheader.cpp b/src/filter/filteractions/filteractionremoveheader.cpp index d640566..68fe996 100644 --- a/src/filter/filteractions/filteractionremoveheader.cpp +++ b/src/filter/filteractions/filteractionremoveheader.cpp @@ -34,7 +34,7 @@ QWidget *FilterActionRemoveHeader::createParamWidget(QWidget *parent) const comboBox->setMinimumWidth(50); comboBox->setInsertPolicy(QComboBox::InsertAtBottom); setParamWidgetValue(comboBox); - connect(comboBox, qOverload(&KComboBox::currentIndexChanged), this, &FilterActionRemoveHeader::filterActionModified); + connect(comboBox, &KComboBox::currentIndexChanged, this, &FilterActionRemoveHeader::filterActionModified); connect(comboBox->lineEdit(), &QLineEdit::textChanged, this, &FilterAction::filterActionModified); return comboBox; diff --git a/src/filter/filteractions/filteractionrewriteheader.cpp b/src/filter/filteractions/filteractionrewriteheader.cpp index 1ca0bf0..2429002 100644 --- a/src/filter/filteractions/filteractionrewriteheader.cpp +++ b/src/filter/filteractions/filteractionrewriteheader.cpp @@ -130,7 +130,7 @@ QWidget *FilterActionRewriteHeader::createParamWidget(QWidget *parent) const layout->addWidget(lineEdit, 1); setParamWidgetValue(widget); - connect(comboBox, qOverload(&KComboBox::currentIndexChanged), this, &FilterActionRewriteHeader::filterActionModified); + connect(comboBox, &KComboBox::currentIndexChanged, this, &FilterActionRewriteHeader::filterActionModified); connect(comboBox->lineEdit(), &QLineEdit::textChanged, this, &FilterAction::filterActionModified); connect(regExpLineEdit, &KLineEdit::textChanged, this, &FilterActionRewriteHeader::filterActionModified); connect(lineEdit, &KLineEdit::textChanged, this, &FilterActionRewriteHeader::filterActionModified); diff --git a/src/filter/filteractions/filteractionsettransport.cpp b/src/filter/filteractions/filteractionsettransport.cpp index f45b148..0811b77 100644 --- a/src/filter/filteractions/filteractionsettransport.cpp +++ b/src/filter/filteractions/filteractionsettransport.cpp @@ -28,7 +28,7 @@ QWidget *FilterActionSetTransport::createParamWidget(QWidget *parent) const auto transportCombobox = new MailTransport::TransportComboBox(parent); transportCombobox->setObjectName(QStringLiteral("transportcombobox")); setParamWidgetValue(transportCombobox); - connect(transportCombobox, qOverload(&MailTransport::TransportComboBox::currentIndexChanged), this, &FilterActionSetTransport::filterActionModified); + connect(transportCombobox, &MailTransport::TransportComboBox::currentIndexChanged, this, &FilterActionSetTransport::filterActionModified); return transportCombobox; } diff --git a/src/filter/tests/filterimporterexportergui.cpp b/src/filter/tests/filterimporterexportergui.cpp index 7dc84ba..4404b63 100644 --- a/src/filter/tests/filterimporterexportergui.cpp +++ b/src/filter/tests/filterimporterexportergui.cpp @@ -56,7 +56,7 @@ FilterImporterExporterGui::FilterImporterExporterGui(QWidget *parent) act = new QAction(QStringLiteral("GMail filters"), this); act->setData(QVariant::fromValue(MailCommon::FilterImporterExporter::GmailFilter)); menuFilter->addAction(act); - connect(menuFilter, qOverload(&QMenu::triggered), this, &FilterImporterExporterGui::slotImportFilter); + connect(menuFilter, &QMenu::triggered, this, &FilterImporterExporterGui::slotImportFilter); mTextEdit = new QTextEdit; mTextEdit->setReadOnly(true); diff --git a/src/folder/folderselectiondialog.cpp b/src/folder/folderselectiondialog.cpp index 50a15b7..f73a332 100644 --- a/src/folder/folderselectiondialog.cpp +++ b/src/folder/folderselectiondialog.cpp @@ -109,10 +109,7 @@ FolderSelectionDialog::FolderSelectionDialog(QWidget *parent, SelectionFolderOpt connect(d->folderTreeWidget->selectionModel(), &QItemSelectionModel::selectionChanged, this, &FolderSelectionDialog::slotSelectionChanged); connect(d->folderTreeWidget->folderTreeWidgetProxyModel(), &QAbstractItemModel::rowsInserted, this, &FolderSelectionDialog::rowsInserted); - connect(d->folderTreeWidget->folderTreeView(), - qOverload(&QAbstractItemView::doubleClicked), - this, - &FolderSelectionDialog::slotDoubleClick); + connect(d->folderTreeWidget->folderTreeView(), &QAbstractItemView::doubleClicked, this, &FolderSelectionDialog::slotDoubleClick); d->mUseGlobalSettings = !(options & NotUseGlobalSettings); readConfig();