GIT_SILENT: coding style

wilder
Laurent Montel 6 years ago
parent 96ee24c499
commit cd918f69bf
  1. 2
      src/collectionpage/collectionexpiryjob.cpp
  2. 1
      src/collectionpage/collectionexpirypage.cpp
  3. 2
      src/collectionpage/collectionexpirypage.h
  4. 3
      src/collectionpage/collectionexpirywidget.cpp
  5. 15
      src/collectionpage/collectionexpirywidget.h
  6. 1
      src/collectionpage/collectiongeneralpage.cpp
  7. 7
      src/collectionpage/collectiongeneralwidget.cpp
  8. 1
      src/collectionpage/collectiontemplateswidget.cpp
  9. 1
      src/collectionpage/collectionviewwidget.cpp
  10. 6
      src/filter/filteractions/filteractionaddtoaddressbook.cpp
  11. 2
      src/filter/filtermanager.cpp
  12. 1
      src/filter/kmfilterdialog.cpp
  13. 2
      src/folder/foldertreewidgetproxymodel.cpp
  14. 2
      src/mdn/sendmdnhandler.cpp
  15. 4
      src/search/searchrule/searchrulenumerical.cpp
  16. 4
      src/search/searchrule/searchrulestring.cpp
  17. 3
      src/snippets/snippetsmanager.cpp
  18. 1
      src/snippets/snippetsmodel.cpp
  19. 1
      src/snippets/snippettreeview.cpp
  20. 2
      src/widgets/redirectdialog.cpp

@ -16,12 +16,10 @@ using namespace MailCommon;
CollectionExpiryJob::CollectionExpiryJob(QObject *parent)
: QObject(parent)
{
}
CollectionExpiryJob::~CollectionExpiryJob()
{
}
void CollectionExpiryJob::start()

@ -70,7 +70,6 @@ void CollectionExpiryPage::load(const Akonadi::Collection &collection)
settings.mExpireAction = attr->expireAction();
settings.mExpireToFolderId = attr->expireToFolderId();
mCollectionExpiryWidget->load(settings);
} else {
mCollectionExpiryWidget->load({});

@ -13,8 +13,6 @@
#include <Collection>
#include <CollectionPropertiesPage>
namespace MailCommon {
class CollectionExpiryWidget;
/**

@ -4,7 +4,6 @@
SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "collectionexpirywidget.h"
#include "collectionexpiryjob.h"
#include "kernel/mailkernel.h"
@ -16,7 +15,6 @@
#include <CollectionModifyJob>
#include <KPluralHandlingSpinBox>
#include <KMessageBox>
#include <QGroupBox>
@ -101,7 +99,6 @@ CollectionExpiryWidget::CollectionExpiryWidget(QWidget *parent)
CollectionExpiryWidget::~CollectionExpiryWidget()
{
}
void CollectionExpiryWidget::slotChanged()

@ -19,13 +19,14 @@ namespace MailCommon {
class FolderRequester;
struct MAILCOMMON_EXPORT CollectionExpirySettings
{
Q_REQUIRED_RESULT bool isValid() const {
return daysToExpireRead != -1 ||
daysToExpireUnread != -1 ||
mUnreadExpireUnits != ExpireCollectionAttribute::ExpireNever ||
mReadExpireUnits != ExpireCollectionAttribute::ExpireNever ||
mExpireAction != ExpireCollectionAttribute::ExpireDelete ||
mExpireToFolderId != -1;
Q_REQUIRED_RESULT bool isValid() const
{
return daysToExpireRead != -1
|| daysToExpireUnread != -1
|| mUnreadExpireUnits != ExpireCollectionAttribute::ExpireNever
|| mReadExpireUnits != ExpireCollectionAttribute::ExpireNever
|| mExpireAction != ExpireCollectionAttribute::ExpireDelete
|| mExpireToFolderId != -1;
}
bool expiryGloballyOn = false;

@ -230,7 +230,6 @@ void CollectionGeneralPage::save(Collection &collection)
} else {
annotationsAttribute->setAnnotations(annotations);
}
}
void CollectionGeneralPage::slotFolderContentsSelectionChanged(int)

@ -88,13 +88,10 @@ CollectionGeneralWidget::CollectionGeneralWidget(QWidget *parent)
"sender email address, signature and signing or encryption keys "
"automatically. Identities can be set up in the main configuration "
"dialog. (Settings -> Configure KMail)"));
}
CollectionGeneralWidget::~CollectionGeneralWidget()
{
}
void CollectionGeneralWidget::addLine(QWidget *parent, QVBoxLayout *layout)
@ -115,7 +112,6 @@ void CollectionGeneralWidget::slotIdentityCheckboxChanged()
}
}
void CollectionGeneralWidget::save(Akonadi::Collection &collection)
{
if (!mNotifyOnNewMailCheckBox->isChecked()) {
@ -132,7 +128,6 @@ void CollectionGeneralWidget::save(Akonadi::Collection &collection)
mFolderCollection->setHideInSelectionDialog(mHideInSelectionDialogCheckBox->isChecked());
mFolderCollection->writeConfig();
}
}
void CollectionGeneralWidget::load(const Akonadi::Collection &col)
@ -151,6 +146,4 @@ void CollectionGeneralWidget::load(const Akonadi::Collection &col)
mKeepRepliesInSameFolderCheckBox->setChecked(keepInFolder);
mKeepRepliesInSameFolderCheckBox->setEnabled(mFolderCollection->canCreateMessages());
mHideInSelectionDialogCheckBox->setChecked(mFolderCollection->hideInSelectionDialog());
}

@ -52,7 +52,6 @@ CollectionTemplatesWidget::CollectionTemplatesWidget(QWidget *parent)
CollectionTemplatesWidget::~CollectionTemplatesWidget()
{
}
void CollectionTemplatesWidget::save(Akonadi::Collection &)

@ -110,7 +110,6 @@ CollectionViewWidget::CollectionViewWidget(QWidget *parent)
CollectionViewWidget::~CollectionViewWidget()
{
}
void CollectionViewWidget::load(const Akonadi::Collection &col)

@ -140,13 +140,14 @@ QWidget *FilterActionAddToAddressBook::createParamWidget(QWidget *parent) const
}
namespace {
Akonadi::Tag::List namesToTags(const QStringList &names)
{
Akonadi::Tag::List tags;
tags.reserve(names.size());
std::transform(names.cbegin(), names.cend(), std::back_inserter(tags),
[](const QString &name) { return Akonadi::Tag{name}; });
[](const QString &name) {
return Akonadi::Tag{name};
});
return tags;
}
@ -158,7 +159,6 @@ QStringList tagsToNames(const Akonadi::Tag::List &tags)
std::bind(&Akonadi::Tag::name, std::placeholders::_1));
return names;
}
}
void FilterActionAddToAddressBook::setParamWidgetValue(QWidget *paramWidget) const

@ -46,7 +46,7 @@ public:
FilterManager *const q;
OrgFreedesktopAkonadiMailFilterAgentInterface *mMailFilterAgentInterface = nullptr;
QVector<MailCommon::MailFilter *> mFilters;
Akonadi::Monitor * const mMonitor;
Akonadi::Monitor *const mMonitor;
bool mInitialized = false;
};

@ -9,7 +9,6 @@
SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "kmfilterdialog.h"
#include "mailcommon_debug.h"
#include "kmfilterlistbox.h"

@ -63,7 +63,7 @@ public:
QColor brokenAccountColor;
qreal threshold = 0.0;
FolderTreeWidgetProxyModel * const q;
FolderTreeWidgetProxyModel *const q;
bool enableCheck = false;
bool hideVirtualFolder = false;
bool hideSpecificFolder = false;

@ -37,7 +37,7 @@ public:
void handleMessages();
SendMdnHandler * const q;
SendMdnHandler *const q;
IKernel *const mKernel;
QQueue<Akonadi::Item> mItemQueue;
QTimer mTimer;

@ -87,14 +87,10 @@ bool SearchRuleNumerical::matchesInternal(long numericalValue, long numericalMsg
return !msgContents.contains(contents(), Qt::CaseInsensitive);
case SearchRule::FuncRegExp:
{
return msgContents.contains(QRegularExpression(contents(), QRegularExpression::CaseInsensitiveOption));
}
case SearchRule::FuncNotRegExp:
{
return !msgContents.contains(QRegularExpression(contents(), QRegularExpression::CaseInsensitiveOption));
}
case FuncIsGreater:
return numericalMsgContents > numericalValue;

@ -258,14 +258,10 @@ bool SearchRuleString::matchesInternal(const QString &msgContents) const
return !msgContents.contains(contents(), Qt::CaseInsensitive);
case SearchRule::FuncRegExp:
{
return msgContents.contains(QRegularExpression(contents(), QRegularExpression::CaseInsensitiveOption));
}
case SearchRule::FuncNotRegExp:
{
return !msgContents.contains(QRegularExpression(contents(), QRegularExpression::CaseInsensitiveOption));
}
case SearchRule::FuncStartWith:
return msgContents.startsWith(contents());

@ -7,7 +7,6 @@
SPDX-License-Identifier: LGPL-2.0-or-later
*/
#include "snippetsmanager.h"
#include "mailcommon_debug.h"
#include "snippetdialog.h"
@ -63,7 +62,7 @@ public:
void save();
SnippetsManager * const q = nullptr;
SnippetsManager *const q = nullptr;
SnippetsModel *mModel = nullptr;
QItemSelectionModel *mSelectionModel = nullptr;
KActionCollection *mActionCollection = nullptr;

@ -7,7 +7,6 @@
SPDX-License-Identifier: LGPL-2.0-or-later
*/
#include "snippetsmodel.h"
#include <KMessageBox>

@ -7,7 +7,6 @@
SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "snippettreeview.h"
#include "snippetsmanager.h"

@ -48,7 +48,7 @@ public:
void slotUser2();
void slotAddressChanged(const QString &);
QString redirectLabelType(TypeAddress type) const;
RedirectDialog * const q = nullptr;
RedirectDialog *const q = nullptr;
RedirectWidget *mEditTo = nullptr;
RedirectWidget *mEditCc = nullptr;
RedirectWidget *mEditBcc = nullptr;

Loading…
Cancel
Save