summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2015-08-03 08:02:35 +0200
committerMontel Laurent <[email protected]>2015-08-03 08:02:35 +0200
commit5f6a3e589f07a6bb969311c52251433807dd85b1 (patch)
treeb531bc08ae363475ffb14ca5ab69a78a085f8043
parenta63a41af09b27b64a5cd408c02d970f75c90ce6e (diff)
Clean up. Use new connect api
-rw-r--r--kmail/antispam-virus/antispamwizard.cpp25
-rw-r--r--kmail/antispam-virus/antispamwizard.h1
-rw-r--r--kmail/configuredialog/configureagents/configureagentlistview.cpp2
-rw-r--r--kmail/configuredialog/configurecomposerpage.cpp8
4 files changed, 15 insertions, 21 deletions
diff --git a/kmail/antispam-virus/antispamwizard.cpp b/kmail/antispam-virus/antispamwizard.cpp
index 9be03ae..d0b1649 100644
--- a/kmail/antispam-virus/antispamwizard.cpp
+++ b/kmail/antispam-virus/antispamwizard.cpp
@@ -1018,16 +1018,16 @@ ASWizSpamRulesPage::ASWizSpamRulesPage(QWidget *parent, const QString &name)
layout->addStretch();
- connect(mMarkRules, SIGNAL(clicked()),
- this, SLOT(processSelectionChange()));
- connect(mMoveSpamRules, SIGNAL(clicked()),
- this, SLOT(processSelectionChange()));
- connect(mMoveUnsureRules, SIGNAL(clicked()),
- this, SLOT(processSelectionChange()));
- connect(mFolderReqForSpamFolder, SIGNAL(folderChanged(Akonadi::Collection)),
- this, SLOT(processSelectionChange(Akonadi::Collection)));
- connect(mFolderReqForUnsureFolder, SIGNAL(folderChanged(Akonadi::Collection)),
- this, SLOT(processSelectionChange(Akonadi::Collection)));
+ connect(mMarkRules, &QAbstractButton::clicked,
+ this, &ASWizSpamRulesPage::processSelectionChange);
+ connect(mMoveSpamRules, &QAbstractButton::clicked,
+ this, &ASWizSpamRulesPage::processSelectionChange);
+ connect(mMoveUnsureRules, &QAbstractButton::clicked,
+ this, &ASWizSpamRulesPage::processSelectionChange);
+ connect(mFolderReqForSpamFolder, &FolderRequester::folderChanged,
+ this, &ASWizSpamRulesPage::processSelectionChange);
+ connect(mFolderReqForUnsureFolder, &FolderRequester::folderChanged,
+ this, &ASWizSpamRulesPage::processSelectionChange);
mMarkRules->setChecked(true);
mMoveSpamRules->setChecked(true);
@@ -1093,11 +1093,6 @@ void ASWizSpamRulesPage::processSelectionChange()
Q_EMIT selectionChanged();
}
-void ASWizSpamRulesPage::processSelectionChange(const Akonadi::Collection &)
-{
- processSelectionChange();
-}
-
void ASWizSpamRulesPage::allowUnsureFolderSelection(bool enabled)
{
mMoveUnsureRules->setEnabled(enabled);
diff --git a/kmail/antispam-virus/antispamwizard.h b/kmail/antispam-virus/antispamwizard.h
index b8d598b..27efe18 100644
--- a/kmail/antispam-virus/antispamwizard.h
+++ b/kmail/antispam-virus/antispamwizard.h
@@ -421,7 +421,6 @@ protected:
private Q_SLOTS:
void processSelectionChange();
- void processSelectionChange(const Akonadi::Collection &);
Q_SIGNALS:
void selectionChanged();
diff --git a/kmail/configuredialog/configureagents/configureagentlistview.cpp b/kmail/configuredialog/configureagents/configureagentlistview.cpp
index 5d13300..e00287d 100644
--- a/kmail/configuredialog/configureagents/configureagentlistview.cpp
+++ b/kmail/configuredialog/configureagents/configureagentlistview.cpp
@@ -36,7 +36,7 @@ ConfigureAgentListView::ConfigureAgentListView(QWidget *parent)
setModel(proxyModel);
setItemDelegate(configureListDelegate);
- connect(configureAgentListModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SIGNAL(agentChanged()));
+ connect(configureAgentListModel, &QAbstractItemModel::dataChanged, this, &ConfigureAgentListView::agentChanged);
}
diff --git a/kmail/configuredialog/configurecomposerpage.cpp b/kmail/configuredialog/configurecomposerpage.cpp
index a35ec8b..6f722b7 100644
--- a/kmail/configuredialog/configurecomposerpage.cpp
+++ b/kmail/configuredialog/configurecomposerpage.cpp
@@ -189,10 +189,10 @@ ComposerPageGeneralTab::ComposerPageGeneralTab(QWidget *parent)
mDashDashCheck->setToolTip(helpText);
mDashDashCheck->setWhatsThis(helpText);
- connect(mDashDashCheck, SIGNAL(stateChanged(int)),
- this, SLOT(slotEmitChanged()));
- connect(mAutoAppSignFileCheck, SIGNAL(toggled(bool)),
- mDashDashCheck, SLOT(setEnabled(bool)));
+ connect(mDashDashCheck, &QCheckBox::stateChanged,
+ this, &ConfigModuleTab::slotEmitChanged);
+ connect(mAutoAppSignFileCheck, &QAbstractButton::toggled,
+ mDashDashCheck, &QWidget::setEnabled);
groupVBoxLayout->addWidget(mDashDashCheck);
// "Remove signature when replying" checkbox