From 39aa0e0eda2f08ac6c68c56db18b3167d8b7b60d Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Thu, 5 Oct 2017 13:38:30 +0200 Subject: [PATCH] Port to new connect api --- src/filter/filteractions/filteractionwidget.cpp | 8 ++++---- src/filter/filteractions/filteractionwidget.h | 3 --- src/filter/kmfilterdialog.cpp | 4 ++-- src/search/searchpatternedit.cpp | 4 ++-- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/filter/filteractions/filteractionwidget.cpp b/src/filter/filteractions/filteractionwidget.cpp index 2e4650d..08b53ab 100644 --- a/src/filter/filteractions/filteractionwidget.cpp +++ b/src/filter/filteractions/filteractionwidget.cpp @@ -176,10 +176,10 @@ FilterActionWidget::FilterActionWidget(QWidget *parent) connect(d->mComboBox, QOverload::of(&KComboBox::activated), this, &FilterActionWidget::filterModified); - connect(d->mAdd, SIGNAL(clicked()), - this, SLOT(slotAddWidget())); - connect(d->mRemove, SIGNAL(clicked()), - this, SLOT(slotRemoveWidget())); + connect(d->mAdd, &QPushButton::clicked, + this, [this]() { d->slotAddWidget(); }); + connect(d->mRemove, &QPushButton::clicked, + this, [this]() { d->slotRemoveWidget(); }); d->setFilterAction(); d->mLayout->addWidget(d->mAdd, 1, 3); diff --git a/src/filter/filteractions/filteractionwidget.h b/src/filter/filteractions/filteractionwidget.h index fb48b96..c195c80 100644 --- a/src/filter/filteractions/filteractionwidget.h +++ b/src/filter/filteractions/filteractionwidget.h @@ -96,9 +96,6 @@ private: //@cond PRIVATE class Private; Private *const d; - - Q_PRIVATE_SLOT(d, void slotAddWidget()) - Q_PRIVATE_SLOT(d, void slotRemoveWidget()) //@endcond }; diff --git a/src/filter/kmfilterdialog.cpp b/src/filter/kmfilterdialog.cpp index f45133e..e1c7aae 100644 --- a/src/filter/kmfilterdialog.cpp +++ b/src/filter/kmfilterdialog.cpp @@ -387,8 +387,8 @@ KMFilterDialog::KMFilterDialog(const QList &actionCollectio this, &KMFilterDialog::slotDialogUpdated); connect(mFilterList, &KMFilterListBox::filterOrderAltered, this, &KMFilterDialog::slotDialogUpdated); connect(mPatternEdit, &MailCommon::SearchPatternEdit::patternChanged, this, &KMFilterDialog::slotDialogUpdated); - connect(mActionLister, SIGNAL(widgetAdded(QWidget*)), this, SLOT(slotDialogUpdated())); - connect(mActionLister, SIGNAL(widgetRemoved()), this, SLOT(slotDialogUpdated())); + connect(mActionLister, QOverload::of(&FilterActionWidgetLister::widgetAdded), this, &KMFilterDialog::slotDialogUpdated); + connect(mActionLister, QOverload::of(&FilterActionWidgetLister::widgetRemoved), this, &KMFilterDialog::slotDialogUpdated); connect(mActionLister, &MailCommon::FilterActionWidgetLister::filterModified, this, &KMFilterDialog::slotDialogUpdated); connect(mActionLister, &MailCommon::FilterActionWidgetLister::clearWidgets, this, &KMFilterDialog::slotDialogUpdated); KConfigGroup myGroup(KernelIf->config(), "Geometry"); diff --git a/src/search/searchpatternedit.cpp b/src/search/searchpatternedit.cpp index e4e6427..62464a0 100644 --- a/src/search/searchpatternedit.cpp +++ b/src/search/searchpatternedit.cpp @@ -205,8 +205,8 @@ void SearchRuleWidget::initWidget(SearchPatternEdit::SearchModeType modeType) // redirect focus to the header field combo box setFocusProxy(mRuleField); - connect(mRuleField, SIGNAL(activated(QString)), - this, SLOT(slotRuleFieldChanged(QString))); + connect(mRuleField, QOverload::of(&KComboBox::activated), + this, &SearchRuleWidget::slotRuleFieldChanged); connect(mRuleField, &QComboBox::editTextChanged, this, &SearchRuleWidget::slotRuleFieldChanged); connect(mRuleField, &QComboBox::editTextChanged,