[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [messagelib] /: Astyle
From: Montel Laurent <montel () kde ! org>
Date: 2016-06-30 20:07:10
Message-ID: E1bIiEw-0003S6-9M () code ! kde ! org
[Download RAW message or body]
Git commit cfbdb3fcf163a2f0665e3d3deea39c513595fafb by Montel Laurent.
Committed on 30/06/2016 at 20:07.
Pushed by mlaurent into branch 'master'.
Astyle
M +0 -1 messagecomposer/autotests/plugineditorcheckbeforesendparamstest.cpp
M +0 -1 messagecomposer/src/imagescaling/autotests/imagescalingtest.cpp
M +0 -2 messagecomposer/src/recipient/distributionlistdialog.cpp
M +1 -1 messagelist/src/core/threadingcache.cpp
M +1 -1 messagelist/src/core/widgetbase.cpp
M +5 -6 messagelist/src/core/widgets/searchcollectionindexingwarning.cpp
M +2 -1 messagelist/src/core/widgets/searchcollectionindexingwarning.h
M +0 -1 messageviewer/autotests/setupenv.h
M +0 -1 messageviewer/src/header/grantleeheaderteststyle.h
M +0 -1 messageviewer/src/header/headerstylemenumanager.h
M +0 -2 messageviewer/src/messagepartthemes/default/defaultrenderer.cpp
M +1 -1 messageviewer/src/messagepartthemes/default/defaultrenderer.h
M +0 -1 messageviewer/src/messagepartthemes/default/htmlblock.h
M +0 -6 messageviewer/src/messagepartthemes/default/messagepartrenderermanager.cpp
M +1 -2 messageviewer/src/viewer/urlhandlermanager.cpp
M +2 -2 messageviewer/src/viewer/viewer_p.cpp
M +0 -2 messageviewer/src/viewer/viewer_p.h
M +0 -1 mimetreeparser/src/viewer/bodypartformatterbasefactory.h
M +1 -1 mimetreeparser/src/viewer/nodehelper.cpp
http://commits.kde.org/messagelib/cfbdb3fcf163a2f0665e3d3deea39c513595fafb
diff --git a/messagecomposer/autotests/plugineditorcheckbeforesendparamstest.cpp \
b/messagecomposer/autotests/plugineditorcheckbeforesendparamstest.cpp index \
ea8c866..c66038d 100644
--- a/messagecomposer/autotests/plugineditorcheckbeforesendparamstest.cpp
+++ b/messagecomposer/autotests/plugineditorcheckbeforesendparamstest.cpp
@@ -69,7 +69,6 @@ void PluginEditorCheckBeforeSendParamsTest::shouldBeEqual()
params1.setCcAddresses(cc);
params1.setToAddresses(to);
-
MessageComposer::PluginEditorCheckBeforeSendParams params2 = params1;
QVERIFY(params2 == params1);
QCOMPARE(params2.isHtmlMail(), isHmlMail);
diff --git a/messagecomposer/src/imagescaling/autotests/imagescalingtest.cpp \
b/messagecomposer/src/imagescaling/autotests/imagescalingtest.cpp index \
dbb61dd..2aa8c29 100644
--- a/messagecomposer/src/imagescaling/autotests/imagescalingtest.cpp
+++ b/messagecomposer/src/imagescaling/autotests/imagescalingtest.cpp
@@ -17,7 +17,6 @@
Boston, MA 02110-1301, USA.
*/
-
#include "imagescalingtest.h"
#include "settings/messagecomposersettings.h"
#include "../imagescaling.h"
diff --git a/messagecomposer/src/recipient/distributionlistdialog.cpp \
b/messagecomposer/src/recipient/distributionlistdialog.cpp index a5b70d0..832ee72 \
100644
--- a/messagecomposer/src/recipient/distributionlistdialog.cpp
+++ b/messagecomposer/src/recipient/distributionlistdialog.cpp
@@ -111,8 +111,6 @@ DistributionListDialog::DistributionListDialog(QWidget *parent)
QWidget *topFrame = new QWidget(this);
mainLayout->addWidget(topFrame);
-
-
QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Cancel);
mUser1Button = new QPushButton;
buttonBox->addButton(mUser1Button, QDialogButtonBox::ActionRole);
diff --git a/messagelist/src/core/threadingcache.cpp \
b/messagelist/src/core/threadingcache.cpp index 16a8ad3..32e9a6c 100644
--- a/messagelist/src/core/threadingcache.cpp
+++ b/messagelist/src/core/threadingcache.cpp
@@ -167,7 +167,7 @@ void ThreadingCache::save()
QFile cacheFile(cacheDir.filePath(QStringLiteral("messagelist/threading/%1").arg(mCacheId)));
if (!cacheFile.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
- qCWarning(MESSAGELIST_LOG) << "Failed to create cache file:" << \
cacheFile.errorString() << " mCacheId "<<mCacheId; + \
qCWarning(MESSAGELIST_LOG) << "Failed to create cache file:" << \
cacheFile.errorString() << " mCacheId " << mCacheId; return;
}
diff --git a/messagelist/src/core/widgetbase.cpp \
b/messagelist/src/core/widgetbase.cpp index e22fa97..b3cabdd 100644
--- a/messagelist/src/core/widgetbase.cpp
+++ b/messagelist/src/core/widgetbase.cpp
@@ -148,7 +148,7 @@ Widget::Widget(QWidget *pParent)
d->quickSearchWarning = new QuickSearchWarning(this);
g->addWidget(d->quickSearchWarning, 0);
d->searchCollectionIndexingWarning = new SearchCollectionIndexingWarning(this);
- g->addWidget( d->searchCollectionIndexingWarning, 0);
+ g->addWidget(d->searchCollectionIndexingWarning, 0);
d->mView = new View(this);
d->mView->setFrameStyle(QFrame::NoFrame);
diff --git a/messagelist/src/core/widgets/searchcollectionindexingwarning.cpp \
b/messagelist/src/core/widgets/searchcollectionindexingwarning.cpp index \
0b67a65..e8b5cb4 100644
--- a/messagelist/src/core/widgets/searchcollectionindexingwarning.cpp
+++ b/messagelist/src/core/widgets/searchcollectionindexingwarning.cpp
@@ -53,18 +53,17 @@ SearchCollectionIndexingWarning::~SearchCollectionIndexingWarning()
{
}
-Akonadi::CollectionFetchJob *SearchCollectionIndexingWarning::fetchCollections(const \
Akonadi::Collection::List& cols, bool recursive) +Akonadi::CollectionFetchJob \
*SearchCollectionIndexingWarning::fetchCollections(const Akonadi::Collection::List \
&cols, bool recursive) {
const Akonadi::CollectionFetchJob::Type type = recursive ? \
Akonadi::CollectionFetchJob::Recursive : \
Akonadi::CollectionFetchJob::Base;
Akonadi::CollectionFetchJob *fetch = new Akonadi::CollectionFetchJob(cols, type, \
this);
fetch->fetchScope().setAncestorRetrieval(Akonadi::CollectionFetchScope::None);
fetch->fetchScope().setContentMimeTypes(QStringList() << \
Akonadi::Collection::mimeType()
- << \
QStringLiteral("message/rfc822")); + << \
QStringLiteral("message/rfc822")); fetch->fetchScope().setIncludeStatistics(true);
return fetch;
}
-
void SearchCollectionIndexingWarning::setCollection(const Akonadi::Collection \
&collection) {
if (collection == mCollection) {
@@ -93,7 +92,7 @@ void SearchCollectionIndexingWarning::setCollection(const \
Akonadi::Collection &c
connect(fetch, SIGNAL(finished(KJob*)), this, \
SLOT(queryRootCollectionFetchFinished(KJob*))); }
-void SearchCollectionIndexingWarning::queryRootCollectionFetchFinished(KJob* job)
+void SearchCollectionIndexingWarning::queryRootCollectionFetchFinished(KJob *job)
{
if (job->error()) {
qCWarning(MESSAGELIST_LOG) << job->errorString();
@@ -101,7 +100,7 @@ void \
SearchCollectionIndexingWarning::queryRootCollectionFetchFinished(KJob* job }
// Store the root collections
- mCollections = qobject_cast<Akonadi::CollectionFetchJob*>(job)->collections();
+ mCollections = qobject_cast<Akonadi::CollectionFetchJob *>(job)->collections();
if (job->property("recursiveQuery").toBool()) {
// Fetch all descendants, if necessary
@@ -119,7 +118,7 @@ void \
SearchCollectionIndexingWarning::queryCollectionFetchFinished(KJob *job) return;
}
- mCollections += qobject_cast<Akonadi::CollectionFetchJob*>(job)->collections();
+ mCollections += qobject_cast<Akonadi::CollectionFetchJob *>(job)->collections();
queryIndexerStatus();
}
diff --git a/messagelist/src/core/widgets/searchcollectionindexingwarning.h \
b/messagelist/src/core/widgets/searchcollectionindexingwarning.h index \
cf53f33..b1a8556 100644
--- a/messagelist/src/core/widgets/searchcollectionindexingwarning.h
+++ b/messagelist/src/core/widgets/searchcollectionindexingwarning.h
@@ -35,7 +35,8 @@ class IndexedItems;
}
}
}
-namespace Akonadi {
+namespace Akonadi
+{
class CollectionFetchJob;
}
namespace MessageList
diff --git a/messageviewer/autotests/setupenv.h b/messageviewer/autotests/setupenv.h
index 21bcb93..42cdbc7 100644
--- a/messageviewer/autotests/setupenv.h
+++ b/messageviewer/autotests/setupenv.h
@@ -38,7 +38,6 @@ namespace Test
*/
void setupEnv();
-
}
}
diff --git a/messageviewer/src/header/grantleeheaderteststyle.h \
b/messageviewer/src/header/grantleeheaderteststyle.h index 6dde8c4..9a507d1 100644
--- a/messageviewer/src/header/grantleeheaderteststyle.h
+++ b/messageviewer/src/header/grantleeheaderteststyle.h
@@ -17,7 +17,6 @@
Boston, MA 02110-1301, USA.
*/
-
#ifndef GRANTLEEHEADERTESTSTYLE_H
#define GRANTLEEHEADERTESTSTYLE_H
diff --git a/messageviewer/src/header/headerstylemenumanager.h \
b/messageviewer/src/header/headerstylemenumanager.h index c3fddb5..095de10 100644
--- a/messageviewer/src/header/headerstylemenumanager.h
+++ b/messageviewer/src/header/headerstylemenumanager.h
@@ -17,7 +17,6 @@
Boston, MA 02110-1301, USA.
*/
-
#ifndef HEADERSTYLEMENU_H
#define HEADERSTYLEMENU_H
diff --git a/messageviewer/src/messagepartthemes/default/defaultrenderer.cpp \
b/messageviewer/src/messagepartthemes/default/defaultrenderer.cpp index \
3cb41bf..d40970e 100644
--- a/messageviewer/src/messagepartthemes/default/defaultrenderer.cpp
+++ b/messageviewer/src/messagepartthemes/default/defaultrenderer.cpp
@@ -64,7 +64,6 @@ using namespace MessageViewer;
Q_DECLARE_METATYPE(GpgME::DecryptionResult::Recipient)
Q_DECLARE_METATYPE(const Kleo::CryptoBackend::Protocol *)
-
static QString iconToDataUrl(const QString &iconPath)
{
QFile f(iconPath);
@@ -1319,7 +1318,6 @@ public:
return QString();
}
-
QString mHtml;
Interface::MessagePart::Ptr mMsgPart;
private:
diff --git a/messageviewer/src/messagepartthemes/default/defaultrenderer.h \
b/messageviewer/src/messagepartthemes/default/defaultrenderer.h index \
e06c0d9..ad896dc 100644
--- a/messageviewer/src/messagepartthemes/default/defaultrenderer.h
+++ b/messageviewer/src/messagepartthemes/default/defaultrenderer.h
@@ -43,7 +43,7 @@ class DefaultRendererPrivate;
class DefaultRenderer : public MimeTreeParser::Interface::MessagePartRenderer
{
public:
- DefaultRenderer(const MimeTreeParser::Interface::MessagePartPtr& msgPart, \
CSSHelperBase *cssHelder); + DefaultRenderer(const \
MimeTreeParser::Interface::MessagePartPtr &msgPart, CSSHelperBase *cssHelder); \
~DefaultRenderer();
QString html() const Q_DECL_OVERRIDE;
diff --git a/messageviewer/src/messagepartthemes/default/htmlblock.h \
b/messageviewer/src/messagepartthemes/default/htmlblock.h index de6a12c..0731cab \
100644
--- a/messageviewer/src/messagepartthemes/default/htmlblock.h
+++ b/messageviewer/src/messagepartthemes/default/htmlblock.h
@@ -24,7 +24,6 @@
#include <QSharedPointer>
#include <QVector>
-
namespace KMime
{
class Content;
diff --git a/messageviewer/src/messagepartthemes/default/messagepartrenderermanager.cpp \
b/messageviewer/src/messagepartthemes/default/messagepartrenderermanager.cpp index \
ad16f71..37f7378 100644
--- a/messageviewer/src/messagepartthemes/default/messagepartrenderermanager.cpp
+++ b/messageviewer/src/messagepartthemes/default/messagepartrenderermanager.cpp
@@ -17,7 +17,6 @@
02110-1301, USA.
*/
-
#include "messagepartrenderermanager.h"
#include "messageviewer_debug.h"
#include <KIconLoader>
@@ -26,14 +25,12 @@
#include <GrantleeTheme/QtResourceTemplateLoader>
#include <GrantleeTheme/GrantleeThemeEngine>
-
#include <gpgme++/verificationresult.h>
#include <gpgme++/decryptionresult.h>
#include <Libkleo/CryptoBackend>
#include <Libkleo/CryptoBackendFactory>
-
#include <grantlee/context.h>
#include <grantlee/engine.h>
#include <grantlee/metatype.h>
@@ -63,8 +60,6 @@ inline QVariant TypeAccessor<const Kleo::CryptoBackend::Protocol \
*>::lookUp(cons }
}
-
-
using namespace MessageViewer;
class MessagePartRendererManagerInstancePrivate
@@ -85,7 +80,6 @@ public:
Q_GLOBAL_STATIC(MessagePartRendererManagerInstancePrivate, sInstance)
-
MessagePartRendererManager::MessagePartRendererManager(QObject *parent)
: QObject(parent),
m_engine(Q_NULLPTR)
diff --git a/messageviewer/src/viewer/urlhandlermanager.cpp \
b/messageviewer/src/viewer/urlhandlermanager.cpp index c3038bf..7afcfc6 100644
--- a/messageviewer/src/viewer/urlhandlermanager.cpp
+++ b/messageviewer/src/viewer/urlhandlermanager.cpp
@@ -926,8 +926,7 @@ bool AttachmentURLHandler::handleClick(const QUrl &url, \
ViewerPrivate *w) const if (inHeader) {
w->scrollToAttachment(node);
}
- if (shouldShowDialog)
- {
+ if (shouldShowDialog) {
w->openAttachment(node, w->nodeHelper()->tempFileUrlFromNode(node));
}
diff --git a/messageviewer/src/viewer/viewer_p.cpp \
b/messageviewer/src/viewer/viewer_p.cpp index d8eabc7..50b8d70 100644
--- a/messageviewer/src/viewer/viewer_p.cpp
+++ b/messageviewer/src/viewer/viewer_p.cpp
@@ -830,8 +830,8 @@ void ViewerPrivate::displayMessage()
}
htmlWriter()->queue(QStringLiteral("<div \
style=\"background:%1;color:%2;border:1px solid \
%3\">%4</div>").arg(mBackgroundError.name(),
- \
mForegroundError.name(),
- \
mForegroundError.name(), attr->message().toHtmlEscaped())); + \
mForegroundError.name(), + mForegroundError.name(), \
attr->message().toHtmlEscaped())); htmlWriter()->queue(QStringLiteral("<p></p>"));
}
diff --git a/messageviewer/src/viewer/viewer_p.h \
b/messageviewer/src/viewer/viewer_p.h index 57b2b93..b58da26 100644
--- a/messageviewer/src/viewer/viewer_p.h
+++ b/messageviewer/src/viewer/viewer_p.h
@@ -667,11 +667,9 @@ public:
QString mCurrentFileName;
QString mMessagePath;
-
QColor mForegroundError;
QColor mBackgroundError;
-
Viewer *const q;
bool mShowFullToAddressList;
bool mShowFullCcAddressList;
diff --git a/mimetreeparser/src/viewer/bodypartformatterbasefactory.h \
b/mimetreeparser/src/viewer/bodypartformatterbasefactory.h index 49b3e79..d1d6176 \
100644
--- a/mimetreeparser/src/viewer/bodypartformatterbasefactory.h
+++ b/mimetreeparser/src/viewer/bodypartformatterbasefactory.h
@@ -39,7 +39,6 @@
#include <map>
#include <QByteArray>
-
namespace MimeTreeParser
{
diff --git a/mimetreeparser/src/viewer/nodehelper.cpp \
b/mimetreeparser/src/viewer/nodehelper.cpp index f9a0bc8..745930c 100644
--- a/mimetreeparser/src/viewer/nodehelper.cpp
+++ b/mimetreeparser/src/viewer/nodehelper.cpp
@@ -696,7 +696,7 @@ KMime::Content *NodeHelper::contentFromIndex(KMime::Content \
*node, const QString for (int i = 0; i < pathParts.size(); ++i) {
const QString &path = pathParts[i];
if (path.startsWith(QLatin1Char('e'))) {
- const QList<KMime::Content*> &extraParts = mExtraContents.value(c);
+ const QList<KMime::Content *> &extraParts = mExtraContents.value(c);
const int idx = path.midRef(1, -1).toInt();
c = (idx < extraParts.size()) ? extraParts[idx] : Q_NULLPTR;
} else {
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic