summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2016-11-02 07:29:57 (GMT)
committerMontel Laurent <montel@kde.org>2016-11-02 07:29:57 (GMT)
commit260110ecbd92f98a5561ed21f9387cd8621ab24d (patch)
tree39117ef32532b2d1b546eb8a613069afd1ca23ac
parente8d4255477b2b0882f057ef474763ce34179b127 (diff)
Astyle kdelibs
-rw-r--r--messagecomposer/autotests/messagefactorytest.cpp3
-rw-r--r--messagecomposer/src/helper/messagehelper.cpp2
-rw-r--r--messageviewer/src/checkphishingurl/checkphishingurljob.cpp1
-rw-r--r--messageviewer/src/checkphishingurl/checkphishingurljob.h3
-rw-r--r--messageviewer/src/header/headerstyle_util.cpp2
-rw-r--r--messageviewer/src/viewer/viewer_p.cpp3
-rw-r--r--messageviewer/src/viewer/webengine/blockexternalresourcesurlinterceptor/blockexternalresourcesurlinterceptor.cpp4
-rw-r--r--messageviewer/src/widgets/submittedformwarningwidget.cpp1
-rw-r--r--templateparser/autotests/templateparsertest.cpp4
-rw-r--r--webengineviewer/src/webenginenavigationrequestinterceptor.cpp1
-rw-r--r--webengineviewer/src/webhittestresult.cpp1
11 files changed, 8 insertions, 17 deletions
diff --git a/messagecomposer/autotests/messagefactorytest.cpp b/messagecomposer/autotests/messagefactorytest.cpp
index 458f754..77b59cd 100644
--- a/messagecomposer/autotests/messagefactorytest.cpp
+++ b/messagecomposer/autotests/messagefactorytest.cpp
@@ -126,7 +126,6 @@ String very_simplistic_diff(const String &a, const String &b)
QTEST_MAIN(MessageFactoryTest)
-
void MessageFactoryTest::cleanupTestCase()
{
delete mIdentMan;
@@ -257,13 +256,11 @@ void MessageFactoryTest::testCreateReplyToAllWithUseSenderByNoSameIdentities()
QCOMPARE_OR_DIFF(reply.msg->encodedContent(), ba.toLatin1());
}
-
void MessageFactoryTest::testCreateReplyToList()
{
const QString filename(QStringLiteral(MAIL_DATA_DIR) + QStringLiteral("/list_message.mbox"));
KMime::Message::Ptr msg = loadMessage(filename);
-
MessageFactory factory(msg, 0);
factory.setIdentityManager(mIdentMan);
factory.setReplyStrategy(ReplyList);
diff --git a/messagecomposer/src/helper/messagehelper.cpp b/messagecomposer/src/helper/messagehelper.cpp
index 1f81073..b89f9d2 100644
--- a/messagecomposer/src/helper/messagehelper.cpp
+++ b/messagecomposer/src/helper/messagehelper.cpp
@@ -169,7 +169,7 @@ KMime::Types::AddrSpecList extractAddrSpecs(const KMime::Message::Ptr &msg, cons
KMime::Types::AddrSpecList result;
if (auto hrd = msg->headerByType(header.constData())) {
KMime::Types::AddressList al =
- MessageCore::StringUtil::splitAddressField(hrd->asUnicodeString().toUtf8());
+ MessageCore::StringUtil::splitAddressField(hrd->asUnicodeString().toUtf8());
KMime::Types::AddressList::const_iterator alend(al.constEnd());
for (KMime::Types::AddressList::const_iterator ait = al.constBegin(); ait != alend; ++ait) {
KMime::Types::MailboxList::const_iterator mitEnd((*ait).mailboxList.constEnd());
diff --git a/messageviewer/src/checkphishingurl/checkphishingurljob.cpp b/messageviewer/src/checkphishingurl/checkphishingurljob.cpp
index c25cde3..8dbdf4c 100644
--- a/messageviewer/src/checkphishingurl/checkphishingurljob.cpp
+++ b/messageviewer/src/checkphishingurl/checkphishingurljob.cpp
@@ -44,7 +44,6 @@ void CheckPhishingUrlJob::slotCheckUrlFinished(QNetworkReply *reply)
deleteLater();
}
-
void CheckPhishingUrlJob::setUrl(const QUrl &url)
{
mUrl = url;
diff --git a/messageviewer/src/checkphishingurl/checkphishingurljob.h b/messageviewer/src/checkphishingurl/checkphishingurljob.h
index 966d3e3..0fbc0cb 100644
--- a/messageviewer/src/checkphishingurl/checkphishingurljob.h
+++ b/messageviewer/src/checkphishingurl/checkphishingurljob.h
@@ -26,7 +26,8 @@
#include "messageviewer_export.h"
class QNetworkAccessManager;
class QNetworkConfigurationManager;
-namespace MessageViewer {
+namespace MessageViewer
+{
/* https://developers.google.com/safe-browsing/v4/lookup-api */
class MESSAGEVIEWER_EXPORT CheckPhishingUrlJob : public QObject
{
diff --git a/messageviewer/src/header/headerstyle_util.cpp b/messageviewer/src/header/headerstyle_util.cpp
index 57ff33d..e9dab80 100644
--- a/messageviewer/src/header/headerstyle_util.cpp
+++ b/messageviewer/src/header/headerstyle_util.cpp
@@ -63,7 +63,7 @@ QString HeaderStyleUtil::strToHtml(const QString &str, KTextToHTML::Options flag
// Prepare the date string (when printing always use the localized date)
QString HeaderStyleUtil::dateString(KMime::Message *message, bool printing, HeaderStyleUtilDateFormat dateFormat) const
-{
+{
const QDateTime dateTime = message->date()->dateTime();
const time_t unixTime = dateTime.toTime_t();
if (!dateTime.isValid()) {
diff --git a/messageviewer/src/viewer/viewer_p.cpp b/messageviewer/src/viewer/viewer_p.cpp
index 0ee7e5d..e9df1be 100644
--- a/messageviewer/src/viewer/viewer_p.cpp
+++ b/messageviewer/src/viewer/viewer_p.cpp
@@ -2001,8 +2001,7 @@ void ViewerPrivate::slotUrlOpen(const QUrl &url)
void ViewerPrivate::slotCheckUrl(MessageViewer::CheckPhishingUrlJob::UrlStatus status)
{
- switch(status)
- {
+ switch (status) {
case MessageViewer::CheckPhishingUrlJob::Ok:
break;
case MessageViewer::CheckPhishingUrlJob::MalWare:
diff --git a/messageviewer/src/viewer/webengine/blockexternalresourcesurlinterceptor/blockexternalresourcesurlinterceptor.cpp b/messageviewer/src/viewer/webengine/blockexternalresourcesurlinterceptor/blockexternalresourcesurlinterceptor.cpp
index 6ac5d53..d186ccb 100644
--- a/messageviewer/src/viewer/webengine/blockexternalresourcesurlinterceptor/blockexternalresourcesurlinterceptor.cpp
+++ b/messageviewer/src/viewer/webengine/blockexternalresourcesurlinterceptor/blockexternalresourcesurlinterceptor.cpp
@@ -44,10 +44,10 @@ bool BlockExternalResourcesUrlInterceptor::interceptRequest(QWebEngineUrlRequest
resourceType == QWebEngineUrlRequestInfo::ResourceTypeXhr ||
resourceType == QWebEngineUrlRequestInfo::ResourceTypeObject ||
resourceType == QWebEngineUrlRequestInfo::ResourceTypeScript ||
- #if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
+#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
resourceType == QWebEngineUrlRequestInfo::ResourceTypePluginResource ||
resourceType == QWebEngineUrlRequestInfo::ResourceTypeCspReport ||
- #endif
+#endif
resourceType == QWebEngineUrlRequestInfo::ResourceTypeUnknown) {
return true;
} else if (navigationType == QWebEngineUrlRequestInfo::NavigationTypeFormSubmitted) {
diff --git a/messageviewer/src/widgets/submittedformwarningwidget.cpp b/messageviewer/src/widgets/submittedformwarningwidget.cpp
index e223cb3..8df281c 100644
--- a/messageviewer/src/widgets/submittedformwarningwidget.cpp
+++ b/messageviewer/src/widgets/submittedformwarningwidget.cpp
@@ -25,7 +25,6 @@
using namespace MessageViewer;
-
SubmittedFormWarningWidget::SubmittedFormWarningWidget(QWidget *parent)
: KMessageWidget(parent)
{
diff --git a/templateparser/autotests/templateparsertest.cpp b/templateparser/autotests/templateparsertest.cpp
index d9fc6d3..95130e4 100644
--- a/templateparser/autotests/templateparsertest.cpp
+++ b/templateparser/autotests/templateparsertest.cpp
@@ -115,7 +115,7 @@ void TemplateParserTester::test_replyPlain()
// QVERIFY(!referenceData.isEmpty());
// QCOMPARE(msg->subject()->as7BitString(false).constData(), "Plain Message Test");
- // QCOMPARE(msg->contents().size(), 0);
+// QCOMPARE(msg->contents().size(), 0);
TemplateParser::TemplateParser parser(msg, TemplateParser::TemplateParser::Reply);
parser.mOtp->parseObjectTree(msg.data());
@@ -128,8 +128,6 @@ void TemplateParserTester::test_replyPlain()
QCOMPARE(convertedHtmlContent, referenceData);
}
-
-
void TemplateParserTester::test_processWithTemplatesForBody_data()
{
QTest::addColumn<QString>("command");
diff --git a/webengineviewer/src/webenginenavigationrequestinterceptor.cpp b/webengineviewer/src/webenginenavigationrequestinterceptor.cpp
index f5d34cd..a403c2f 100644
--- a/webengineviewer/src/webenginenavigationrequestinterceptor.cpp
+++ b/webengineviewer/src/webenginenavigationrequestinterceptor.cpp
@@ -17,7 +17,6 @@
Boston, MA 02110-1301, USA.
*/
-
#include "webenginenavigationrequestinterceptor.h"
#include "webenginepage.h"
using namespace WebEngineViewer;
diff --git a/webengineviewer/src/webhittestresult.cpp b/webengineviewer/src/webhittestresult.cpp
index 2b4f95e..1449f65 100644
--- a/webengineviewer/src/webhittestresult.cpp
+++ b/webengineviewer/src/webhittestresult.cpp
@@ -71,7 +71,6 @@ public:
void init(const QWebEngineContextMenuData &data);
#endif
-
bool mIsNull;
QString mAlternateText;
QRect mBoundingRect;