[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kmail] /: Astyle kdelibs
From: Montel Laurent <montel () kde ! org>
Date: 2016-10-13 5:20:59
Message-ID: E1buYRv-0001XB-BA () code ! kde ! org
[Download RAW message or body]
Git commit 8989bc85a658a6ce31f3fdcae1f6420a0972b5d2 by Montel Laurent.
Committed on 13/10/2016 at 05:20.
Pushed by mlaurent into branch 'master'.
Astyle kdelibs
M +3 -3 agents/mailfilteragent/filtermanager.cpp
M +0 -1 src/configuredialog/configureplugins/configurepluginslistwidget.cpp
M +4 -4 src/configuredialog/configuresecuritypage.cpp
M +20 -21 src/editor/kmcomposerwin.cpp
M +4 -4 src/kmcommands.cpp
M +3 -3 src/kmmainwidget.cpp
http://commits.kde.org/kmail/8989bc85a658a6ce31f3fdcae1f6420a0972b5d2
diff --git a/agents/mailfilteragent/filtermanager.cpp \
b/agents/mailfilteragent/filtermanager.cpp index e3d8915..49350e3 100644
--- a/agents/mailfilteragent/filtermanager.cpp
+++ b/agents/mailfilteragent/filtermanager.cpp
@@ -336,9 +336,9 @@ void FilterManager::readConfig()
const QString id = agent.identifier();
auto it = std::max_element(d->mFilters.constBegin(), \
d->mFilters.constEnd(),
- [id](MailCommon::MailFilter *lhs, MailCommon::MailFilter *rhs) {
- return lhs->requiredPart(id) < rhs->requiredPart(id);
- });
+ [id](MailCommon::MailFilter * lhs, MailCommon::MailFilter * rhs) {
+ return lhs->requiredPart(id) < rhs->requiredPart(id);
+ });
d->mRequiredParts[id] = (*it)->requiredPart(id);
d->mRequiredPartsBasedOnAll = qMax(d->mRequiredPartsBasedOnAll, \
d->mRequiredParts[id]); }
diff --git a/src/configuredialog/configureplugins/configurepluginslistwidget.cpp \
b/src/configuredialog/configureplugins/configurepluginslistwidget.cpp index \
9a4af85..f3e802a 100644
--- a/src/configuredialog/configureplugins/configurepluginslistwidget.cpp
+++ b/src/configuredialog/configureplugins/configurepluginslistwidget.cpp
@@ -306,7 +306,6 @@ void ConfigurePluginsListWidget::slotConfigureClicked(const \
QString &configureGr }
}
-
void ConfigurePluginsListWidget::defaults()
{
resetToUserSettings(mPluginEditorItems);
diff --git a/src/configuredialog/configuresecuritypage.cpp \
b/src/configuredialog/configuresecuritypage.cpp index e11efca..351f7a2 100644
--- a/src/configuredialog/configuresecuritypage.cpp
+++ b/src/configuredialog/configuresecuritypage.cpp
@@ -478,10 +478,10 @@ struct SMIMECryptoConfigEntries {
}
QGpgME::CryptoConfigEntry *configEntry(const QString &componentName,
- const QString &groupName,
- const QString &entryName,
- int argType,
- bool isList);
+ const QString &groupName,
+ const QString &entryName,
+ int argType,
+ bool isList);
// Checkboxes
QGpgME::CryptoConfigEntry *mCheckUsingOCSPConfigEntry;
diff --git a/src/editor/kmcomposerwin.cpp b/src/editor/kmcomposerwin.cpp
index 3e8a8b9..10a0200 100644
--- a/src/editor/kmcomposerwin.cpp
+++ b/src/editor/kmcomposerwin.cpp
@@ -1962,7 +1962,7 @@ void KMComposerWin::insertUrls(const QMimeData *source, const \
QList<QUrl> &urlLi bool KMComposerWin::insertFromMimeData(const QMimeData *source, \
bool forceAttachment) {
// If this is a PNG image, either add it as an attachment or as an inline image
- if (source->hasHtml() && mComposerBase->editor()->textMode() == \
MessageComposer::RichTextComposerNg::Rich ) { + if (source->hasHtml() && \
mComposerBase->editor()->textMode() == \
MessageComposer::RichTextComposerNg::Rich) {
const QString html = \
QString::fromUtf8(source->data(QStringLiteral("text/html"))); \
mComposerBase->editor()->insertHtml(html); return true;
@@ -2240,10 +2240,10 @@ void KMComposerWin::setEncryption(bool encrypt, bool \
setByUser)
Q_FOREACH (auto line, mComposerBase->recipientsEditor()->lines()) {
if (encrypt) {
// Encryption was enabled, update encryption status of all \
recipients
- slotRecipientAdded(qobject_cast<MessageComposer::RecipientLineNG*>(line));
+ slotRecipientAdded(qobject_cast<MessageComposer::RecipientLineNG \
*>(line)); } else {
// Encryption was disabled, remove the encryption indicator
- auto edit = qobject_cast<MessageComposer::RecipientLineNG*>(line);
+ auto edit = qobject_cast<MessageComposer::RecipientLineNG *>(line);
edit->setIcon(QIcon());
auto recipient = \
edit->data().dynamicCast<MessageComposer::Recipient>(); \
recipient->setEncryptionAction(Kleo::Impossible); @@ -3221,24 +3221,24 @@ \
QList<QAction *> KMComposerWin::pluginToolsActionListForPopupMenu() const
void KMComposerWin::slotRecipientEditorLineAdded(KPIM::MultiplyingLine *line_)
{
- auto line = qobject_cast<MessageComposer::RecipientLineNG*>(line_);
+ auto line = qobject_cast<MessageComposer::RecipientLineNG *>(line_);
Q_ASSERT(line);
connect(line, &MessageComposer::RecipientLineNG::countChanged,
- this, [this, line]() {
- this->slotRecipientAdded(line);
- });
+ this, [this, line]() {
+ this->slotRecipientAdded(line);
+ });
connect(line, &MessageComposer::RecipientLineNG::iconClicked,
- this, [this, line]() {
- this->slotRecipientLineIconClicked(line);
- });
+ this, [this, line]() {
+ this->slotRecipientLineIconClicked(line);
+ });
connect(line, &MessageComposer::RecipientLineNG::destroyed,
this, &KMComposerWin::slotRecipientEditorFocusChanged,
Qt::QueuedConnection);
connect(line, &MessageComposer::RecipientLineNG::activeChanged,
- this, [this, line]() {
- this->slotRecipientFocusLost(line);
- });
+ this, [this, line]() {
+ this->slotRecipientFocusLost(line);
+ });
slotRecipientEditorFocusChanged();
}
@@ -3256,7 +3256,7 @@ void KMComposerWin::slotRecipientEditorFocusChanged()
// but not by force
bool encrypt = false;
Q_FOREACH (auto line_, mComposerBase->recipientsEditor()->lines()) {
- auto line = qobject_cast<MessageComposer::RecipientLineNG*>(line_);
+ auto line = qobject_cast<MessageComposer::RecipientLineNG *>(line_);
// There's still a lookup job running, so wait, slotKeyForMailBoxResult()
// will call us if the job returns empty key
@@ -3282,18 +3282,17 @@ void KMComposerWin::slotRecipientEditorFocusChanged()
}
}
-
void KMComposerWin::slotRecipientLineIconClicked(MessageComposer::RecipientLineNG \
*line) {
const auto data = line->data().dynamicCast<MessageComposer::Recipient>();
if (!data->key().isNull()) {
- QProcess::startDetached(QStringLiteral("kleopatra"),
- { QStringLiteral("--query"),
- \
QString::fromLatin1(data->key().primaryFingerprint()),
- QStringLiteral("--parent-windowid"),
- QString::number(winId())
- });
+ QProcess::startDetached(QStringLiteral("kleopatra"), {
+ QStringLiteral("--query"),
+ QString::fromLatin1(data->key().primaryFingerprint()),
+ QStringLiteral("--parent-windowid"),
+ QString::number(winId())
+ });
}
}
diff --git a/src/kmcommands.cpp b/src/kmcommands.cpp
index 1310417..e84ee6d 100644
--- a/src/kmcommands.cpp
+++ b/src/kmcommands.cpp
@@ -1504,10 +1504,10 @@ KMCommand::Result KMMoveCommand::execute()
connect(job, &KIO::Job::result, this, &KMMoveCommand::slotMoveResult);
// group by source folder for undo
- std::sort(retrievedList.begin(), retrievedList.end(),
- [](const Akonadi::Item &lhs, const Akonadi::Item &rhs) {
- return lhs.storageCollectionId() < \
rhs.storageCollectionId();
- });
+ std::sort(retrievedList.begin(), retrievedList.end(),
+ [](const Akonadi::Item & lhs, const Akonadi::Item & rhs) {
+ return lhs.storageCollectionId() < rhs.storageCollectionId();
+ });
Akonadi::Collection parent;
int undoId = -1;
foreach (const Akonadi::Item &item, retrievedList) {
diff --git a/src/kmmainwidget.cpp b/src/kmmainwidget.cpp
index a934c9d..8a30cdf 100644
--- a/src/kmmainwidget.cpp
+++ b/src/kmmainwidget.cpp
@@ -1482,9 +1482,9 @@ void KMMainWidget::slotEmptyFolder()
const bool isTrash = CommonKernel->folderIsTrash(mCurrentFolder->collection());
const QString title = (isTrash) ? i18n("Empty Trash") : i18n("Move to Trash");
const QString text = (isTrash) ?
- i18n("Are you sure you want to empty the trash folder?") :
- i18n("<qt>Are you sure you want to move all messages from "
- "folder <b>%1</b> to the trash?</qt>", \
mCurrentFolder->name().toHtmlEscaped()); + i18n("Are you sure \
you want to empty the trash folder?") : + i18n("<qt>Are you \
sure you want to move all messages from " + "folder \
<b>%1</b> to the trash?</qt>", mCurrentFolder->name().toHtmlEscaped());
if (KMessageBox::warningContinueCancel(this, text, title, KGuiItem(title, \
QStringLiteral("user-trash")))
!= KMessageBox::Continue) {
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic