GIT_SILENT: coding style

wilder-work
Laurent Montel 8 years ago
parent e936b31d8a
commit dc7b88b6bc
  1. 2
      src/configuredialog/configurecomposerpage.cpp
  2. 1
      src/kmkernel.cpp
  3. 12
      src/kmmainwidget.cpp
  4. 6
      src/kmsystemtray.cpp
  5. 1
      src/messageactions.cpp
  6. 1
      src/unityservicemanager.h

@ -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);

@ -479,7 +479,6 @@ void KMKernel::openReader()
openReader(false);
}
QStringList KMKernel::accounts() const
{
QStringList accountLst;

@ -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;

@ -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)

@ -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();
}

@ -17,7 +17,6 @@
Boston, MA 02110-1301, USA.
*/
#ifndef UNITYSERVICEMANAGER_H
#define UNITYSERVICEMANAGER_H

Loading…
Cancel
Save