summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2016-11-08 12:42:54 (GMT)
committerMontel Laurent <montel@kde.org>2016-11-08 12:42:54 (GMT)
commita2478015a40a00ea0443d65f705aa3e0c52c334c (patch)
tree3d4a6fd2f6ce1a8c5045cb9dccdbc32c5cd334ec
parent72246d52b1fd5add44ca8c56f762560577b9e396 (diff)
Astyle kdelibs
-rw-r--r--messageviewer/src/viewer/viewer_p.cpp2
-rw-r--r--messageviewer/src/viewer/viewer_p.h1
-rw-r--r--webengineviewer/src/checkphishingurl/checkphishingurljob.cpp34
-rw-r--r--webengineviewer/src/checkphishingurl/tests/checkphishingurlgui.cpp3
-rw-r--r--webengineviewer/src/checkphishingurl/tests/checkphishingurlgui.h1
-rw-r--r--webengineviewer/src/tests/testdndwebengine.cpp8
-rw-r--r--webengineviewer/src/tests/testdndwebengine.h2
7 files changed, 23 insertions, 28 deletions
diff --git a/messageviewer/src/viewer/viewer_p.cpp b/messageviewer/src/viewer/viewer_p.cpp
index 6ec0083..1865e70 100644
--- a/messageviewer/src/viewer/viewer_p.cpp
+++ b/messageviewer/src/viewer/viewer_p.cpp
@@ -1266,8 +1266,6 @@ void ViewerPrivate::setOverrideEncoding(const QString &encoding)
update(MimeTreeParser::Force);
}
-
-
void ViewerPrivate::setPrinting(bool enable)
{
mPrinting = enable;
diff --git a/messageviewer/src/viewer/viewer_p.h b/messageviewer/src/viewer/viewer_p.h
index 239064c..24a73a9 100644
--- a/messageviewer/src/viewer/viewer_p.h
+++ b/messageviewer/src/viewer/viewer_p.h
@@ -432,7 +432,6 @@ public:
void checkPhishingUrl();
void executeRunner(const QUrl &url);
-
private Q_SLOTS:
void slotActivatePlugin(MessageViewer::ViewerPluginInterface *interface);
void slotModifyItemDone(KJob *job);
diff --git a/webengineviewer/src/checkphishingurl/checkphishingurljob.cpp b/webengineviewer/src/checkphishingurl/checkphishingurljob.cpp
index 0128c9b..542ba8e 100644
--- a/webengineviewer/src/checkphishingurl/checkphishingurljob.cpp
+++ b/webengineviewer/src/checkphishingurl/checkphishingurljob.cpp
@@ -98,22 +98,22 @@ void CheckPhishingUrlJob::setUrl(const QUrl &url)
QByteArray CheckPhishingUrlJob::jsonRequest() const
{
#if 0
- {
- "client": {
- "clientId": "yourcompanyname",
- "clientVersion": "1.5.2"
- },
- "threatInfo": {
- "threatTypes": ["MALWARE", "SOCIAL_ENGINEERING"],
- "platformTypes": ["WINDOWS"],
- "threatEntryTypes": ["URL"],
- "threatEntries": [
- {"url": "http://www.urltocheck1.org/"},
- {"url": "http://www.urltocheck2.org/"},
- {"url": "http://www.urltocheck3.com/"}
- ]
- }
+ {
+ "client": {
+ "clientId": "yourcompanyname",
+ "clientVersion": "1.5.2"
+ },
+ "threatInfo": {
+ "threatTypes": ["MALWARE", "SOCIAL_ENGINEERING"],
+ "platformTypes": ["WINDOWS"],
+ "threatEntryTypes": ["URL"],
+ "threatEntries": [
+ {"url": "http://www.urltocheck1.org/"},
+ {"url": "http://www.urltocheck2.org/"},
+ {"url": "http://www.urltocheck3.com/"}
+ ]
}
+ }
#endif
QVariantMap clientMap;
QVariantMap map;
@@ -160,7 +160,7 @@ void CheckPhishingUrlJob::start()
request.setHeader(QNetworkRequest::ContentTypeHeader, QStringLiteral("application/json"));
const QByteArray baPostData = jsonRequest();
- qCDebug(WEBENGINEVIEWER_LOG) <<" postData.toJson()"<<baPostData;
+ qCDebug(WEBENGINEVIEWER_LOG) << " postData.toJson()" << baPostData;
Q_EMIT debugJson(baPostData);
//curl -H "Content-Type: application/json" -X POST -d '{"client":{"clientId":"KDE","clientVersion":"5.4.0"},"threatInfo":{"platformTypes":["WINDOWS"],"threatEntries":[{"url":"http://www.kde.org"}],"threatEntryTypes":["URL"],"threatTypes":["MALWARE"]}}' https://safebrowsing.googleapis.com/v4/threatMatches:find?key=AIzaSyBS62pXATjabbH2RM_jO2EzDg1mTMHlnyo
@@ -175,7 +175,7 @@ void CheckPhishingUrlJob::start()
void CheckPhishingUrlJob::slotError(QNetworkReply::NetworkError error)
{
QNetworkReply *reply = qobject_cast<QNetworkReply *>(sender());
- qDebug()<<" error "<<error << " error string : "<< reply->errorString();
+ qDebug() << " error " << error << " error string : " << reply->errorString();
reply->deleteLater();
//Q_EMIT result(WebEngineViewer::CheckPhishingUrlJob::Unknown, mUrl);
deleteLater();
diff --git a/webengineviewer/src/checkphishingurl/tests/checkphishingurlgui.cpp b/webengineviewer/src/checkphishingurl/tests/checkphishingurlgui.cpp
index 1c7a400..cfb2562 100644
--- a/webengineviewer/src/checkphishingurl/tests/checkphishingurlgui.cpp
+++ b/webengineviewer/src/checkphishingurl/tests/checkphishingurlgui.cpp
@@ -53,7 +53,6 @@ CheckPhishingUrlGui::CheckPhishingUrlGui(QWidget *parent)
mJson->setAcceptRichText(false);
layout->addWidget(mJson);
-
}
CheckPhishingUrlGui::~CheckPhishingUrlGui()
@@ -84,7 +83,7 @@ void CheckPhishingUrlGui::slotJSonDebug(const QByteArray &debug)
void CheckPhishingUrlGui::slotGetResult(WebEngineViewer::CheckPhishingUrlJob::UrlStatus result)
{
QString resultStr;
- switch(result) {
+ switch (result) {
case WebEngineViewer::CheckPhishingUrlJob::Ok:
resultStr = QStringLiteral("Url ok");
break;
diff --git a/webengineviewer/src/checkphishingurl/tests/checkphishingurlgui.h b/webengineviewer/src/checkphishingurl/tests/checkphishingurlgui.h
index 2cedf4c..7d0815f 100644
--- a/webengineviewer/src/checkphishingurl/tests/checkphishingurlgui.h
+++ b/webengineviewer/src/checkphishingurl/tests/checkphishingurlgui.h
@@ -17,7 +17,6 @@
Boston, MA 02110-1301, USA.
*/
-
#ifndef CHECKPHISHINGURLGUI_H
#define CHECKPHISHINGURLGUI_H
diff --git a/webengineviewer/src/tests/testdndwebengine.cpp b/webengineviewer/src/tests/testdndwebengine.cpp
index 688d8a0..e907a80 100644
--- a/webengineviewer/src/tests/testdndwebengine.cpp
+++ b/webengineviewer/src/tests/testdndwebengine.cpp
@@ -62,18 +62,18 @@ int main(int argc, char *argv[])
WebEngineViewBase::WebEngineViewBase(QWidget *parent)
: QWebEngineView(parent)
{
- qDebug() << "WebEngineViewBase::WebEngineViewBase(QWidget *parent)"<<this;
+ qDebug() << "WebEngineViewBase::WebEngineViewBase(QWidget *parent)" << this;
}
void WebEngineViewBase::dragEnterEvent(QDragEnterEvent *e)
{
- qDebug()<<" void WebEngineViewBase::dragEnterEvent(QDragEnterEvent *e)";
+ qDebug() << " void WebEngineViewBase::dragEnterEvent(QDragEnterEvent *e)";
QWebEngineView::dragEnterEvent(e);
}
void WebEngineViewBase::dragLeaveEvent(QDragLeaveEvent *e)
{
- qDebug()<<" void WebEngineViewBase::dragLeaveEvent(QDragEnterEvent *e)";
+ qDebug() << " void WebEngineViewBase::dragLeaveEvent(QDragEnterEvent *e)";
QWebEngineView::dragLeaveEvent(e);
}
@@ -85,6 +85,6 @@ void WebEngineViewBase::dragMoveEvent(QDragMoveEvent *e)
void WebEngineViewBase::dropEvent(QDropEvent *e)
{
- qDebug()<<" void WebEngineViewBase::dropEvent(QDropEvent *e)";
+ qDebug() << " void WebEngineViewBase::dropEvent(QDropEvent *e)";
QWebEngineView::dropEvent(e);
}
diff --git a/webengineviewer/src/tests/testdndwebengine.h b/webengineviewer/src/tests/testdndwebengine.h
index 5eb4cc3..3a42197 100644
--- a/webengineviewer/src/tests/testdndwebengine.h
+++ b/webengineviewer/src/tests/testdndwebengine.h
@@ -32,7 +32,7 @@ class WebEngineViewBase : public QWebEngineView
{
Q_OBJECT
public:
- explicit WebEngineViewBase(QWidget* parent = Q_NULLPTR);
+ explicit WebEngineViewBase(QWidget *parent = Q_NULLPTR);
protected:
void dragEnterEvent(QDragEnterEvent *e) Q_DECL_OVERRIDE;
void dragLeaveEvent(QDragLeaveEvent *e) Q_DECL_OVERRIDE;