aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2017-10-23 06:53:43 +0200
committerMontel Laurent <[email protected]>2017-10-23 06:53:53 +0200
commit19aacb5517bdc4b689263988160d15d660dc671f (patch)
tree34c80421e1eb46c73eb172dc440bbc32866e8cd6
parent84ae1d1b6a82f6fc8ab3811628297ef1ea7539f8 (diff)
Port to new connect api
-rw-r--r--kcm/kcmakonadicontactactions.cpp6
-rw-r--r--src/akonadi-contacts/contacteditor.cpp3
-rw-r--r--src/akonadi-contacts/contactgroupeditor.cpp3
3 files changed, 5 insertions, 7 deletions
diff --git a/kcm/kcmakonadicontactactions.cpp b/kcm/kcmakonadicontactactions.cpp
index b01c4f8..df9aa75 100644
--- a/kcm/kcmakonadicontactactions.cpp
+++ b/kcm/kcmakonadicontactactions.cpp
@@ -54,12 +54,12 @@ KCMAkonadiContactActions::KCMAkonadiContactActions(QWidget *parent, const QVaria
ui.DialPhoneNumberAction->addItem(i18n("SflPhone"), ContactActionsSettings::UseSflPhone);
ui.DialPhoneNumberAction->addItem(i18n("External Application"), ContactActionsSettings::UseExternalPhoneApplication);
- connect(ui.DialPhoneNumberAction, SIGNAL(currentIndexChanged(int)), SLOT(slotDialPhoneNumberActionChanged(int)));
+ connect(ui.DialPhoneNumberAction, QOverload<int>::of(&KComboBox::currentIndexChanged), this, &KCMAkonadiContactActions::slotDialPhoneNumberActionChanged);
ui.SendSmsAction->addItem(i18n("Skype"), ContactActionsSettings::UseSkypeSms);
ui.SendSmsAction->addItem(i18n("SflPhone"), ContactActionsSettings::UseSflPhoneSms);
ui.SendSmsAction->addItem(i18n("External Application"), ContactActionsSettings::UseExternalSmsApplication);
- connect(ui.SendSmsAction, SIGNAL(currentIndexChanged(int)), SLOT(slotSmsPhoneNumberActionChanged(int)));
+ connect(ui.SendSmsAction, QOverload<int>::of(&KComboBox::currentIndexChanged), this, &KCMAkonadiContactActions::slotSmsPhoneNumberActionChanged);
ui.ShowAddressAction->addItem(i18n("Web Browser"), ContactActionsSettings::UseBrowser);
ui.ShowAddressAction->addItem(i18n("External Application"), ContactActionsSettings::UseExternalAddressApplication);
@@ -67,7 +67,7 @@ KCMAkonadiContactActions::KCMAkonadiContactActions(QWidget *parent, const QVaria
ui.ShowAddressAction->addItem(i18n("Map quest"), ContactActionsSettings::UseMapquest);
ui.ShowAddressAction->addItem(i18n("OpenStreetMap"), ContactActionsSettings::UseOpenStreetMap);
- connect(ui.ShowAddressAction, SIGNAL(currentIndexChanged(int)), SLOT(slotShowAddressActionChanged(int)));
+ connect(ui.ShowAddressAction, QOverload<int>::of(&KComboBox::currentIndexChanged), this, &KCMAkonadiContactActions::slotShowAddressActionChanged);
load();
}
diff --git a/src/akonadi-contacts/contacteditor.cpp b/src/akonadi-contacts/contacteditor.cpp
index 90c5bd2..cd541cf 100644
--- a/src/akonadi-contacts/contacteditor.cpp
+++ b/src/akonadi-contacts/contacteditor.cpp
@@ -112,8 +112,7 @@ void Akonadi::AkonadiContactEditor::Private::itemFetchDone(KJob *job)
Akonadi::CollectionFetchJob *collectionFetchJob = new Akonadi::CollectionFetchJob(mItem.parentCollection(),
Akonadi::CollectionFetchJob::Base);
- mParent->connect(collectionFetchJob, SIGNAL(result(KJob*)),
- SLOT(parentCollectionFetchDone(KJob*)));
+ mParent->connect(collectionFetchJob, &CollectionFetchJob::result, mParent, [this](KJob *job) { parentCollectionFetchDone(job); });
} else {
const KContacts::Addressee addr = mItem.payload<KContacts::Addressee>();
mContactMetaData.load(mItem);
diff --git a/src/akonadi-contacts/contactgroupeditor.cpp b/src/akonadi-contacts/contactgroupeditor.cpp
index 19b9f51..3e94c03 100644
--- a/src/akonadi-contacts/contactgroupeditor.cpp
+++ b/src/akonadi-contacts/contactgroupeditor.cpp
@@ -84,8 +84,7 @@ void ContactGroupEditor::Private::itemFetchDone(KJob *job)
Akonadi::CollectionFetchJob *collectionFetchJob = new Akonadi::CollectionFetchJob(mItem.parentCollection(),
Akonadi::CollectionFetchJob::Base);
- mParent->connect(collectionFetchJob, SIGNAL(result(KJob*)),
- SLOT(parentCollectionFetchDone(KJob*)));
+ mParent->connect(collectionFetchJob, &CollectionFetchJob::result, mParent, [this](KJob *job) { parentCollectionFetchDone(job); });
} else {
const KContacts::ContactGroup group = mItem.payload<KContacts::ContactGroup>();
loadContactGroup(group);