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

GIT_SILENT: coding style

parent 9c207762
......@@ -82,7 +82,7 @@ FilterLogDialog::FilterLogDialog(QWidget *parent)
pageVBoxLayout->setMargin(0);
mainLayout->addWidget(page);
mTextEdit = new KPIMTextEdit::PlainTextEditorWidget(new FilterLogTextEdit(this),page);
mTextEdit = new KPIMTextEdit::PlainTextEditorWidget(new FilterLogTextEdit(this), page);
pageVBoxLayout->addWidget(mTextEdit);
mTextEdit->setReadOnly(true);
......@@ -372,7 +372,6 @@ FilterLogTextEdit::FilterLogTextEdit(QWidget *parent)
{
}
void FilterLogTextEdit::addExtraMenuEntry(QMenu *menu, QPoint pos)
{
Q_UNUSED(pos);
......
......@@ -394,7 +394,9 @@ void FilterManager::filter(const Akonadi::Item &item, FilterManager::FilterSet s
}
job->fetchScope().setAncestorRetrieval(Akonadi::ItemFetchScope::Parent);
connect(job, &Akonadi::ItemFetchJob::result, this, [this](KJob *job) { d->itemFetchJobForFilterDone(job); });
connect(job, &Akonadi::ItemFetchJob::result, this, [this](KJob *job) {
d->itemFetchJobForFilterDone(job);
});
}
void FilterManager::filter(const Akonadi::Item &item, const QString &filterId, const QString &resourceId)
......@@ -413,7 +415,9 @@ void FilterManager::filter(const Akonadi::Item &item, const QString &filterId, c
job->fetchScope().setAncestorRetrieval(Akonadi::ItemFetchScope::Parent);
connect(job, &Akonadi::ItemFetchJob::result, this, [this](KJob *job) { d->itemFetchJobForFilterDone(job);} );
connect(job, &Akonadi::ItemFetchJob::result, this, [this](KJob *job) {
d->itemFetchJobForFilterDone(job);
});
}
bool FilterManager::process(const Akonadi::Item &item, bool needsFullPayload, const MailFilter *filter)
......@@ -464,7 +468,9 @@ bool FilterManager::processContextItem(ItemContext context)
if (context.deleteItem()) {
if (itemCanDelete) {
Akonadi::ItemDeleteJob *deleteJob = new Akonadi::ItemDeleteJob(context.item(), this);
connect(deleteJob, &Akonadi::ItemDeleteJob::result, this, [this](KJob *job) { d->deleteJobResult(job); });
connect(deleteJob, &Akonadi::ItemDeleteJob::result, this, [this](KJob *job) {
d->deleteJobResult(job);
});
} else {
return false;
}
......@@ -472,7 +478,9 @@ bool FilterManager::processContextItem(ItemContext context)
if (context.moveTargetCollection().isValid() && context.item().storageCollectionId() != context.moveTargetCollection().id()) {
if (itemCanDelete) {
Akonadi::ItemMoveJob *moveJob = new Akonadi::ItemMoveJob(context.item(), context.moveTargetCollection(), this);
connect(moveJob, &Akonadi::ItemMoveJob::result, this, [this](KJob *job) {d->moveJobResult(job); });
connect(moveJob, &Akonadi::ItemMoveJob::result, this, [this](KJob *job) {
d->moveJobResult(job);
});
} else {
return false;
}
......@@ -489,7 +497,9 @@ bool FilterManager::processContextItem(ItemContext context)
//The below is a safety check to ignore modifying payloads if it was not requested,
//as in that case we might change the payload to an invalid one
modifyJob->setIgnorePayload(!context.needsFullPayload());
connect(modifyJob, &Akonadi::ItemModifyJob::result, this, [this](KJob *job) { d->modifyJobResult(job);});
connect(modifyJob, &Akonadi::ItemModifyJob::result, this, [this](KJob *job) {
d->modifyJobResult(job);
});
}
}
......@@ -595,10 +605,7 @@ void FilterManager::dump() const
#endif
void FilterManager::applySpecificFilters(const Akonadi::Item::List &selectedMessages,
SearchRule::RequiredPart requiredPart,
const QStringList &listFilters,
FilterSet filterSet)
void FilterManager::applySpecificFilters(const Akonadi::Item::List &selectedMessages, SearchRule::RequiredPart requiredPart, const QStringList &listFilters, FilterSet filterSet)
{
Q_EMIT progressMessage(i18n("Filtering messages"));
d->mTotalProgressCount = selectedMessages.size();
......@@ -618,8 +625,12 @@ void FilterManager::applySpecificFilters(const Akonadi::Item::List &selectedMess
itemFetchJob->setProperty("filterSet", QVariant::fromValue(static_cast<int>(filterSet)));
itemFetchJob->setProperty("needsFullPayload", requiredPart != SearchRule::Envelope);
connect(itemFetchJob, &Akonadi::ItemFetchJob::itemsReceived, this, [this](const Akonadi::Item::List &lst) {d->slotItemsFetchedForFilter(lst); });
connect(itemFetchJob, &Akonadi::ItemFetchJob::result, this, [this](KJob *job) { d->itemsFetchJobForFilterDone(job); });
connect(itemFetchJob, &Akonadi::ItemFetchJob::itemsReceived, this, [this](const Akonadi::Item::List &lst) {
d->slotItemsFetchedForFilter(lst);
});
connect(itemFetchJob, &Akonadi::ItemFetchJob::result, this, [this](KJob *job) {
d->itemsFetchJobForFilterDone(job);
});
}
void FilterManager::applyFilters(const Akonadi::Item::List &selectedMessages, FilterSet filterSet)
......@@ -642,9 +653,12 @@ void FilterManager::applyFilters(const Akonadi::Item::List &selectedMessages, Fi
itemFetchJob->setProperty("filterSet", QVariant::fromValue(static_cast<int>(filterSet)));
itemFetchJob->setProperty("needsFullPayload", requiredParts != SearchRule::Envelope);
connect(itemFetchJob, &Akonadi::ItemFetchJob::itemsReceived, this, [this](const Akonadi::Item::List &lst) {d->slotItemsFetchedForFilter(lst); });
connect(itemFetchJob, &Akonadi::ItemFetchJob::result, this, [this](KJob *job) { d->itemsFetchJobForFilterDone(job); });
connect(itemFetchJob, &Akonadi::ItemFetchJob::itemsReceived, this, [this](const Akonadi::Item::List &lst) {
d->slotItemsFetchedForFilter(lst);
});
connect(itemFetchJob, &Akonadi::ItemFetchJob::result, this, [this](KJob *job) {
d->itemsFetchJobForFilterDone(job);
});
}
bool FilterManager::hasAllFoldersFilter() const
......
......@@ -110,8 +110,7 @@ public:
void filter(const Akonadi::Item &item, FilterManager::FilterSet set, const QString &resourceId);
void filter(const Akonadi::Item &item, const QString &filterId, const QString &resourceId);
void applySpecificFilters(const Akonadi::Item::List &selectedMessages, MailCommon::SearchRule::RequiredPart requiredPart,
const QStringList &listFilters, FilterSet set = Explicit);
void applySpecificFilters(const Akonadi::Item::List &selectedMessages, MailCommon::SearchRule::RequiredPart requiredPart, const QStringList &listFilters, FilterSet set = Explicit);
/**
* Applies the filters on the given @p messages.
......
......@@ -130,7 +130,9 @@ MailFilterAgent::MailFilterAgent(const QString &id)
mProgressCounter = 0;
mProgressTimer = new QTimer(this);
connect(mProgressTimer, &QTimer::timeout, this, [this]() {emitProgress();});
connect(mProgressTimer, &QTimer::timeout, this, [this]() {
emitProgress();
});
itemMonitor = new Akonadi::Monitor(this);
itemMonitor->setObjectName(QStringLiteral("MailFilterItemMonitor"));
......
......@@ -62,6 +62,7 @@ QSize ConfigureDialog::sizeHint() const
const int height = KMailSettings::self()->configureDialogHeight();
return QSize(width, height);
}
void ConfigureDialog::hideEvent(QHideEvent *ev)
{
KMailSettings::self()->setConfigureDialogWidth(width());
......
......@@ -55,7 +55,6 @@ private:
void doubleClicked(const QModelIndex &itemClicked);
void slotSelectAllAttachment();
KMComposerWin *mComposer = nullptr;
AttachmentView *mView = nullptr;
};
......
......@@ -469,7 +469,9 @@ KMComposerWin::KMComposerWin(const KMime::Message::Ptr &aMsg, bool lastSignState
applyMainWindowSettings(KMKernel::self()->config()->group("Composer"));
connect(mEdtSubject, &PimCommon::LineEditWithAutoCorrection::textChanged, this, &KMComposerWin::slotUpdateWindowTitle);
connect(identity, &KIdentityManagement::IdentityCombo::identityChanged, [this](uint val) {slotIdentityChanged(val);});
connect(identity, &KIdentityManagement::IdentityCombo::identityChanged, [this](uint val) {
slotIdentityChanged(val);
});
connect(kmkernel->identityManager(), SIGNAL(changed(uint)),
SLOT(slotIdentityChanged(uint)));
......
......@@ -315,7 +315,6 @@ private Q_SLOTS:
void slotUpdateToolbars();
void slotEditKeys();
/**
* Change window title to given string.
*/
......
......@@ -27,7 +27,6 @@
class FolderArchiveAccountInfo;
struct ArchiveCache {
QDate date = QDate::currentDate();
Akonadi::Collection::Id colId = -1;
};
......
......@@ -63,7 +63,7 @@ IdentityPage::IdentityPage(QWidget *parent)
connect(mIPage.mIdentityList, &QTreeWidget::itemSelectionChanged, this, &IdentityPage::slotIdentitySelectionChanged);
connect(this, QOverload<bool>::of(&IdentityPage::changed), this, &IdentityPage::slotIdentitySelectionChanged);
connect(mIPage.mIdentityList, QOverload<KMail::IdentityListViewItem*, const QString&>::of(&IdentityListView::rename),
connect(mIPage.mIdentityList, QOverload<KMail::IdentityListViewItem *, const QString &>::of(&IdentityListView::rename),
this, &IdentityPage::slotRenameIdentityFromItem);
connect(mIPage.mIdentityList, &QTreeWidget::itemDoubleClicked, this, &IdentityPage::slotModifyIdentity);
connect(mIPage.mIdentityList, &IdentityListView::contextMenu, this, &IdentityPage::slotContextMenu);
......
......@@ -49,7 +49,6 @@ private:
void itemFetchJobDone(KJob *job);
void slotReminderDone(KJob *job);
void doStart();
Akonadi::Collection mCollection;
Akonadi::Item mMessageItem;
......
......@@ -1565,7 +1565,6 @@ void KMMainWidget::slotOverrideHtmlLoadExt()
}
}
//-----------------------------------------------------------------------------
void KMMainWidget::slotForwardInlineMsg()
{
......
......@@ -127,7 +127,6 @@ public:
static void cleanup();
QAction *action(const QString &name);
QAction *sendAgainAction() const;
QAction *sendQueuedAction() const;
......@@ -198,13 +197,10 @@ public Q_SLOTS:
void slotItemsFetchedForActivation(KMCommand *command);
void slotMessageStatusChangeRequest(const Akonadi::Item &, const Akonadi::MessageStatus &, const Akonadi::MessageStatus &);
/** Adds if not existing/removes if existing the tag identified by @p aLabel
in all selected messages */
void slotUpdateMessageTagList(const Akonadi::Tag &tag);
void slotSelectCollectionFolder(const Akonadi::Collection &col);
void slotUpdateConfig();
......@@ -261,7 +257,6 @@ private:
*/
void updateMessageMenu();
void slotRemoveDuplicates();
/**
Select the given folder
......@@ -269,8 +264,6 @@ private:
*/
void folderSelected(const Akonadi::Collection &col);
/**
Start a timer to update message actions
*/
......@@ -478,7 +471,6 @@ private Q_SLOTS:
void slotCreateAddressBookContact();
void slotOpenRecentMessage(const QUrl &url);
void slotMoveMessageToTrash();
/**
* Called when a "move to trash" operation is completed
......
......@@ -73,7 +73,7 @@ private:
int mCount = 0;
bool mIconNotificationsEnabled =true;
bool mIconNotificationsEnabled = true;
QMenu *mNewMessagesPopup = nullptr;
QAction *mSendQueued = nullptr;
......
......@@ -73,7 +73,6 @@ private:
int mSize = 0;
int mLastId = 0;
UndoInfo *mCachedInfo = nullptr;
};
}
......
......@@ -36,7 +36,6 @@ public:
Q_SIGNALS:
void changeDisplayMessageFormat(MessageViewer::Viewer::DisplayFormatMessage format);
private:
void slotChangeDisplayMessageFormat(QAction *act);
void updateMenu();
......
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