[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [messagelib] webengineviewer/src/checkphishingurl: Remove duplicate enums
From: Montel Laurent <montel () kde ! org>
Date: 2016-12-10 8:11:10
Message-ID: E1cFckQ-0003EQ-6T () code ! kde ! org
[Download RAW message or body]
Git commit 80c09ec99cb39677390f77216d643d1f7d4a1ae6 by Montel Laurent.
Committed on 10/12/2016 at 08:04.
Pushed by mlaurent into branch 'master'.
Remove duplicate enums
M +14 -14 webengineviewer/src/checkphishingurl/localdatabasemanager.cpp
M +2 -10 webengineviewer/src/checkphishingurl/localdatabasemanager.h
M +7 -7 webengineviewer/src/checkphishingurl/searchfullhashjob.cpp
M +2 -9 webengineviewer/src/checkphishingurl/searchfullhashjob.h
M +6 -6 webengineviewer/src/checkphishingurl/tests/searchfullhashgui.cpp
M +1 -1 webengineviewer/src/checkphishingurl/tests/searchfullhashgui.h
M +7 -7 webengineviewer/src/checkphishingurl/tests/webengineviewwithsafebrowsingsupport.cpp
M +1 -1 webengineviewer/src/checkphishingurl/tests/webengineviewwithsafebrowsingsupport.h
https://commits.kde.org/messagelib/80c09ec99cb39677390f77216d643d1f7d4a1ae6
diff --git a/webengineviewer/src/checkphishingurl/localdatabasemanager.cpp \
b/webengineviewer/src/checkphishingurl/localdatabasemanager.cpp index \
7c14f9d0..bb386079 100644
--- a/webengineviewer/src/checkphishingurl/localdatabasemanager.cpp
+++ b/webengineviewer/src/checkphishingurl/localdatabasemanager.cpp
@@ -245,12 +245,12 @@ void LocalDataBaseManager::checkUrl(const QUrl &url)
}
*/
if (conflictHashs.isEmpty()) {
- Q_EMIT checkUrlFinished(url, \
WebEngineViewer::LocalDataBaseManager::UrlOk); + Q_EMIT \
checkUrlFinished(url, WebEngineViewer::CheckPhishingUrlUtil::Ok); } else {
qCWarning(WEBENGINEVIEWER_LOG) << " We need to Check Server Database";
if (d->mNewClientState.isEmpty()) {
qCWarning(WEBENGINEVIEWER_LOG) << "Database client state is \
unknown";
- Q_EMIT checkUrlFinished(url, \
WebEngineViewer::LocalDataBaseManager::Unknown); + Q_EMIT \
checkUrlFinished(url, WebEngineViewer::CheckPhishingUrlUtil::Unknown); } else {
WebEngineViewer::SearchFullHashJob *job = new \
WebEngineViewer::SearchFullHashJob(this);
job->setDatabaseState(QStringList() << d->mNewClientState);
@@ -262,31 +262,31 @@ void LocalDataBaseManager::checkUrl(const QUrl &url)
}
} else {
qCWarning(WEBENGINEVIEWER_LOG) << "Database not ok";
- Q_EMIT checkUrlFinished(url, \
WebEngineViewer::LocalDataBaseManager::Unknown); + Q_EMIT \
checkUrlFinished(url, WebEngineViewer::CheckPhishingUrlUtil::Unknown); }
if (d->mFile.checkFileChanged()) {
d->mFile.reload();
}
}
-void LocalDataBaseManager::slotSearchOnServerResult(WebEngineViewer::SearchFullHashJob::UrlStatus \
status, const QUrl &url) +void \
LocalDataBaseManager::slotSearchOnServerResult(WebEngineViewer::CheckPhishingUrlUtil::UrlStatus \
status, const QUrl &url) {
qCWarning(WEBENGINEVIEWER_LOG) << " Url " << url << " status "<< status;
switch (status) {
- case WebEngineViewer::SearchFullHashJob::Ok:
- Q_EMIT checkUrlFinished(url, LocalDataBaseManager::UrlOk);
+ case WebEngineViewer::CheckPhishingUrlUtil::Ok:
+ Q_EMIT checkUrlFinished(url, CheckPhishingUrlUtil::Ok);
break;
- case WebEngineViewer::SearchFullHashJob::MalWare:
- Q_EMIT checkUrlFinished(url, LocalDataBaseManager::Malware);
+ case WebEngineViewer::CheckPhishingUrlUtil::MalWare:
+ Q_EMIT checkUrlFinished(url, CheckPhishingUrlUtil::MalWare);
break;
- case WebEngineViewer::SearchFullHashJob::Unknown:
- Q_EMIT checkUrlFinished(url, LocalDataBaseManager::Unknown);
+ case WebEngineViewer::CheckPhishingUrlUtil::Unknown:
+ Q_EMIT checkUrlFinished(url, CheckPhishingUrlUtil::Unknown);
break;
- case WebEngineViewer::SearchFullHashJob::InvalidUrl:
- Q_EMIT checkUrlFinished(url, LocalDataBaseManager::InvalidUrl);
+ case WebEngineViewer::CheckPhishingUrlUtil::InvalidUrl:
+ Q_EMIT checkUrlFinished(url, CheckPhishingUrlUtil::InvalidUrl);
break;
- case WebEngineViewer::SearchFullHashJob::BrokenNetwork:
- Q_EMIT checkUrlFinished(url, LocalDataBaseManager::BrokenNetwork);
+ case WebEngineViewer::CheckPhishingUrlUtil::BrokenNetwork:
+ Q_EMIT checkUrlFinished(url, CheckPhishingUrlUtil::BrokenNetwork);
break;
}
}
diff --git a/webengineviewer/src/checkphishingurl/localdatabasemanager.h \
b/webengineviewer/src/checkphishingurl/localdatabasemanager.h index \
8145a1bc..fca049d5 100644
--- a/webengineviewer/src/checkphishingurl/localdatabasemanager.h
+++ b/webengineviewer/src/checkphishingurl/localdatabasemanager.h
@@ -32,14 +32,6 @@ class WEBENGINEVIEWER_EXPORT LocalDataBaseManager : public QObject
{
Q_OBJECT
public:
- enum UrlStatus {
- Unknown = 0,
- UrlOk = 1,
- Malware = 2,
- BrokenNetwork = 3,
- InvalidUrl = 4
- };
-
explicit LocalDataBaseManager(QObject *parent = Q_NULLPTR);
~LocalDataBaseManager();
@@ -52,7 +44,7 @@ public:
void slotCreateDataBaseFileNameFinished(bool finished, const QString \
&newClientState);
Q_SIGNALS:
- void checkUrlFinished(const QUrl &url, \
WebEngineViewer::LocalDataBaseManager::UrlStatus status); + void \
checkUrlFinished(const QUrl &url, WebEngineViewer::CheckPhishingUrlUtil::UrlStatus \
status);
protected:
void setDownloadProgress(bool downloadProgress);
@@ -60,7 +52,7 @@ protected:
virtual void downloadPartialDataBase();
private:
- void slotSearchOnServerResult(WebEngineViewer::SearchFullHashJob::UrlStatus \
status, const QUrl &url); + void \
slotSearchOnServerResult(WebEngineViewer::CheckPhishingUrlUtil::UrlStatus status, \
const QUrl &url); void slotDownloadDataBaseFinished(const \
WebEngineViewer::UpdateDataBaseInfo &infoDataBase, \
WebEngineViewer::CreatePhishingUrlDataBaseJob::DataBaseDownloadResult status); void \
slotCheckDataBase(); void downloadDataBase(const QString &clientState);
diff --git a/webengineviewer/src/checkphishingurl/searchfullhashjob.cpp \
b/webengineviewer/src/checkphishingurl/searchfullhashjob.cpp index 0b216a21..92a16c85 \
100644
--- a/webengineviewer/src/checkphishingurl/searchfullhashjob.cpp
+++ b/webengineviewer/src/checkphishingurl/searchfullhashjob.cpp
@@ -102,12 +102,12 @@ void SearchFullHashJob::parse(const QByteArray &replyStr)
*/
QJsonDocument document = QJsonDocument::fromJson(replyStr);
if (document.isNull()) {
- Q_EMIT result(WebEngineViewer::SearchFullHashJob::Unknown, d->mUrl);
+ Q_EMIT result(WebEngineViewer::CheckPhishingUrlUtil::Unknown, d->mUrl);
} else {
qDebug()<<" document" << document.toJson(QJsonDocument::Indented);
const QVariantMap answer = document.toVariant().toMap();
if (answer.isEmpty()) {
- Q_EMIT result(WebEngineViewer::SearchFullHashJob::Ok, d->mUrl);
+ Q_EMIT result(WebEngineViewer::CheckPhishingUrlUtil::Ok, d->mUrl);
return;
} else {
const QVariantList info = \
answer.value(QStringLiteral("matches")).toList(); @@ -132,9 +132,9 @@ void \
SearchFullHashJob::parse(const QByteArray &replyStr) }
if (d->foundExactHash(hashList)) {
- Q_EMIT result(WebEngineViewer::SearchFullHashJob::MalWare, \
d->mUrl); + Q_EMIT \
result(WebEngineViewer::CheckPhishingUrlUtil::MalWare, d->mUrl); } else {
- Q_EMIT result(WebEngineViewer::SearchFullHashJob::Unknown, \
d->mUrl); + Q_EMIT \
result(WebEngineViewer::CheckPhishingUrlUtil::Unknown, d->mUrl); }
const QVariantMap threatEntryMetadataMap = \
map[QStringLiteral("threatEntryMetadata")].toMap(); if \
(!threatEntryMetadataMap.isEmpty()) { @@ -145,7 +145,7 @@ void \
SearchFullHashJob::parse(const QByteArray &replyStr) }
} else {
qCWarning(WEBENGINEVIEWER_LOG) << " SearchFullHashJob::parse matches \
multi element : " << info.count();
- Q_EMIT result(WebEngineViewer::SearchFullHashJob::Unknown, d->mUrl);
+ Q_EMIT result(WebEngineViewer::CheckPhishingUrlUtil::Unknown, \
d->mUrl); }
}
}
@@ -246,7 +246,7 @@ QByteArray SearchFullHashJob::jsonRequest() const
void SearchFullHashJob::start()
{
if (!PimCommon::NetworkManager::self()->networkConfigureManager()->isOnline()) {
- Q_EMIT result(WebEngineViewer::SearchFullHashJob::BrokenNetwork, d->mUrl);
+ Q_EMIT result(WebEngineViewer::CheckPhishingUrlUtil::BrokenNetwork, \
d->mUrl); deleteLater();
} else if (canStart()) {
QUrl safeUrl = \
QUrl(QStringLiteral("https://safebrowsing.googleapis.com/v4/fullHashes:find")); @@ \
-260,7 +260,7 @@ void SearchFullHashJob::start()
QNetworkReply *reply = d->mNetworkAccessManager->post(request, baPostData);
connect(reply, static_cast<void \
(QNetworkReply::*)(QNetworkReply::NetworkError)>(&QNetworkReply::error), this, \
&SearchFullHashJob::slotError); } else {
- Q_EMIT result(WebEngineViewer::SearchFullHashJob::InvalidUrl, d->mUrl);
+ Q_EMIT result(WebEngineViewer::CheckPhishingUrlUtil::InvalidUrl, d->mUrl);
deleteLater();
}
}
diff --git a/webengineviewer/src/checkphishingurl/searchfullhashjob.h \
b/webengineviewer/src/checkphishingurl/searchfullhashjob.h index e96e4ab4..092dcd2f \
100644
--- a/webengineviewer/src/checkphishingurl/searchfullhashjob.h
+++ b/webengineviewer/src/checkphishingurl/searchfullhashjob.h
@@ -24,6 +24,7 @@
#include <QUrl>
#include <QNetworkReply>
#include "webengineviewer_export.h"
+#include "checkphishingurlutil.h"
class QNetworkAccessManager;
namespace WebEngineViewer
{
@@ -36,14 +37,6 @@ public:
explicit SearchFullHashJob(QObject *parent = Q_NULLPTR);
~SearchFullHashJob();
- enum UrlStatus {
- Ok = 0,
- MalWare,
- BrokenNetwork,
- InvalidUrl,
- Unknown
- };
-
void start();
bool canStart() const;
@@ -55,7 +48,7 @@ public:
void setSearchHashs(const QHash<QByteArray, QByteArray> &hash);
Q_SIGNALS:
- void result(WebEngineViewer::SearchFullHashJob::UrlStatus status, const QUrl \
&url); + void result(WebEngineViewer::CheckPhishingUrlUtil::UrlStatus status, \
const QUrl &url); void debugJson(const QByteArray &ba);
private Q_SLOTS:
diff --git a/webengineviewer/src/checkphishingurl/tests/searchfullhashgui.cpp \
b/webengineviewer/src/checkphishingurl/tests/searchfullhashgui.cpp index \
c04b4cb6..02c741ae 100644
--- a/webengineviewer/src/checkphishingurl/tests/searchfullhashgui.cpp
+++ b/webengineviewer/src/checkphishingurl/tests/searchfullhashgui.cpp
@@ -99,23 +99,23 @@ void SearchFullHashGui::slotJSonDebug(const QByteArray &debug)
mJson->setPlainText(QString::fromLatin1(debug));
}
-void SearchFullHashGui::slotGetResult(WebEngineViewer::SearchFullHashJob::UrlStatus \
result) +void SearchFullHashGui::slotGetResult(WebEngineViewer::CheckPhishingUrlUtil::UrlStatus \
result) {
QString resultStr;
switch (result) {
- case WebEngineViewer::SearchFullHashJob::Ok:
+ case WebEngineViewer::CheckPhishingUrlUtil::Ok:
resultStr = QStringLiteral("Url ok");
break;
- case WebEngineViewer::SearchFullHashJob::MalWare:
+ case WebEngineViewer::CheckPhishingUrlUtil::MalWare:
resultStr = QStringLiteral("Url MalWare");
break;
- case WebEngineViewer::SearchFullHashJob::Unknown:
+ case WebEngineViewer::CheckPhishingUrlUtil::Unknown:
resultStr = QStringLiteral("Url Unknow state");
break;
- case WebEngineViewer::SearchFullHashJob::BrokenNetwork:
+ case WebEngineViewer::CheckPhishingUrlUtil::BrokenNetwork:
resultStr = QStringLiteral("Broken Network");
break;
- case WebEngineViewer::SearchFullHashJob::InvalidUrl:
+ case WebEngineViewer::CheckPhishingUrlUtil::InvalidUrl:
resultStr = QStringLiteral("Invalid Url");
break;
}
diff --git a/webengineviewer/src/checkphishingurl/tests/searchfullhashgui.h \
b/webengineviewer/src/checkphishingurl/tests/searchfullhashgui.h index \
8f8136e0..476e0b11 100644
--- a/webengineviewer/src/checkphishingurl/tests/searchfullhashgui.h
+++ b/webengineviewer/src/checkphishingurl/tests/searchfullhashgui.h
@@ -32,7 +32,7 @@ public:
~SearchFullHashGui();
private Q_SLOTS:
void slotCheckUrl();
- void slotGetResult(WebEngineViewer::SearchFullHashJob::UrlStatus result);
+ void slotGetResult(WebEngineViewer::CheckPhishingUrlUtil::UrlStatus result);
void slotJSonDebug(const QByteArray &debug);
private:
QLineEdit *mCheckHashLineEdit;
diff --git a/webengineviewer/src/checkphishingurl/tests/webengineviewwithsafebrowsingsupport.cpp \
b/webengineviewer/src/checkphishingurl/tests/webengineviewwithsafebrowsingsupport.cpp \
index 84c9998c..48ce1248 100644
--- a/webengineviewer/src/checkphishingurl/tests/webengineviewwithsafebrowsingsupport.cpp
+++ b/webengineviewer/src/checkphishingurl/tests/webengineviewwithsafebrowsingsupport.cpp
@@ -65,30 +65,30 @@ void WebEngineViewWithSafeBrowsingSupport::slotUrlClicked(const \
QUrl &url) WebEngineViewer::LocalDataBaseManager::self()->checkUrl(url);
}
-void WebEngineViewWithSafeBrowsingSupport::slotCheckedUrlFinished(const QUrl &url, \
WebEngineViewer::LocalDataBaseManager::UrlStatus status) +void \
WebEngineViewWithSafeBrowsingSupport::slotCheckedUrlFinished(const QUrl &url, \
WebEngineViewer::CheckPhishingUrlUtil::UrlStatus status) {
QString statusStr;
switch(status) {
- case WebEngineViewer::LocalDataBaseManager::Unknown:
+ case WebEngineViewer::CheckPhishingUrlUtil::Unknown:
statusStr = QStringLiteral("Unknown Status");
break;
- case WebEngineViewer::LocalDataBaseManager::UrlOk:
+ case WebEngineViewer::CheckPhishingUrlUtil::Ok:
statusStr = QStringLiteral("Url Ok");
break;
- case WebEngineViewer::LocalDataBaseManager::Malware:
+ case WebEngineViewer::CheckPhishingUrlUtil::MalWare:
statusStr = QStringLiteral("MalWare");
break;
- case WebEngineViewer::LocalDataBaseManager::InvalidUrl:
+ case WebEngineViewer::CheckPhishingUrlUtil::InvalidUrl:
statusStr = QStringLiteral("Invalid Url");
break;
- case WebEngineViewer::LocalDataBaseManager::BrokenNetwork:
+ case WebEngineViewer::CheckPhishingUrlUtil::BrokenNetwork:
statusStr = QStringLiteral("Broken Network");
break;
}
qDebug() << " checked url: " << url << " result : " << statusStr;
mDebug->setPlainText(QStringLiteral("Url: %1 , Status \
%2").arg(url.toDisplayString()).arg(statusStr));
- if (status != WebEngineViewer::LocalDataBaseManager::Malware) {
+ if (status != WebEngineViewer::CheckPhishingUrlUtil::MalWare) {
pageView->load(url);
}
}
diff --git a/webengineviewer/src/checkphishingurl/tests/webengineviewwithsafebrowsingsupport.h \
b/webengineviewer/src/checkphishingurl/tests/webengineviewwithsafebrowsingsupport.h \
index fc105cfb..abaf1431 100644
--- a/webengineviewer/src/checkphishingurl/tests/webengineviewwithsafebrowsingsupport.h
+++ b/webengineviewer/src/checkphishingurl/tests/webengineviewwithsafebrowsingsupport.h
@@ -38,7 +38,7 @@ public:
private Q_SLOTS:
void slotUrlClicked(const QUrl &url);
- void slotCheckedUrlFinished(const QUrl &url, \
WebEngineViewer::LocalDataBaseManager::UrlStatus status); + void \
slotCheckedUrlFinished(const QUrl &url, \
WebEngineViewer::CheckPhishingUrlUtil::UrlStatus status);
private:
QPlainTextEdit *mDebug;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic