summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2016-10-16 15:44:28 (GMT)
committerMontel Laurent <montel@kde.org>2016-10-16 15:44:28 (GMT)
commit1daedaa2ff26b2d79b4beb71fdeb25b04fd93a61 (patch)
tree186809207aee25bf77d8f443396c82f86dd08fe2
parente838ae2ce7303ba77bf7d98c3d0ab6a05612842c (diff)
Astyle kdelibs
-rw-r--r--messageviewer/src/header/plainheaderstyle.cpp1
-rw-r--r--messageviewer/src/viewer/viewer.cpp2
-rw-r--r--messageviewer/src/viewer/viewer_p.cpp2
-rw-r--r--messageviewer/src/viewer/viewer_p.h2
-rw-r--r--messageviewer/src/viewer/webengine/mailwebenginescript.cpp4
-rw-r--r--messageviewer/src/viewer/webengine/tests/testjquerysupportmailwebengine.cpp4
-rw-r--r--messageviewer/src/viewer/webengine/tests/testmaildndattachment.cpp2
-rw-r--r--messageviewer/src/viewer/webengine/tests/testmailmboxwebengine.cpp2
-rw-r--r--mimetreeparser/autotests/setupenv.h3
-rw-r--r--webengineviewer/src/tests/testjquerysupportwebengine.cpp5
-rw-r--r--webengineviewer/src/webenginemanagescript.h5
-rw-r--r--webengineviewer/src/webenginepage.cpp2
-rw-r--r--webengineviewer/src/webenginepage.h2
13 files changed, 16 insertions, 20 deletions
diff --git a/messageviewer/src/header/plainheaderstyle.cpp b/messageviewer/src/header/plainheaderstyle.cpp
index e0747af..31c51d0 100644
--- a/messageviewer/src/header/plainheaderstyle.cpp
+++ b/messageviewer/src/header/plainheaderstyle.cpp
@@ -111,7 +111,6 @@ QString PlainHeaderStyle::format(KMime::Message *message) const
if (strategy->showHeader(QStringLiteral("subject"))) {
const KTextToHTML::Options flags = KTextToHTML::PreserveSpaces | KTextToHTML::ReplaceSmileys;
-
headerStr += QStringLiteral("<div dir=\"%1\"><b style=\"font-size:130%\">").arg(subjectDir) +
d->mHeaderStyleUtil.subjectString(message, flags) + QLatin1String("</b></div>\n");
}
diff --git a/messageviewer/src/viewer/viewer.cpp b/messageviewer/src/viewer/viewer.cpp
index 7bafb84..41298ee 100644
--- a/messageviewer/src/viewer/viewer.cpp
+++ b/messageviewer/src/viewer/viewer.cpp
@@ -647,7 +647,7 @@ void Viewer::runJavaScript(const QString &code)
#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
d->mViewer->page()->runJavaScript(code, WebEngineViewer::WebEngineManageScript::scriptWordId());
#else
- d->mViewer->page()->runJavaScript(code);
+ d->mViewer->page()->runJavaScript(code);
#endif
}
diff --git a/messageviewer/src/viewer/viewer_p.cpp b/messageviewer/src/viewer/viewer_p.cpp
index ebd41eb..c57c12b 100644
--- a/messageviewer/src/viewer/viewer_p.cpp
+++ b/messageviewer/src/viewer/viewer_p.cpp
@@ -1964,7 +1964,7 @@ void ViewerPrivate::update(MimeTreeParser::UpdateMode updateMode)
void ViewerPrivate::slotOpenUrl()
{
- slotUrlOpen();
+ slotUrlOpen();
}
void ViewerPrivate::slotUrlOpen(const QUrl &url)
diff --git a/messageviewer/src/viewer/viewer_p.h b/messageviewer/src/viewer/viewer_p.h
index db72e97..822335c 100644
--- a/messageviewer/src/viewer/viewer_p.h
+++ b/messageviewer/src/viewer/viewer_p.h
@@ -405,7 +405,6 @@ public:
void setFullToAddressList(bool showFullTo);
void setFullCcAddressList(bool showFullCc);
-
/** Show/Hide the field with id "field" */
void toggleFullAddressList(const QString &field);
@@ -561,7 +560,6 @@ public Q_SLOTS:
void slotGeneralFontChanged();
-
Q_SIGNALS:
void showStatusBarMessage(const QString &message);
void replaceMsgByUnencryptedVersion();
diff --git a/messageviewer/src/viewer/webengine/mailwebenginescript.cpp b/messageviewer/src/viewer/webengine/mailwebenginescript.cpp
index be85e5b..7d67705 100644
--- a/messageviewer/src/viewer/webengine/mailwebenginescript.cpp
+++ b/messageviewer/src/viewer/webengine/mailwebenginescript.cpp
@@ -54,8 +54,8 @@ QString MailWebEngineScript::manageShowHideAttachments(bool hide)
QString source;
if (hide) {
source = QString::fromLatin1("qt.jQuery(\"#kmailhideattachment\").hide();"
- "qt.jQuery(\"#kmailshowattachment\").show();"
- "qt.jQuery(\"#attachmentid\").show();");
+ "qt.jQuery(\"#kmailshowattachment\").show();"
+ "qt.jQuery(\"#attachmentid\").show();");
} else {
source = QString::fromLatin1("qt.jQuery('#kmailshowattachment').hide();"
"qt.jQuery(\"#kmailhideattachment\").show();"
diff --git a/messageviewer/src/viewer/webengine/tests/testjquerysupportmailwebengine.cpp b/messageviewer/src/viewer/webengine/tests/testjquerysupportmailwebengine.cpp
index fdbe057..433a4d0 100644
--- a/messageviewer/src/viewer/webengine/tests/testjquerysupportmailwebengine.cpp
+++ b/messageviewer/src/viewer/webengine/tests/testjquerysupportmailwebengine.cpp
@@ -32,13 +32,11 @@
#include <MessageViewer/Viewer>
#include <MimeTreeParser/AttachmentStrategy>
-
-
TestJQuerySupportMailWebEngine::TestJQuerySupportMailWebEngine(QWidget *parent)
: QWidget(parent)
{
QVBoxLayout *vboxLayout = new QVBoxLayout(this);
- viewer = new MessageViewer::Viewer(0, 0 , new KActionCollection(this));
+ viewer = new MessageViewer::Viewer(0, 0, new KActionCollection(this));
vboxLayout->addWidget(viewer);
viewer->setMessage(readAndParseMail(QStringLiteral("encapsulated-with-attachment.mbox")));
viewer->setPluginName(QStringLiteral("enterprise"));
diff --git a/messageviewer/src/viewer/webengine/tests/testmaildndattachment.cpp b/messageviewer/src/viewer/webengine/tests/testmaildndattachment.cpp
index 411faaf..ac806d4 100644
--- a/messageviewer/src/viewer/webengine/tests/testmaildndattachment.cpp
+++ b/messageviewer/src/viewer/webengine/tests/testmaildndattachment.cpp
@@ -34,7 +34,7 @@ TestMailDndAttachment::TestMailDndAttachment(QWidget *parent)
{
QVBoxLayout *vbox = new QVBoxLayout;
setLayout(vbox);
- MessageViewer::Viewer *viewer = new MessageViewer::Viewer(0, 0 , new KActionCollection(this));
+ MessageViewer::Viewer *viewer = new MessageViewer::Viewer(0, 0, new KActionCollection(this));
vbox->addWidget(viewer);
viewer->setMessage(readAndParseMail(QStringLiteral("encapsulated-with-attachment.mbox"))/*KMime::Message::Ptr(msg)*/);
viewer->setPluginName(QStringLiteral("longheaderstyleplugin"));
diff --git a/messageviewer/src/viewer/webengine/tests/testmailmboxwebengine.cpp b/messageviewer/src/viewer/webengine/tests/testmailmboxwebengine.cpp
index 028bcbf..41afa80 100644
--- a/messageviewer/src/viewer/webengine/tests/testmailmboxwebengine.cpp
+++ b/messageviewer/src/viewer/webengine/tests/testmailmboxwebengine.cpp
@@ -34,7 +34,7 @@ TestMailMBoxWebEngine::TestMailMBoxWebEngine(QWidget *parent)
{
QVBoxLayout *vbox = new QVBoxLayout;
setLayout(vbox);
- MessageViewer::Viewer *viewer = new MessageViewer::Viewer(0, 0 , new KActionCollection(this));
+ MessageViewer::Viewer *viewer = new MessageViewer::Viewer(0, 0, new KActionCollection(this));
vbox->addWidget(viewer);
viewer->setMessage(readAndParseMail(QStringLiteral("html.mbox")));
viewer->setPluginName(QStringLiteral("longheaderstyleplugin"));
diff --git a/mimetreeparser/autotests/setupenv.h b/mimetreeparser/autotests/setupenv.h
index 21e7b19..5191300 100644
--- a/mimetreeparser/autotests/setupenv.h
+++ b/mimetreeparser/autotests/setupenv.h
@@ -154,7 +154,8 @@ public:
Q_UNUSED(msgPart);
return Interface::MessagePartRenderer::Ptr();
}
- bool isPrinting() const Q_DECL_OVERRIDE {
+ bool isPrinting() const Q_DECL_OVERRIDE
+ {
return false;
}
private:
diff --git a/webengineviewer/src/tests/testjquerysupportwebengine.cpp b/webengineviewer/src/tests/testjquerysupportwebengine.cpp
index d53d0b4..1d52c1d 100644
--- a/webengineviewer/src/tests/testjquerysupportwebengine.cpp
+++ b/webengineviewer/src/tests/testjquerysupportwebengine.cpp
@@ -28,7 +28,6 @@
#include <WebEngineViewer/WebEngineManageScript>
#include <WebEngineViewer/WebEnginePage>
-
template<typename Arg, typename R, typename C>
struct InvokeWrapper {
QPointer<R> receiver;
@@ -79,12 +78,12 @@ TestJQuerySupportWebEngine::~TestJQuerySupportWebEngine()
void TestJQuerySupportWebEngine::slotShowConsoleMessage(const QString &message)
{
- qDebug() <<"TestJQuerySupportWebEngine::slotShowConsoleMessage :"<<message;
+ qDebug() << "TestJQuerySupportWebEngine::slotShowConsoleMessage :" << message;
}
void TestJQuerySupportWebEngine::handleResultScript(const QVariant &var)
{
- qDebug() << " void TestJQuerySupportWebEngine::handleResultScript(const QVariant &var)"<<var;
+ qDebug() << " void TestJQuerySupportWebEngine::handleResultScript(const QVariant &var)" << var;
}
void TestJQuerySupportWebEngine::slotExecuteQuery()
diff --git a/webengineviewer/src/webenginemanagescript.h b/webengineviewer/src/webenginemanagescript.h
index 101762d..9f59b75 100644
--- a/webengineviewer/src/webenginemanagescript.h
+++ b/webengineviewer/src/webenginemanagescript.h
@@ -35,7 +35,10 @@ public:
~WebEngineManageScript();
void addScript(QWebEngineProfile *profile, const QString &source, const QString &scriptName, QWebEngineScript::InjectionPoint injectionPoint);
- static qint32 scriptWordId() { return (QWebEngineScript::UserWorld + 1); }
+ static qint32 scriptWordId()
+ {
+ return (QWebEngineScript::UserWorld + 1);
+ }
};
}
#endif // WEBENGINEMANAGESCRIPT_H
diff --git a/webengineviewer/src/webenginepage.cpp b/webengineviewer/src/webenginepage.cpp
index bdb5cd9..efdcb5c 100644
--- a/webengineviewer/src/webenginepage.cpp
+++ b/webengineviewer/src/webenginepage.cpp
@@ -95,8 +95,6 @@ bool WebEnginePage::acceptNavigationRequest(const QUrl &url, NavigationType type
return true;
}
-
-
void WebEngineViewer::WebEnginePage::javaScriptConsoleMessage(QWebEnginePage::JavaScriptConsoleMessageLevel level, const QString &message, int lineNumber, const QString &sourceID)
{
Q_UNUSED(level);
diff --git a/webengineviewer/src/webenginepage.h b/webengineviewer/src/webenginepage.h
index 607c927..5732cd8 100644
--- a/webengineviewer/src/webenginepage.h
+++ b/webengineviewer/src/webenginepage.h
@@ -50,7 +50,7 @@ protected:
private:
void init();
- WebEnginePagePrivate *const d;
+ WebEnginePagePrivate *const d;
};
}