Commit a7d29f26 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Use // clang-format off when it's necessary

parent 578252a8
......@@ -1196,8 +1196,10 @@ void KMKernel::cleanup()
disconnect(Akonadi::AgentManager::self(), SIGNAL(instanceError(Akonadi::AgentInstance, QString)));
disconnect(Akonadi::AgentManager::self(), SIGNAL(instanceWarning(Akonadi::AgentInstance, QString)));
disconnect(Akonadi::AgentManager::self(), SIGNAL(instanceRemoved(Akonadi::AgentInstance)));
disconnect(KPIM::ProgressManager::instance(), SIGNAL(progressItemCompleted(KPIM::ProgressItem *)));
disconnect(KPIM::ProgressManager::instance(), SIGNAL(progressItemCanceled(KPIM::ProgressItem *)));
// clang-format off
disconnect(KPIM::ProgressManager::instance(), SIGNAL(progressItemCompleted(KPIM::ProgressItem*)));
disconnect(KPIM::ProgressManager::instance(), SIGNAL(progressItemCanceled(KPIM::ProgressItem*)));
// clang-format on
dumpDeadLetters();
the_shuttingDown = true;
......
......@@ -89,7 +89,9 @@ void ManageShowCollectionProperties::showCollectionProperties(const QString &pag
sync->setProperty("pageToShow", pageToShow); // note for dialog later
sync->setProperty("progressItem", QVariant::fromValue(progressItem));
connect(sync, &KJob::result, this, &ManageShowCollectionProperties::slotCollectionPropertiesContinued);
connect(progressItem, SIGNAL(progressItemCanceled(KPIM::ProgressItem *)), sync, SLOT(kill()));
// clang-format off
connect(progressItem, SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), sync, SLOT(kill()));
// clang-format on
connect(progressItem.data(),
&KPIM::ProgressItem::progressItemCanceled,
KPIM::ProgressManager::instance(),
......@@ -116,7 +118,9 @@ void ManageShowCollectionProperties::slotCollectionPropertiesContinued(KJob *job
pageToShow = sync->property("pageToShow").toString();
progressItem = sync->property("progressItem").value<QPointer<KPIM::ProgressItem>>();
if (progressItem) {
disconnect(progressItem, SIGNAL(progressItemCanceled(KPIM::ProgressItem *)), sync, SLOT(kill()));
// clang-format off
disconnect(progressItem, SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), sync, SLOT(kill()));
// clang-format on
} else {
// progressItem does not exist anymore, operation has been canceled
return;
......@@ -139,12 +143,16 @@ void ManageShowCollectionProperties::showCollectionPropertiesContinued(const QSt
}
auto fetch = new Akonadi::CollectionFetchJob(mMainWidget->currentCollection(), Akonadi::CollectionFetchJob::Base);
connect(progressItem, SIGNAL(progressItemCanceled(KPIM::ProgressItem *)), fetch, SLOT(kill()));
// clang-format off
connect(progressItem, SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), fetch, SLOT(kill()));
// clang-format on
fetch->fetchScope().setIncludeStatistics(true);
fetch->setProperty("pageToShow", pageToShow);
fetch->setProperty("progressItem", QVariant::fromValue(progressItem));
connect(fetch, &KJob::result, this, &ManageShowCollectionProperties::slotCollectionPropertiesFinished);
connect(progressItem, SIGNAL(progressItemCanceled(KPIM::ProgressItem *)), fetch, SLOT(kill()));
// clang-format off
connect(progressItem, SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), fetch, SLOT(kill()));
// clang-format on
}
void ManageShowCollectionProperties::slotCollectionPropertiesFinished(KJob *job)
......
Supports Markdown
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