From dc7b88b6bc789413068cd5ae55ff5165324de787 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Thu, 22 Feb 2018 22:59:12 +0100 Subject: [PATCH] GIT_SILENT: coding style --- src/configuredialog/configurecomposerpage.cpp | 2 -- src/kmkernel.cpp | 1 - src/kmmainwidget.cpp | 12 +++++++----- src/kmsystemtray.cpp | 6 +++--- src/messageactions.cpp | 1 - src/unityservicemanager.h | 1 - 6 files changed, 10 insertions(+), 13 deletions(-) diff --git a/src/configuredialog/configurecomposerpage.cpp b/src/configuredialog/configurecomposerpage.cpp index 2dc1a3c6d..7b0dcc17d 100644 --- a/src/configuredialog/configurecomposerpage.cpp +++ b/src/configuredialog/configurecomposerpage.cpp @@ -282,7 +282,6 @@ ComposerPageGeneralTab::ComposerPageGeneralTab(QWidget *parent) groupGridLayout->addWidget(mImprovePlainTextOfHtmlMessage, row, 0, 1, -1); ++row; - #ifdef KDEPIM_ENTERPRISE_BUILD ++row; // "Default forwarding type" combobox @@ -447,7 +446,6 @@ ComposerPageGeneralTab::ComposerPageGeneralTab(QWidget *parent) groupGridLayout = new QGridLayout(); row = 0; - // "Autosave interval" spinbox mAutoSave = new KPluralHandlingSpinBox(this); mAutoSave->setMaximum(60); diff --git a/src/kmkernel.cpp b/src/kmkernel.cpp index 04405470d..4ec6bf73d 100644 --- a/src/kmkernel.cpp +++ b/src/kmkernel.cpp @@ -479,7 +479,6 @@ void KMKernel::openReader() openReader(false); } - QStringList KMKernel::accounts() const { QStringList accountLst; diff --git a/src/kmmainwidget.cpp b/src/kmmainwidget.cpp index d85f21218..f23674259 100644 --- a/src/kmmainwidget.cpp +++ b/src/kmmainwidget.cpp @@ -3295,16 +3295,18 @@ void KMMainWidget::setupActions() mApplyAllFiltersFolderAction = new QAction(QIcon::fromTheme(QStringLiteral("view-filter")), i18n("Apply All Filters"), this); actionCollection()->addAction(QStringLiteral("apply_filters_folder"), mApplyAllFiltersFolderAction); connect(mApplyAllFiltersFolderAction, &QAction::triggered, - this, [this] { slotApplyFiltersOnFolder(/* recursive */ false); - }); + this, [this] { + slotApplyFiltersOnFolder(/* recursive */ false); + }); } { mApplyAllFiltersFolderRecursiveAction = new QAction(QIcon::fromTheme(QStringLiteral("view-filter")), i18n("Apply All Filters"), this); actionCollection()->addAction(QStringLiteral("apply_filters_folder_recursive"), mApplyAllFiltersFolderRecursiveAction); connect(mApplyAllFiltersFolderRecursiveAction, &QAction::triggered, - this, [this] { slotApplyFiltersOnFolder(/* recursive */ true); - }); + this, [this] { + slotApplyFiltersOnFolder(/* recursive */ true); + }); } { @@ -3836,7 +3838,7 @@ void KMMainWidget::slotAkonadiStandardActionUpdated() && mCurrentFolderSettings->canDeleteMessages()); act->setText((mCurrentFolderSettings && CommonKernel->folderIsTrash(mCurrentCollection)) ? i18n("E&mpty Trash") : i18n( - "&Move All Messages to Trash")); + "&Move All Messages to Trash")); } QList< QAction * > addToFavorite; diff --git a/src/kmsystemtray.cpp b/src/kmsystemtray.cpp index 1fbfbb176..a9a1db262 100644 --- a/src/kmsystemtray.cpp +++ b/src/kmsystemtray.cpp @@ -263,9 +263,9 @@ void KMSystemTray::hideKMail() void KMSystemTray::updateToolTip(int count) { setToolTipSubTitle(count == 0 ? i18n("There are no unread messages") - : i18np("1 unread message", - "%1 unread messages", - count)); + : i18np("1 unread message", + "%1 unread messages", + count)); } void KMSystemTray::updateStatus(int count) diff --git a/src/messageactions.cpp b/src/messageactions.cpp index 06c9e14ff..3b74df913 100644 --- a/src/messageactions.cpp +++ b/src/messageactions.cpp @@ -198,7 +198,6 @@ MessageActions::MessageActions(KActionCollection *ac, QWidget *parent) connect(mNewMessageFromTemplateAction, &QAction::triggered, this, &MessageActions::slotUseTemplate); ac->setDefaultShortcut(mNewMessageFromTemplateAction, QKeySequence(Qt::SHIFT + Qt::Key_N)); - updateActions(); } diff --git a/src/unityservicemanager.h b/src/unityservicemanager.h index c278dbe59..04d222f05 100644 --- a/src/unityservicemanager.h +++ b/src/unityservicemanager.h @@ -17,7 +17,6 @@ Boston, MA 02110-1301, USA. */ - #ifndef UNITYSERVICEMANAGER_H #define UNITYSERVICEMANAGER_H