summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2015-09-08 13:28:31 +0200
committerMontel Laurent <[email protected]>2015-09-08 13:29:03 +0200
commit72df6cc0a5399a8aeacb181c9f8a6aa339b904cd (patch)
tree8ffb93599670f07427d2e80b48e2cc83fe038988
parentb32d4480969f354b77fcaab596b503354493505a (diff)
Astyle kdelibs
-rw-r--r--kmail/editor/kmcomposereditorng.cpp2
-rw-r--r--kmail/editor/kmcomposewin.cpp1
-rw-r--r--messageviewer/header/briefheaderstyleplugin/briefheaderstyleinterface.cpp2
-rw-r--r--messageviewer/header/briefheaderstyleplugin/briefheaderstyleinterface.h3
-rw-r--r--messageviewer/header/customheadersettingwidget.h1
-rw-r--r--messageviewer/header/customheaderstyleplugin/customheaderstyleinterface.cpp2
-rw-r--r--messageviewer/header/customheaderstyleplugin/customheaderstyleinterface.h3
-rw-r--r--messageviewer/header/enterpriseheaderstyleplugin/enterpriseheaderstyleinterface.cpp2
-rw-r--r--messageviewer/header/enterpriseheaderstyleplugin/enterpriseheaderstyleinterface.h4
-rw-r--r--messageviewer/header/fancyheaderstyleplugin/fancyheaderstyleinterface.cpp2
-rw-r--r--messageviewer/header/fancyheaderstyleplugin/fancyheaderstyleinterface.h4
-rw-r--r--messageviewer/header/grantleeheaderstyleplugin/grantleeheaderstyleinterface.cpp2
-rw-r--r--messageviewer/header/grantleeheaderstyleplugin/grantleeheaderstyleinterface.h4
-rw-r--r--messageviewer/header/headerstyleinterface.h2
-rw-r--r--messageviewer/header/headerstylemenu.cpp1
-rw-r--r--messageviewer/header/headerstylemenu.h1
-rw-r--r--messageviewer/viewer/attachmentstrategy.cpp2
-rw-r--r--messageviewer/viewer/nodehelper.cpp9
-rw-r--r--messageviewer/viewer/nodehelper.h2
-rw-r--r--messageviewer/viewer/pluginloaderbase.cpp5
-rw-r--r--messageviewer/widgets/invitationsettings.h1
-rw-r--r--pimcommon/gravatar/gravatarcache.h1
-rw-r--r--pimcommon/shorturl/shorturlconfigurewidget.cpp1
23 files changed, 27 insertions, 30 deletions
diff --git a/kmail/editor/kmcomposereditorng.cpp b/kmail/editor/kmcomposereditorng.cpp
index 6f69e8c..afa18f7 100644
--- a/kmail/editor/kmcomposereditorng.cpp
+++ b/kmail/editor/kmcomposereditorng.cpp
@@ -55,7 +55,7 @@ void KMComposerEditorNg::addExtraMenuEntry(QMenu *menu, const QPoint &pos)
menu->addAction(mComposerWin->changeCaseMenu());
}
menu->addSeparator();
- Q_FOREACH(KToggleAction *ta, mComposerWin->customToolsList()) {
+ Q_FOREACH (KToggleAction *ta, mComposerWin->customToolsList()) {
menu->addAction(ta);
}
}
diff --git a/kmail/editor/kmcomposewin.cpp b/kmail/editor/kmcomposewin.cpp
index 43d0dcf..fe14552 100644
--- a/kmail/editor/kmcomposewin.cpp
+++ b/kmail/editor/kmcomposewin.cpp
@@ -1348,7 +1348,6 @@ void KMComposeWin::setupActions(void)
actionCollection()->addAction(QStringLiteral("setup_spellchecker"), action);
connect(action, &QAction::triggered, this, &KMComposeWin::slotSpellcheckConfig);
-
mEncryptAction = new KToggleAction(QIcon::fromTheme(QStringLiteral("document-encrypt")), i18n("&Encrypt Message"), this);
mEncryptAction->setIconText(i18n("Encrypt"));
actionCollection()->addAction(QStringLiteral("encrypt_message"), mEncryptAction);
diff --git a/messageviewer/header/briefheaderstyleplugin/briefheaderstyleinterface.cpp b/messageviewer/header/briefheaderstyleplugin/briefheaderstyleinterface.cpp
index 65199e2..da6cfb8 100644
--- a/messageviewer/header/briefheaderstyleplugin/briefheaderstyleinterface.cpp
+++ b/messageviewer/header/briefheaderstyleplugin/briefheaderstyleinterface.cpp
@@ -18,7 +18,7 @@
#include "briefheaderstyleinterface.h"
using namespace MessageViewer;
-BriefHeaderStyleInterface::BriefHeaderStyleInterface(MessageViewer::HeaderStyle *headerStyle, MessageViewer::HeaderStrategy *headerStrategy,QObject *parent)
+BriefHeaderStyleInterface::BriefHeaderStyleInterface(MessageViewer::HeaderStyle *headerStyle, MessageViewer::HeaderStrategy *headerStrategy, QObject *parent)
: MessageViewer::HeaderStyleInterface(headerStyle, headerStrategy, parent)
{
diff --git a/messageviewer/header/briefheaderstyleplugin/briefheaderstyleinterface.h b/messageviewer/header/briefheaderstyleplugin/briefheaderstyleinterface.h
index 26215c3..303dd5f 100644
--- a/messageviewer/header/briefheaderstyleplugin/briefheaderstyleinterface.h
+++ b/messageviewer/header/briefheaderstyleplugin/briefheaderstyleinterface.h
@@ -21,7 +21,8 @@
#include <header/headerstyleinterface.h>
class KActionCollection;
-namespace MessageViewer {
+namespace MessageViewer
+{
class BriefHeaderStyleInterface : public MessageViewer::HeaderStyleInterface
{
diff --git a/messageviewer/header/customheadersettingwidget.h b/messageviewer/header/customheadersettingwidget.h
index 4b1f998..2faeb72 100644
--- a/messageviewer/header/customheadersettingwidget.h
+++ b/messageviewer/header/customheadersettingwidget.h
@@ -18,7 +18,6 @@
#ifndef CUSTOMHEADERSETTINGWIDGET_H
#define CUSTOMHEADERSETTINGWIDGET_H
-
#include <QWidget>
namespace PimCommon
diff --git a/messageviewer/header/customheaderstyleplugin/customheaderstyleinterface.cpp b/messageviewer/header/customheaderstyleplugin/customheaderstyleinterface.cpp
index c366c6e..0553492 100644
--- a/messageviewer/header/customheaderstyleplugin/customheaderstyleinterface.cpp
+++ b/messageviewer/header/customheaderstyleplugin/customheaderstyleinterface.cpp
@@ -18,7 +18,7 @@
#include "customheaderstyleinterface.h"
using namespace MessageViewer;
-CustomHeaderStyleInterface::CustomHeaderStyleInterface(MessageViewer::HeaderStyle *headerStyle, MessageViewer::HeaderStrategy *headerStrategy,QObject *parent)
+CustomHeaderStyleInterface::CustomHeaderStyleInterface(MessageViewer::HeaderStyle *headerStyle, MessageViewer::HeaderStrategy *headerStrategy, QObject *parent)
: MessageViewer::HeaderStyleInterface(headerStyle, headerStrategy, parent)
{
diff --git a/messageviewer/header/customheaderstyleplugin/customheaderstyleinterface.h b/messageviewer/header/customheaderstyleplugin/customheaderstyleinterface.h
index 3db6906..8733c25 100644
--- a/messageviewer/header/customheaderstyleplugin/customheaderstyleinterface.h
+++ b/messageviewer/header/customheaderstyleplugin/customheaderstyleinterface.h
@@ -20,7 +20,8 @@
#include <header/headerstyleinterface.h>
-namespace MessageViewer {
+namespace MessageViewer
+{
class CustomHeaderStyleInterface : public MessageViewer::HeaderStyleInterface
{
diff --git a/messageviewer/header/enterpriseheaderstyleplugin/enterpriseheaderstyleinterface.cpp b/messageviewer/header/enterpriseheaderstyleplugin/enterpriseheaderstyleinterface.cpp
index c455add..f2e552f 100644
--- a/messageviewer/header/enterpriseheaderstyleplugin/enterpriseheaderstyleinterface.cpp
+++ b/messageviewer/header/enterpriseheaderstyleplugin/enterpriseheaderstyleinterface.cpp
@@ -18,7 +18,7 @@
#include "enterpriseheaderstyleinterface.h"
using namespace MessageViewer;
-EnterpriseHeaderStyleInterface::EnterpriseHeaderStyleInterface(MessageViewer::HeaderStyle *headerStyle, MessageViewer::HeaderStrategy *headerStrategy,QObject *parent)
+EnterpriseHeaderStyleInterface::EnterpriseHeaderStyleInterface(MessageViewer::HeaderStyle *headerStyle, MessageViewer::HeaderStrategy *headerStrategy, QObject *parent)
: MessageViewer::HeaderStyleInterface(headerStyle, headerStrategy, parent)
{
diff --git a/messageviewer/header/enterpriseheaderstyleplugin/enterpriseheaderstyleinterface.h b/messageviewer/header/enterpriseheaderstyleplugin/enterpriseheaderstyleinterface.h
index cc34fd6..0202550 100644
--- a/messageviewer/header/enterpriseheaderstyleplugin/enterpriseheaderstyleinterface.h
+++ b/messageviewer/header/enterpriseheaderstyleplugin/enterpriseheaderstyleinterface.h
@@ -20,8 +20,8 @@
#include <header/headerstyleinterface.h>
-
-namespace MessageViewer {
+namespace MessageViewer
+{
class EnterpriseHeaderStyleInterface : public MessageViewer::HeaderStyleInterface
{
diff --git a/messageviewer/header/fancyheaderstyleplugin/fancyheaderstyleinterface.cpp b/messageviewer/header/fancyheaderstyleplugin/fancyheaderstyleinterface.cpp
index 8daefa7..bd9ce5a 100644
--- a/messageviewer/header/fancyheaderstyleplugin/fancyheaderstyleinterface.cpp
+++ b/messageviewer/header/fancyheaderstyleplugin/fancyheaderstyleinterface.cpp
@@ -18,7 +18,7 @@
#include "fancyheaderstyleinterface.h"
using namespace MessageViewer;
-FancyHeaderStyleInterface::FancyHeaderStyleInterface(MessageViewer::HeaderStyle *headerStyle, MessageViewer::HeaderStrategy *headerStrategy,QObject *parent)
+FancyHeaderStyleInterface::FancyHeaderStyleInterface(MessageViewer::HeaderStyle *headerStyle, MessageViewer::HeaderStrategy *headerStrategy, QObject *parent)
: MessageViewer::HeaderStyleInterface(headerStyle, headerStrategy, parent)
{
diff --git a/messageviewer/header/fancyheaderstyleplugin/fancyheaderstyleinterface.h b/messageviewer/header/fancyheaderstyleplugin/fancyheaderstyleinterface.h
index f89b30a..161036d 100644
--- a/messageviewer/header/fancyheaderstyleplugin/fancyheaderstyleinterface.h
+++ b/messageviewer/header/fancyheaderstyleplugin/fancyheaderstyleinterface.h
@@ -20,8 +20,8 @@
#include <header/headerstyleinterface.h>
-
-namespace MessageViewer {
+namespace MessageViewer
+{
class FancyHeaderStyleInterface : public MessageViewer::HeaderStyleInterface
{
diff --git a/messageviewer/header/grantleeheaderstyleplugin/grantleeheaderstyleinterface.cpp b/messageviewer/header/grantleeheaderstyleplugin/grantleeheaderstyleinterface.cpp
index bd96a88..59e8c93 100644
--- a/messageviewer/header/grantleeheaderstyleplugin/grantleeheaderstyleinterface.cpp
+++ b/messageviewer/header/grantleeheaderstyleplugin/grantleeheaderstyleinterface.cpp
@@ -18,7 +18,7 @@
#include "grantleeheaderstyleinterface.h"
using namespace MessageViewer;
-GrantleeHeaderStyleInterface::GrantleeHeaderStyleInterface(MessageViewer::HeaderStyle *headerStyle, MessageViewer::HeaderStrategy *headerStrategy,QObject *parent)
+GrantleeHeaderStyleInterface::GrantleeHeaderStyleInterface(MessageViewer::HeaderStyle *headerStyle, MessageViewer::HeaderStrategy *headerStrategy, QObject *parent)
: MessageViewer::HeaderStyleInterface(headerStyle, headerStrategy, parent)
{
diff --git a/messageviewer/header/grantleeheaderstyleplugin/grantleeheaderstyleinterface.h b/messageviewer/header/grantleeheaderstyleplugin/grantleeheaderstyleinterface.h
index 3a27b68..c130ea2 100644
--- a/messageviewer/header/grantleeheaderstyleplugin/grantleeheaderstyleinterface.h
+++ b/messageviewer/header/grantleeheaderstyleplugin/grantleeheaderstyleinterface.h
@@ -20,8 +20,8 @@
#include <header/headerstyleinterface.h>
-
-namespace MessageViewer {
+namespace MessageViewer
+{
class GrantleeHeaderStyleInterface : public MessageViewer::HeaderStyleInterface
{
diff --git a/messageviewer/header/headerstyleinterface.h b/messageviewer/header/headerstyleinterface.h
index eb0e336..c1ba7ee 100644
--- a/messageviewer/header/headerstyleinterface.h
+++ b/messageviewer/header/headerstyleinterface.h
@@ -32,7 +32,7 @@ class MESSAGEVIEWER_EXPORT HeaderStyleInterface : public QObject
public:
explicit HeaderStyleInterface(MessageViewer::HeaderStyle *headerStyle, MessageViewer::HeaderStrategy *headerStrategy, QObject *parent = Q_NULLPTR);
virtual ~HeaderStyleInterface();
- QList<KToggleAction* >action() const;
+ QList<KToggleAction * > action() const;
virtual void createAction(KActionCollection *ac) = 0;
Q_SIGNALS:
diff --git a/messageviewer/header/headerstylemenu.cpp b/messageviewer/header/headerstylemenu.cpp
index 09223ea..75d715d 100644
--- a/messageviewer/header/headerstylemenu.cpp
+++ b/messageviewer/header/headerstylemenu.cpp
@@ -15,7 +15,6 @@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
#include "headerstylemenu.h"
using namespace MessageViewer;
diff --git a/messageviewer/header/headerstylemenu.h b/messageviewer/header/headerstylemenu.h
index 728086e..fd713d5 100644
--- a/messageviewer/header/headerstylemenu.h
+++ b/messageviewer/header/headerstylemenu.h
@@ -15,7 +15,6 @@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-
#ifndef HEADERSTYLEMENU_H
#define HEADERSTYLEMENU_H
diff --git a/messageviewer/viewer/attachmentstrategy.cpp b/messageviewer/viewer/attachmentstrategy.cpp
index f9d968f..d0a2ed6 100644
--- a/messageviewer/viewer/attachmentstrategy.cpp
+++ b/messageviewer/viewer/attachmentstrategy.cpp
@@ -58,7 +58,7 @@ static AttachmentStrategy::Display smartDisplay(KMime::Content *node)
const auto ct = node->contentType(false);
if (ct && ct->isText() && ct->name().trimmed().isEmpty() &&
- (!cd || cd->filename().trimmed().isEmpty()))
+ (!cd || cd->filename().trimmed().isEmpty()))
// text/* w/o filename parameter:
{
return AttachmentStrategy::Inline;
diff --git a/messageviewer/viewer/nodehelper.cpp b/messageviewer/viewer/nodehelper.cpp
index 6ba61dc..7dd8964 100644
--- a/messageviewer/viewer/nodehelper.cpp
+++ b/messageviewer/viewer/nodehelper.cpp
@@ -988,15 +988,16 @@ KMime::Message::Ptr NodeHelper::unencryptedMessage(const KMime::Message::Ptr &or
}
}
-QVector<KMime::Content*> NodeHelper::attachmentsOfExtraContents() const
+QVector<KMime::Content *> NodeHelper::attachmentsOfExtraContents() const
{
- QVector<KMime::Content*> result;
+ QVector<KMime::Content *> result;
for (auto it = mExtraContents.begin(); it != mExtraContents.end(); ++it) {
foreach (auto content, it.value()) {
- if (KMime::isAttachment(content))
+ if (KMime::isAttachment(content)) {
result.push_back(content);
- else
+ } else {
result += content->attachments();
+ }
}
}
return result;
diff --git a/messageviewer/viewer/nodehelper.h b/messageviewer/viewer/nodehelper.h
index fa9a753..3eca7bd 100644
--- a/messageviewer/viewer/nodehelper.h
+++ b/messageviewer/viewer/nodehelper.h
@@ -264,7 +264,7 @@ public:
* Note that this does not include attachments from the primary node tree.
* @see KMime::Content::attachments().
*/
- QVector<KMime::Content*> attachmentsOfExtraContents() const;
+ QVector<KMime::Content *> attachmentsOfExtraContents() const;
private:
diff --git a/messageviewer/viewer/pluginloaderbase.cpp b/messageviewer/viewer/pluginloaderbase.cpp
index 61df757..3fd9d11 100644
--- a/messageviewer/viewer/pluginloaderbase.cpp
+++ b/messageviewer/viewer/pluginloaderbase.cpp
@@ -55,11 +55,12 @@ void PluginLoaderBase::doScan(const char *path)
mPluginMap.clear();
const auto list = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QString::fromLatin1(path), QStandardPaths::LocateDirectory);
- foreach (const auto &folder, list)
+ foreach (const auto &folder, list) {
doScanOneFolder(folder);
+ }
}
-void PluginLoaderBase::doScanOneFolder(const QString& folder)
+void PluginLoaderBase::doScanOneFolder(const QString &folder)
{
QDir dir(folder);
const auto list = dir.entryList(QStringList() << QLatin1String("*.desktop"), QDir::Files | QDir::Readable);
diff --git a/messageviewer/widgets/invitationsettings.h b/messageviewer/widgets/invitationsettings.h
index ea00162..c3bf35b 100644
--- a/messageviewer/widgets/invitationsettings.h
+++ b/messageviewer/widgets/invitationsettings.h
@@ -32,7 +32,6 @@
#include <QWidget>
-
namespace MessageViewer
{
class InvitationSettingsPrivate;
diff --git a/pimcommon/gravatar/gravatarcache.h b/pimcommon/gravatar/gravatarcache.h
index a122901..ea90479 100644
--- a/pimcommon/gravatar/gravatarcache.h
+++ b/pimcommon/gravatar/gravatarcache.h
@@ -22,7 +22,6 @@
#include <QPixmap>
-
namespace PimCommon
{
class GravatarCachePrivate;
diff --git a/pimcommon/shorturl/shorturlconfigurewidget.cpp b/pimcommon/shorturl/shorturlconfigurewidget.cpp
index 7e7c19c..b7e78b6 100644
--- a/pimcommon/shorturl/shorturlconfigurewidget.cpp
+++ b/pimcommon/shorturl/shorturlconfigurewidget.cpp
@@ -39,7 +39,6 @@ public:
bool mChanged;
};
-
ShortUrlConfigureWidget::ShortUrlConfigureWidget(QWidget *parent)
: QWidget(parent),
d(new PimCommon::ShortUrlConfigureWidgetPrivate)