Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit d4dc2d7a authored by Allen Winter's avatar Allen Winter

various - normalize SIGNALs and SLOTs

parent d7515861
......@@ -113,8 +113,8 @@ 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, SIGNAL(result(KJob*)),
SLOT(parentCollectionFetchDone(KJob*)));
} else {
const KContacts::Addressee addr = mItem.payload<KContacts::Addressee>();
mContactMetaData.load(mItem);
......@@ -177,7 +177,7 @@ void Akonadi::AkonadiContactEditor::Private::itemChanged(const Akonadi::Item &it
job->fetchScope().fetchAttribute<ContactMetaDataAttribute>();
job->fetchScope().setAncestorRetrieval(Akonadi::ItemFetchScope::Parent);
mParent->connect(job, SIGNAL(result(KJob *)), mParent, SLOT(itemFetchDone(KJob *)));
mParent->connect(job, SIGNAL(result(KJob*)), mParent, SLOT(itemFetchDone(KJob*)));
}
delete dlg;
......@@ -236,7 +236,7 @@ void Akonadi::AkonadiContactEditor::loadContact(const Akonadi::Item &item)
job->fetchScope().fetchAttribute<ContactMetaDataAttribute>();
job->fetchScope().setAncestorRetrieval(Akonadi::ItemFetchScope::Parent);
connect(job, SIGNAL(result(KJob *)), SLOT(itemFetchDone(KJob *)));
connect(job, SIGNAL(result(KJob*)), SLOT(itemFetchDone(KJob*)));
d->setupMonitor();
d->mMonitor->setItemMonitored(item);
......@@ -266,7 +266,7 @@ void Akonadi::AkonadiContactEditor::saveContactInAddressBook()
d->mItem.setPayload<KContacts::Addressee>(addr);
Akonadi::ItemModifyJob *job = new Akonadi::ItemModifyJob(d->mItem);
connect(job, SIGNAL(result(KJob *)), SLOT(storeDone(KJob *)));
connect(job, SIGNAL(result(KJob*)), SLOT(storeDone(KJob*)));
} else if (d->mMode == CreateMode) {
if (!d->mDefaultCollection.isValid()) {
const QStringList mimeTypeFilter(KContacts::Addressee::mimeType());
......@@ -293,7 +293,7 @@ void Akonadi::AkonadiContactEditor::saveContactInAddressBook()
d->mContactMetaData.store(item);
Akonadi::ItemCreateJob *job = new Akonadi::ItemCreateJob(item, d->mDefaultCollection);
connect(job, SIGNAL(result(KJob *)), SLOT(storeDone(KJob *)));
connect(job, SIGNAL(result(KJob*)), SLOT(storeDone(KJob*)));
}
}
......
......@@ -88,8 +88,8 @@ 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, SIGNAL(result(KJob*)),
SLOT(parentCollectionFetchDone(KJob*)));
} else {
const KContacts::ContactGroup group = mItem.payload<KContacts::ContactGroup>();
loadContactGroup(group);
......@@ -152,7 +152,7 @@ void ContactGroupEditor::Private::itemChanged(const Item &item, const QSet<QByte
job->fetchScope().fetchFullPayload();
job->fetchScope().setAncestorRetrieval(Akonadi::ItemFetchScope::Parent);
mParent->connect(job, SIGNAL(result(KJob *)), mParent, SLOT(itemFetchDone(KJob *)));
mParent->connect(job, SIGNAL(result(KJob*)), mParent, SLOT(itemFetchDone(KJob*)));
new WaitingOverlay(job, mParent);
}
}
......@@ -245,7 +245,7 @@ void ContactGroupEditor::loadContactGroup(const Akonadi::Item &item)
job->fetchScope().fetchFullPayload();
job->fetchScope().setAncestorRetrieval(Akonadi::ItemFetchScope::Parent);
connect(job, SIGNAL(result(KJob *)), SLOT(itemFetchDone(KJob *)));
connect(job, SIGNAL(result(KJob*)), SLOT(itemFetchDone(KJob*)));
d->setupMonitor();
d->mMonitor->setItemMonitored(item);
......@@ -273,7 +273,7 @@ bool ContactGroupEditor::saveContactGroup()
d->mItem.setPayload<KContacts::ContactGroup>(group);
ItemModifyJob *job = new ItemModifyJob(d->mItem);
connect(job, SIGNAL(result(KJob *)), SLOT(storeDone(KJob *)));
connect(job, SIGNAL(result(KJob*)), SLOT(storeDone(KJob*)));
} else if (d->mMode == CreateMode) {
if (!d->mDefaultCollection.isValid()) {
const QStringList mimeTypeFilter(KContacts::ContactGroup::mimeType());
......@@ -301,7 +301,7 @@ bool ContactGroupEditor::saveContactGroup()
item.setMimeType(KContacts::ContactGroup::mimeType());
ItemCreateJob *job = new ItemCreateJob(item, d->mDefaultCollection);
connect(job, SIGNAL(result(KJob *)), SLOT(storeDone(KJob *)));
connect(job, SIGNAL(result(KJob*)), SLOT(storeDone(KJob*)));
}
return true;
......
......@@ -142,7 +142,7 @@ QWidget *ContactGroupEditorDelegate::createEditor(QWidget *parent, const QStyleO
Q_UNUSED(option)
if (index.column() == 0) {
auto edit = new ContactLineEdit(isReference, ContactCompletionModel::EmailColumn, parent);
connect(edit, SIGNAL(completed(QWidget *)), SLOT(completed(QWidget *)));
connect(edit, SIGNAL(completed(QWidget*)), SLOT(completed(QWidget*)));
return edit;
} else {
......
......@@ -66,7 +66,7 @@ public:
job->setProperty("row", row);
job->fetchScope().fetchFullPayload();
mParent->connect(job, SIGNAL(result(KJob *)), SLOT(itemFetched(KJob *)));
mParent->connect(job, SIGNAL(result(KJob*)), SLOT(itemFetched(KJob*)));
}
void itemFetched(KJob *job)
......
......@@ -114,13 +114,13 @@ public:
// stop any running fetch job
if (mParentCollectionFetchJob) {
mParent->disconnect(mParentCollectionFetchJob, SIGNAL(result(KJob *)), mParent, SLOT(slotParentCollectionFetched(KJob *)));
mParent->disconnect(mParentCollectionFetchJob, SIGNAL(result(KJob*)), mParent, SLOT(slotParentCollectionFetched(KJob*)));
delete mParentCollectionFetchJob;
mParentCollectionFetchJob = nullptr;
}
mParentCollectionFetchJob = new CollectionFetchJob(mCurrentItem.parentCollection(), CollectionFetchJob::Base, mParent);
mParent->connect(mParentCollectionFetchJob, SIGNAL(result(KJob *)), SLOT(slotParentCollectionFetched(KJob *)));
mParent->connect(mParentCollectionFetchJob, SIGNAL(result(KJob*)), SLOT(slotParentCollectionFetched(KJob*)));
}
void slotParentCollectionFetched(KJob *job)
......@@ -203,12 +203,12 @@ void ContactGroupViewer::itemChanged(const Item &item)
d->mCurrentItem = item;
if (d->mExpandJob) {
disconnect(d->mExpandJob, SIGNAL(result(KJob *)), this, SLOT(_k_expandResult(KJob *)));
disconnect(d->mExpandJob, SIGNAL(result(KJob*)), this, SLOT(_k_expandResult(KJob*)));
d->mExpandJob->kill();
}
d->mExpandJob = new ContactGroupExpandJob(group);
connect(d->mExpandJob, SIGNAL(result(KJob *)), SLOT(_k_expandResult(KJob *)));
connect(d->mExpandJob, SIGNAL(result(KJob*)), SLOT(_k_expandResult(KJob*)));
d->mExpandJob->start();
}
......
......@@ -207,8 +207,8 @@ public:
{
const QUrlQuery query(url);
const QString urlScheme(url.scheme());
if (urlScheme == QLatin1String("http")
|| urlScheme == QLatin1String("https")) {
if (urlScheme == QLatin1String("http") ||
urlScheme == QLatin1String("https")) {
Q_EMIT mParent->urlClicked(url);
} else if (urlScheme == QLatin1String("phone")) {
const int pos = query.queryItemValue(QStringLiteral("index")).toInt();
......@@ -345,13 +345,13 @@ void ContactViewer::itemChanged(const Item &contactItem)
// stop any running fetch job
if (d->mParentCollectionFetchJob) {
disconnect(d->mParentCollectionFetchJob, SIGNAL(result(KJob *)), this, SLOT(slotParentCollectionFetched(KJob *)));
disconnect(d->mParentCollectionFetchJob, SIGNAL(result(KJob*)), this, SLOT(slotParentCollectionFetched(KJob*)));
delete d->mParentCollectionFetchJob;
d->mParentCollectionFetchJob = nullptr;
}
d->mParentCollectionFetchJob = new CollectionFetchJob(contactItem.parentCollection(), CollectionFetchJob::Base, this);
connect(d->mParentCollectionFetchJob, SIGNAL(result(KJob *)), SLOT(slotParentCollectionFetched(KJob *)));
connect(d->mParentCollectionFetchJob, SIGNAL(result(KJob*)), SLOT(slotParentCollectionFetched(KJob*)));
}
void ContactViewer::itemRemoved()
......
......@@ -70,7 +70,7 @@ public:
job->fetchScope().fetchFullPayload();
job->setProperty("preferredEmail", reference.preferredEmail());
mParent->connect(job, SIGNAL(result(KJob *)), mParent, SLOT(fetchResult(KJob *)));
mParent->connect(job, SIGNAL(result(KJob*)), mParent, SLOT(fetchResult(KJob*)));
mFetchCount++;
}
......@@ -160,7 +160,7 @@ void ContactGroupExpandJob::start()
ContactGroupSearchJob *searchJob = new ContactGroupSearchJob(this);
searchJob->setQuery(ContactGroupSearchJob::Name, d->mName);
searchJob->setLimit(1);
connect(searchJob, SIGNAL(result(KJob *)), this, SLOT(searchResult(KJob *)));
connect(searchJob, SIGNAL(result(KJob*)), this, SLOT(searchResult(KJob*)));
} else {
QMetaObject::invokeMethod(this, "resolveGroup", Qt::QueuedConnection);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment