summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2016-11-18 15:13:25 (GMT)
committerMontel Laurent <montel@kde.org>2016-11-18 15:13:25 (GMT)
commitaaeb12d5b1212cbbf80a8445657fdcd357b79e71 (patch)
treed1ebb01e55daa13825a92bbcc86f753824906c47
parent135da872ec67ada1aa4fda327c67f5cbf9421d35 (diff)
Remove enum
-rw-r--r--webengineviewer/src/checkphishingurl/autotests/createphishingurldatabasejobtest.cpp4
-rw-r--r--webengineviewer/src/checkphishingurl/createphishingurldatabasejob.cpp2
-rw-r--r--webengineviewer/src/checkphishingurl/createphishingurldatabasejob.h8
3 files changed, 7 insertions, 7 deletions
diff --git a/webengineviewer/src/checkphishingurl/autotests/createphishingurldatabasejobtest.cpp b/webengineviewer/src/checkphishingurl/autotests/createphishingurldatabasejobtest.cpp
index 09451eb..5311bed 100644
--- a/webengineviewer/src/checkphishingurl/autotests/createphishingurldatabasejobtest.cpp
+++ b/webengineviewer/src/checkphishingurl/autotests/createphishingurldatabasejobtest.cpp
@@ -91,7 +91,7 @@ void CreatePhishingUrlDataBaseJobTest::shouldClearUpdateDataBaseInfo()
void CreatePhishingUrlDataBaseJobTest::shouldCreateRequest_data()
{
QTest::addColumn<QString>("databasestate");
- QTest::addColumn<WebEngineViewer::CreatePhishingUrlDataBaseJob::DataBaseDownload>("downloadtype");
+ QTest::addColumn<WebEngineViewer::CreatePhishingUrlDataBaseJob::DataBaseDownloadType>("downloadtype");
QTest::addColumn<QByteArray>("request");
QTest::newRow("fulldownload") << QString() << WebEngineViewer::CreatePhishingUrlDataBaseJob::FullDataBase << QByteArray("{\"client\":{\"clientId\":\"KDE\",\"clientVersion\":\"5.4.0\"},\"listUpdateRequests\":[{\"platformType\":\"WINDOWS\",\"state\":\"\",\"threatEntryType\":\"URL\",\"threatType\":\"MALWARE\"}]}");
QTest::newRow("fulldownloadwithdatabasestate") << QStringLiteral("foo") << WebEngineViewer::CreatePhishingUrlDataBaseJob::FullDataBase << QByteArray("{\"client\":{\"clientId\":\"KDE\",\"clientVersion\":\"5.4.0\"},\"listUpdateRequests\":[{\"platformType\":\"WINDOWS\",\"state\":\"\",\"threatEntryType\":\"URL\",\"threatType\":\"MALWARE\"}]}");
@@ -102,7 +102,7 @@ void CreatePhishingUrlDataBaseJobTest::shouldCreateRequest_data()
void CreatePhishingUrlDataBaseJobTest::shouldCreateRequest()
{
QFETCH(QString, databasestate);
- QFETCH(WebEngineViewer::CreatePhishingUrlDataBaseJob::DataBaseDownload, downloadtype);
+ QFETCH(WebEngineViewer::CreatePhishingUrlDataBaseJob::DataBaseDownloadType, downloadtype);
QFETCH(QByteArray, request);
WebEngineViewer::CreatePhishingUrlDataBaseJob job;
diff --git a/webengineviewer/src/checkphishingurl/createphishingurldatabasejob.cpp b/webengineviewer/src/checkphishingurl/createphishingurldatabasejob.cpp
index 93c24eb..a409897 100644
--- a/webengineviewer/src/checkphishingurl/createphishingurldatabasejob.cpp
+++ b/webengineviewer/src/checkphishingurl/createphishingurldatabasejob.cpp
@@ -141,7 +141,7 @@ QByteArray CreatePhishingUrlDataBaseJob::jsonRequest() const
return baPostData;
}
-void CreatePhishingUrlDataBaseJob::setDataBaseDownloadNeeded(CreatePhishingUrlDataBaseJob::DataBaseDownload type)
+void CreatePhishingUrlDataBaseJob::setDataBaseDownloadNeeded(CreatePhishingUrlDataBaseJob::DataBaseDownloadType type)
{
mDataBaseDownloadNeeded = type;
}
diff --git a/webengineviewer/src/checkphishingurl/createphishingurldatabasejob.h b/webengineviewer/src/checkphishingurl/createphishingurldatabasejob.h
index 40910f9..0474e56 100644
--- a/webengineviewer/src/checkphishingurl/createphishingurldatabasejob.h
+++ b/webengineviewer/src/checkphishingurl/createphishingurldatabasejob.h
@@ -74,7 +74,7 @@ class WEBENGINEVIEWER_EXPORT CreatePhishingUrlDataBaseJob : public QObject
{
Q_OBJECT
public:
- enum DataBaseDownload {
+ enum DataBaseDownloadType {
FullDataBase = 0,
UpdateDataBase = 1
};
@@ -93,7 +93,7 @@ public:
void setDataBaseState(const QString &value);
- void setDataBaseDownloadNeeded(WebEngineViewer::CreatePhishingUrlDataBaseJob::DataBaseDownload type);
+ void setDataBaseDownloadNeeded(WebEngineViewer::CreatePhishingUrlDataBaseJob::DataBaseDownloadType type);
QByteArray jsonRequest() const;
@@ -113,12 +113,12 @@ private:
QVector<Addition> parseAdditions(const QVariantList &lst);
QString mDataBaseState;
- DataBaseDownload mDataBaseDownloadNeeded;
+ DataBaseDownloadType mDataBaseDownloadNeeded;
bool mUseCompactJson;
QNetworkAccessManager *mNetworkAccessManager;
};
}
-Q_DECLARE_METATYPE(WebEngineViewer::CreatePhishingUrlDataBaseJob::DataBaseDownload)
+Q_DECLARE_METATYPE(WebEngineViewer::CreatePhishingUrlDataBaseJob::DataBaseDownloadType)
Q_DECLARE_METATYPE(WebEngineViewer::CreatePhishingUrlDataBaseJob::DataBaseDownloadResult)
Q_DECLARE_METATYPE(WebEngineViewer::UpdateDataBaseInfo)
Q_DECLARE_TYPEINFO(WebEngineViewer::Addition, Q_MOVABLE_TYPE);