[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [messagelib] /: GIT_SILENT: coding style (silent)
From: Montel Laurent <null () kde ! org>
Date: 2017-11-03 6:49:25
Message-ID: E1eAVnB-0005dj-VM () code ! kde ! org
[Download RAW message or body]
Git commit 6b7de3afa2a399ab09e9641bd87708c7f1947137 by Montel Laurent.
Committed on 03/11/2017 at 06:49.
Pushed by mlaurent into branch 'master'.
GIT_SILENT: coding style
M +3 -3 messageviewer/src/messagepartthemes/default/autotests/showonlymimeparttest.cpp
M +0 -1 messageviewer/src/messagepartthemes/default/autotests/util.cpp
M +3 -1 messageviewer/src/messagepartthemes/default/messagepartrendererbase.h
M +15 -9 messageviewer/src/messagepartthemes/default/messagepartrendererfactory.cpp
M +1 -1 messageviewer/src/messagepartthemes/default/messagepartrendererfactory.h
M +1 -1 messageviewer/src/messagepartthemes/default/messagepartrendererfactory_p.h
M +2 -2 messageviewer/src/messagepartthemes/default/messagepartrenderermanager.cpp
M +0 -1 messageviewer/src/messagepartthemes/default/messagepartrenderplugin.h
M +4 -5 messageviewer/src/viewer/urlhandlermanager.cpp
M +1 -1 mimetreeparser/autotests/bodypartformatterbasefactorytest.cpp
M +4 -4 mimetreeparser/src/bodypartformatterfactory.cpp
M +1 -1 mimetreeparser/src/bodypartformatterfactory.h
M +0 -1 mimetreeparser/src/htmlwriter/bufferedhtmlwriter.cpp
M +0 -1 mimetreeparser/src/htmlwriter/filehtmlwriter.cpp
M +0 -1 mimetreeparser/src/interfaces/bodypart.h
M +2 -2 mimetreeparser/src/messagepart.cpp
M +2 -2 mimetreeparser/src/messagepart.h
M +0 -1 mimetreeparser/src/partnodebodypart.cpp
https://commits.kde.org/messagelib/6b7de3afa2a399ab09e9641bd87708c7f1947137
diff --git a/messageviewer/src/messagepartthemes/default/autotests/showonlymimeparttest.cpp \
b/messageviewer/src/messagepartthemes/default/autotests/showonlymimeparttest.cpp \
index aeba9a41..24851593 100644
--- a/messageviewer/src/messagepartthemes/default/autotests/showonlymimeparttest.cpp
+++ b/messageviewer/src/messagepartthemes/default/autotests/showonlymimeparttest.cpp
@@ -57,7 +57,7 @@ void ShowOnlyMimePartTest::testDrawFrame()
QFETCH(bool, showOnlyMimePart);
QString commonName(QStringLiteral("frametest.mbox.html.content.") + \
QString::number(content)
- + \
((showOnlyMimePart)?QStringLiteral(".single"):QStringLiteral(".full"))); + \
+ ((showOnlyMimePart) ? QStringLiteral(".single") : QStringLiteral(".full")));
QString outFileName(commonName);
@@ -104,7 +104,7 @@ void ShowOnlyMimePartTest::testRelated()
QFETCH(bool, showOnlyMimePart);
QString commonName(QStringLiteral("html-multipart-related.mbox.html.content.") + \
QString::number(content)
- + \
((showOnlyMimePart)?QStringLiteral(".single"):QStringLiteral(".full"))); + \
+ ((showOnlyMimePart) ? QStringLiteral(".single") : QStringLiteral(".full")));
QString outFileName(commonName);
@@ -124,7 +124,7 @@ void ShowOnlyMimePartTest::testRelated()
fileWriter.begin();
fileWriter.write(cssHelper.htmlHead(false));
- QVERIFY(msg->contents().size()> content);
+ QVERIFY(msg->contents().size() > content);
otp.parseObjectTree(msg->contents().at(content));
diff --git a/messageviewer/src/messagepartthemes/default/autotests/util.cpp \
b/messageviewer/src/messagepartthemes/default/autotests/util.cpp index \
d3ecb30d..c64c1347 100644
--- a/messageviewer/src/messagepartthemes/default/autotests/util.cpp
+++ b/messageviewer/src/messagepartthemes/default/autotests/util.cpp
@@ -34,7 +34,6 @@ KMime::Message::Ptr MessageViewer::Test::readAndParseMail(const \
QString &mailFil return msg;
}
-
void MessageViewer::Test::compareFile(const QString &outFile, const QString \
&referenceFile) {
QVERIFY(QFile::exists(outFile));
diff --git a/messageviewer/src/messagepartthemes/default/messagepartrendererbase.h \
b/messageviewer/src/messagepartthemes/default/messagepartrendererbase.h index \
f1776292..33d725b9 100644
--- a/messageviewer/src/messagepartthemes/default/messagepartrendererbase.h
+++ b/messageviewer/src/messagepartthemes/default/messagepartrendererbase.h
@@ -52,15 +52,17 @@ public:
virtual ~RenderContext();
virtual CSSHelperBase *cssHelper() const = 0;
- template <typename T>
+ template<typename T>
inline bool renderWithFactory(const MimeTreeParser::MessagePart::Ptr &msgPart, \
MimeTreeParser::HtmlWriter *writer) {
return renderWithFactory(&T::staticMetaObject, msgPart, writer);
}
+
inline bool renderWithFactory(const MimeTreeParser::MessagePart::Ptr &msgPart, \
MimeTreeParser::HtmlWriter *writer) {
return renderWithFactory(msgPart->metaObject(), msgPart, writer);
}
+
virtual void renderSubParts(const MimeTreeParser::MessagePart::Ptr &msgPart, \
MimeTreeParser::HtmlWriter *htmlWriter) = 0;
protected:
diff --git a/messageviewer/src/messagepartthemes/default/messagepartrendererfactory.cpp \
b/messageviewer/src/messagepartthemes/default/messagepartrendererfactory.cpp index \
956e2be3..f5e3f045 100644
--- a/messageviewer/src/messagepartthemes/default/messagepartrendererfactory.cpp
+++ b/messageviewer/src/messagepartthemes/default/messagepartrendererfactory.cpp
@@ -62,8 +62,9 @@ void MessagePartRendererFactoryPrivate::setup()
void MessagePartRendererFactoryPrivate::loadPlugins()
{
- if (m_pluginSubdir.isEmpty())
+ if (m_pluginSubdir.isEmpty()) {
return;
+ }
KPluginLoader::forEachPlugin(m_pluginSubdir, [this](const QString &path) {
QPluginLoader loader(path);
@@ -135,7 +136,7 @@ MessagePartRendererFactory::MessagePartRendererFactory()
MessagePartRendererFactory::~MessagePartRendererFactory() = default;
-void MessagePartRendererFactory::setPluginPath(const QString& subdir)
+void MessagePartRendererFactory::setPluginPath(const QString &subdir)
{
d->m_pluginSubdir = subdir;
}
@@ -146,7 +147,7 @@ MessagePartRendererFactory \
*MessagePartRendererFactory::instance() return &s_instance;
}
-QVector<MessagePartRendererBase*> MessagePartRendererFactory::renderersForPart(const \
QMetaObject *mo, const MimeTreeParser::MessagePartPtr &mp) const \
+QVector<MessagePartRendererBase *> \
MessagePartRendererFactory::renderersForPart(const QMetaObject *mo, const \
MimeTreeParser::MessagePartPtr &mp) const {
d->setup();
@@ -154,30 +155,35 @@ QVector<MessagePartRendererBase*> \
MessagePartRendererFactory::renderersForPart(c QMimeDatabase db;
const auto mt = db.mimeTypeForName(mtName);
auto ancestors = mt.allAncestors();
- if (mt.isValid() || !mtName.isEmpty())
+ if (mt.isValid() || !mtName.isEmpty()) {
ancestors.prepend(mt.isValid() ? mt.name() : mtName);
+ }
auto candidates = d->m_renderers.value(mo->className());
// remove candidates with a mimetype set that don't match the mimetype of the \
part
candidates.erase(std::remove_if(candidates.begin(), candidates.end(), \
[ancestors](const RendererInfo &info) {
- if (info.mimeType.isEmpty())
+ if (info.mimeType.isEmpty()) {
return false;
+ }
return !ancestors.contains(info.mimeType);
}), candidates.end());
// sort most specific mimetpypes first
std::stable_sort(candidates.begin(), candidates.end(), [ancestors](const \
RendererInfo &lhs, const RendererInfo &rhs) {
- if (lhs.mimeType == rhs.mimeType)
+ if (lhs.mimeType == rhs.mimeType) {
return lhs.priority > rhs.priority;
- if (lhs.mimeType.isEmpty())
+ }
+ if (lhs.mimeType.isEmpty()) {
return false;
- if (rhs.mimeType.isEmpty())
+ }
+ if (rhs.mimeType.isEmpty()) {
return true;
+ }
return ancestors.indexOf(lhs.mimeType) < ancestors.indexOf(rhs.mimeType);
});
- QVector<MessagePartRendererBase*> r;
+ QVector<MessagePartRendererBase *> r;
for (const auto &candidate : candidates) {
r.push_back(candidate.renderer);
}
diff --git a/messageviewer/src/messagepartthemes/default/messagepartrendererfactory.h \
b/messageviewer/src/messagepartthemes/default/messagepartrendererfactory.h index \
5211c1f4..5b0f4262 100644
--- a/messageviewer/src/messagepartthemes/default/messagepartrendererfactory.h
+++ b/messageviewer/src/messagepartthemes/default/messagepartrendererfactory.h
@@ -58,7 +58,7 @@ public:
static MessagePartRendererFactory *instance();
- QVector<MessagePartRendererBase*> renderersForPart(const QMetaObject *mo, const \
MimeTreeParser::MessagePart::Ptr &mp) const; + QVector<MessagePartRendererBase *> \
renderersForPart(const QMetaObject *mo, const MimeTreeParser::MessagePart::Ptr &mp) \
const;
private:
Q_DISABLE_COPY(MessagePartRendererFactory)
diff --git a/messageviewer/src/messagepartthemes/default/messagepartrendererfactory_p.h \
b/messageviewer/src/messagepartthemes/default/messagepartrendererfactory_p.h index \
6d1672a9..aaf1c0ae 100644
--- a/messageviewer/src/messagepartthemes/default/messagepartrendererfactory_p.h
+++ b/messageviewer/src/messagepartthemes/default/messagepartrendererfactory_p.h
@@ -53,7 +53,7 @@ public:
void initalize_builtin_renderers();
void insert(const QByteArray &type, MessagePartRendererBase *formatter, const \
QString &mimeType = QString(), int priority = 0);
- QHash<QByteArray, std::vector<RendererInfo>> m_renderers;
+ QHash<QByteArray, std::vector<RendererInfo> > m_renderers;
QString m_pluginSubdir = QStringLiteral("messageviewer/bodypartformatter");
};
}
diff --git a/messageviewer/src/messagepartthemes/default/messagepartrenderermanager.cpp \
b/messageviewer/src/messagepartthemes/default/messagepartrenderermanager.cpp index \
13a39c37..a0d67d3a 100644
--- a/messageviewer/src/messagepartthemes/default/messagepartrenderermanager.cpp
+++ b/messageviewer/src/messagepartthemes/default/messagepartrenderermanager.cpp
@@ -65,7 +65,7 @@ inline QVariant TypeAccessor<const QGpgME::Protocol \
*>::lookUp(const QGpgME::Pro // Read-only introspection of \
std::pair<GpgME::DecryptionResult::Recipient, GpgME::Key> object. namespace Grantlee \
{ template<>
-inline QVariant TypeAccessor<std::pair<GpgME::DecryptionResult::Recipient, \
GpgME::Key>&>::lookUp(std::pair<GpgME::DecryptionResult::Recipient, GpgME::Key> const \
&object, const QString &property) +inline QVariant \
TypeAccessor<std::pair<GpgME::DecryptionResult::Recipient, GpgME::Key> \
&>::lookUp(std::pair<GpgME::DecryptionResult::Recipient, GpgME::Key> const &object, \
const QString &property) {
if (property == QStringLiteral("keyID")) {
return QString::fromLatin1(object.first.keyID());
@@ -128,7 +128,7 @@ void MessagePartRendererManager::initializeRenderer()
{
Grantlee::registerMetaType<GpgME::DecryptionResult::Recipient>();
Grantlee::registerMetaType<const QGpgME::Protocol *>();
- Grantlee::registerMetaType<std::pair<GpgME::DecryptionResult::Recipient, \
GpgME::Key>>(); + \
Grantlee::registerMetaType<std::pair<GpgME::DecryptionResult::Recipient, GpgME::Key> \
>(); m_engine = new GrantleeTheme::Engine;
foreach (const auto &p, QCoreApplication::libraryPaths()) {
m_engine->addPluginPath(p + QStringLiteral("/messageviewer"));
diff --git a/messageviewer/src/messagepartthemes/default/messagepartrenderplugin.h \
b/messageviewer/src/messagepartthemes/default/messagepartrenderplugin.h index \
ed1e084b..046f8a31 100644
--- a/messageviewer/src/messagepartthemes/default/messagepartrenderplugin.h
+++ b/messageviewer/src/messagepartthemes/default/messagepartrenderplugin.h
@@ -24,7 +24,6 @@
#include <QtPlugin>
-
namespace MessageViewer {
namespace Interface {
class BodyPartURLHandler;
diff --git a/messageviewer/src/viewer/urlhandlermanager.cpp \
b/messageviewer/src/viewer/urlhandlermanager.cpp index 817be6f0..893d82f2 100644
--- a/messageviewer/src/viewer/urlhandlermanager.cpp
+++ b/messageviewer/src/viewer/urlhandlermanager.cpp
@@ -356,7 +356,7 @@ public:
private:
QVector<const Interface::BodyPartURLHandler *> handlersForPart(KMime::Content \
*node) const;
- typedef QHash<QByteArray, QVector<const Interface::BodyPartURLHandler *>> \
BodyPartHandlerList; + typedef QHash<QByteArray, QVector<const \
Interface::BodyPartURLHandler *> > BodyPartHandlerList; BodyPartHandlerList \
mHandlers; };
@@ -364,9 +364,9 @@ URLHandlerManager::BodyPartURLHandlerManager::~BodyPartURLHandlerManager()
{
for_each(mHandlers.begin(), mHandlers.end(),
[](QVector<const Interface::BodyPartURLHandler *> &handlers) {
- for_each(handlers.begin(), handlers.end(),
- DeleteAndSetToZero<Interface::BodyPartURLHandler>());
- });
+ for_each(handlers.begin(), handlers.end(),
+ DeleteAndSetToZero<Interface::BodyPartURLHandler>());
+ });
}
void URLHandlerManager::BodyPartURLHandlerManager::registerHandler(
@@ -436,7 +436,6 @@ QVector<const Interface::BodyPartURLHandler *> \
URLHandlerManager::BodyPartURLHan return {};
}
-
bool URLHandlerManager::BodyPartURLHandlerManager::handleClick(const QUrl &url, \
ViewerPrivate *w) const {
QString path;
diff --git a/mimetreeparser/autotests/bodypartformatterbasefactorytest.cpp \
b/mimetreeparser/autotests/bodypartformatterbasefactorytest.cpp index \
9f4be8a3..5242b799 100644
--- a/mimetreeparser/autotests/bodypartformatterbasefactorytest.cpp
+++ b/mimetreeparser/autotests/bodypartformatterbasefactorytest.cpp
@@ -26,7 +26,7 @@ using namespace MimeTreeParser;
class DummyFormatter : public Interface::BodyPartFormatter
{
- MessagePartPtr process(Interface::BodyPart&) const override
+ MessagePartPtr process(Interface::BodyPart &) const override
{
return {};
}
diff --git a/mimetreeparser/src/bodypartformatterfactory.cpp \
b/mimetreeparser/src/bodypartformatterfactory.cpp index d4373678..39cae6d5 100644
--- a/mimetreeparser/src/bodypartformatterfactory.cpp
+++ b/mimetreeparser/src/bodypartformatterfactory.cpp
@@ -99,7 +99,7 @@ BodyPartFormatterFactory::~BodyPartFormatterFactory()
delete d;
}
-BodyPartFormatterFactory* BodyPartFormatterFactory::instance()
+BodyPartFormatterFactory *BodyPartFormatterFactory::instance()
{
static BodyPartFormatterFactory s_instance;
return &s_instance;
@@ -160,7 +160,7 @@ void BodyPartFormatterFactory::loadPlugins()
return;
}
- auto plugin = \
qobject_cast<MimeTreeParser::Interface::BodyPartFormatterPlugin*>(loader.instance()); \
+ auto plugin = \
qobject_cast<MimeTreeParser::Interface::BodyPartFormatterPlugin \
*>(loader.instance()); if (!plugin) {
return;
}
@@ -171,8 +171,8 @@ void BodyPartFormatterFactory::loadPlugins()
const auto mimetype = \
metaData.value(QLatin1String("mimetype")).toString(); if (mimetype.isEmpty()) {
qCWarning(MIMETREEPARSER_LOG) << "BodyPartFormatterFactory: plugin" \
<< path
- << "returned empty mimetype \
specification for index"
- << i;
+ << "returned empty mimetype \
specification for index" + << i;
break;
}
// priority should always be higher than the built-in ones, otherwise \
what's the point?
diff --git a/mimetreeparser/src/bodypartformatterfactory.h \
b/mimetreeparser/src/bodypartformatterfactory.h index 8c599817..7ab9e60f 100644
--- a/mimetreeparser/src/bodypartformatterfactory.h
+++ b/mimetreeparser/src/bodypartformatterfactory.h
@@ -52,7 +52,7 @@ public:
BodyPartFormatterFactory();
virtual ~BodyPartFormatterFactory();
- static BodyPartFormatterFactory* instance();
+ static BodyPartFormatterFactory *instance();
/**
* Returns all suitable formatters for the given mimetype.
diff --git a/mimetreeparser/src/htmlwriter/bufferedhtmlwriter.cpp \
b/mimetreeparser/src/htmlwriter/bufferedhtmlwriter.cpp index c0396c8a..020e28ae \
100644
--- a/mimetreeparser/src/htmlwriter/bufferedhtmlwriter.cpp
+++ b/mimetreeparser/src/htmlwriter/bufferedhtmlwriter.cpp
@@ -19,7 +19,6 @@
#include "bufferedhtmlwriter.h"
-
using namespace MimeTreeParser;
BufferedHtmlWriter::BufferedHtmlWriter()
diff --git a/mimetreeparser/src/htmlwriter/filehtmlwriter.cpp \
b/mimetreeparser/src/htmlwriter/filehtmlwriter.cpp index 681cdd46..eda53517 100644
--- a/mimetreeparser/src/htmlwriter/filehtmlwriter.cpp
+++ b/mimetreeparser/src/htmlwriter/filehtmlwriter.cpp
@@ -32,7 +32,6 @@
#include "filehtmlwriter.h"
#include "mimetreeparser_debug.h"
-
using namespace MimeTreeParser;
FileHtmlWriter::FileHtmlWriter(const QString &filename)
diff --git a/mimetreeparser/src/interfaces/bodypart.h \
b/mimetreeparser/src/interfaces/bodypart.h index b3d3ee0a..9a20b51f 100644
--- a/mimetreeparser/src/interfaces/bodypart.h
+++ b/mimetreeparser/src/interfaces/bodypart.h
@@ -36,7 +36,6 @@
#include "mimetreeparser_export.h"
-
namespace KMime {
class Content;
}
diff --git a/mimetreeparser/src/messagepart.cpp b/mimetreeparser/src/messagepart.cpp
index 35226c0d..e38663f5 100644
--- a/mimetreeparser/src/messagepart.cpp
+++ b/mimetreeparser/src/messagepart.cpp
@@ -99,7 +99,7 @@ PartMetaData *MessagePart::partMetaData() const
return &d->mMetaData;
}
-Interface::BodyPartMemento* MessagePart::memento() const
+Interface::BodyPartMemento *MessagePart::memento() const
{
return nodeHelper()->bodyPartMemento(content(), "__plugin__");
}
@@ -192,7 +192,7 @@ Interface::ObjectTreeSource *MessagePart::source() const
return mOtp->mSource;
}
-NodeHelper* MessagePart::nodeHelper() const
+NodeHelper *MessagePart::nodeHelper() const
{
Q_ASSERT(mOtp);
return mOtp->nodeHelper();
diff --git a/mimetreeparser/src/messagepart.h b/mimetreeparser/src/messagepart.h
index e8c5a1d7..824978ee 100644
--- a/mimetreeparser/src/messagepart.h
+++ b/mimetreeparser/src/messagepart.h
@@ -128,7 +128,7 @@ public:
void clearSubParts();
Interface::ObjectTreeSource *source() const;
- NodeHelper* nodeHelper() const;
+ NodeHelper *nodeHelper() const;
protected:
void parseInternal(KMime::Content *node, bool onlyOneMimePart);
@@ -373,7 +373,7 @@ protected:
QString mFromAddress;
bool mDecryptMessage;
QByteArray mVerifiedText;
- std::vector<std::pair<GpgME::DecryptionResult::Recipient, GpgME::Key>> \
mDecryptRecipients; + std::vector<std::pair<GpgME::DecryptionResult::Recipient, \
GpgME::Key> > mDecryptRecipients;
friend class DefaultRendererPrivate;
friend class EncryptedBodyPartFormatter;
diff --git a/mimetreeparser/src/partnodebodypart.cpp \
b/mimetreeparser/src/partnodebodypart.cpp index 4cf82a11..c997e21a 100644
--- a/mimetreeparser/src/partnodebodypart.cpp
+++ b/mimetreeparser/src/partnodebodypart.cpp
@@ -37,7 +37,6 @@
#include "mimetreeparser_debug.h"
#include <KMime/Content>
-
using namespace MimeTreeParser;
PartNodeBodyPart::PartNodeBodyPart(ObjectTreeParser *otp, ProcessResult *result, \
KMime::Content *topLevelContent, KMime::Content *content, NodeHelper *nodeHelper)
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic