[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [digikam] core: MediaWiki class => Iface
From: Gilles Caulier <null () kde ! org>
Date: 2018-08-27 6:35:10
Message-ID: E1fuB7G-00037P-Im () code ! kde ! org
[Download RAW message or body]
Git commit 108e44de79df32fe01073401dd5aba7a03a216ce by Gilles Caulier.
Committed on 27/08/2018 at 06:34.
Pushed by cgilles into branch 'master'.
MediaWiki class => Iface
M +5 -5 core/tests/mediawiki/edittest.cpp
M +1 -1 core/tests/mediawiki/examples/editsample/mainwindow.cpp
M +2 -2 core/tests/mediawiki/examples/editsample/mainwindow.h
M +2 -2 core/tests/mediawiki/examples/uploadsample/mainwindow.h
M +25 -25 core/tests/mediawiki/logintest.cpp
M +4 -4 core/tests/mediawiki/logouttest.cpp
M +5 -5 core/tests/mediawiki/mediawikitest.cpp
M +4 -4 core/tests/mediawiki/parsetest.cpp
M +3 -3 core/tests/mediawiki/queryimageinfotest.cpp
M +3 -3 core/tests/mediawiki/queryimagestest.cpp
M +4 -4 core/tests/mediawiki/queryinfotest.cpp
M +19 -19 core/tests/mediawiki/queryrevisiontest.cpp
M +10 -10 core/tests/mediawiki/querysiteinfogeneraltest.cpp
M +3 -3 core/tests/mediawiki/querysiteinfousergroupstest.cpp
M +5 -5 core/tests/mediawiki/uploadtest.cpp
M +1 -1 core/utilities/assistants/webservices/CMakeLists.txt
M +4 -4 core/utilities/assistants/webservices/mediawiki/lib/mediawiki_edit.cpp
M +3 -3 core/utilities/assistants/webservices/mediawiki/lib/mediawiki_edit.h
M +2 -2 core/utilities/assistants/webservices/mediawiki/lib/mediawiki_generalinfo.cpp
M +1 -1 core/utilities/assistants/webservices/mediawiki/lib/mediawiki_generalinfo.h
R +18 -16 core/utilities/assistants/webservices/mediawiki/lib/mediawiki_iface.cpp \
[from: core/utilities/assistants/webservices/mediawiki/lib/mediawiki_mediawiki.cpp - \
057% similarity] R +9 -10 \
core/utilities/assistants/webservices/mediawiki/lib/mediawiki_iface.h [from: \
core/utilities/assistants/webservices/mediawiki/lib/mediawiki_mediawiki.h - 083% \
similarity] R +5 -5 \
core/utilities/assistants/webservices/mediawiki/lib/mediawiki_iface_p.h [from: \
core/utilities/assistants/webservices/mediawiki/lib/mediawiki_mediawiki_p.h - 081% \
similarity] M +1 -1 \
core/utilities/assistants/webservices/mediawiki/lib/mediawiki_image.cpp M +1 -1 \
core/utilities/assistants/webservices/mediawiki/lib/mediawiki_image.h M +1 -1 \
core/utilities/assistants/webservices/mediawiki/lib/mediawiki_imageinfo.cpp M +1 \
-1 core/utilities/assistants/webservices/mediawiki/lib/mediawiki_imageinfo.h M +2 \
-2 core/utilities/assistants/webservices/mediawiki/lib/mediawiki_job.cpp M +3 \
-3 core/utilities/assistants/webservices/mediawiki/lib/mediawiki_job.h M +4 -4 \
core/utilities/assistants/webservices/mediawiki/lib/mediawiki_job_p.h M +4 -4 \
core/utilities/assistants/webservices/mediawiki/lib/mediawiki_login.cpp M +4 -4 \
core/utilities/assistants/webservices/mediawiki/lib/mediawiki_login.h M +4 -4 \
core/utilities/assistants/webservices/mediawiki/lib/mediawiki_logout.cpp M +3 -3 \
core/utilities/assistants/webservices/mediawiki/lib/mediawiki_logout.h M +1 -1 \
core/utilities/assistants/webservices/mediawiki/lib/mediawiki_page.cpp M +1 -1 \
core/utilities/assistants/webservices/mediawiki/lib/mediawiki_page.h M +4 -4 \
core/utilities/assistants/webservices/mediawiki/lib/mediawiki_parse.cpp M +3 -3 \
core/utilities/assistants/webservices/mediawiki/lib/mediawiki_parse.h M +1 -1 \
core/utilities/assistants/webservices/mediawiki/lib/mediawiki_protection.cpp M +1 \
-1 core/utilities/assistants/webservices/mediawiki/lib/mediawiki_protection.h M \
+4 -4 core/utilities/assistants/webservices/mediawiki/lib/mediawiki_queryimageinfo.cpp
M +3 -3 core/utilities/assistants/webservices/mediawiki/lib/mediawiki_queryimageinfo.h
M +4 -4 core/utilities/assistants/webservices/mediawiki/lib/mediawiki_queryimages.cpp
M +3 -3 core/utilities/assistants/webservices/mediawiki/lib/mediawiki_queryimages.h
M +4 -4 core/utilities/assistants/webservices/mediawiki/lib/mediawiki_queryinfo.cpp
M +3 -3 core/utilities/assistants/webservices/mediawiki/lib/mediawiki_queryinfo.h
M +4 -4 core/utilities/assistants/webservices/mediawiki/lib/mediawiki_queryrevision.cpp
M +3 -3 core/utilities/assistants/webservices/mediawiki/lib/mediawiki_queryrevision.h
M +4 -4 core/utilities/assistants/webservices/mediawiki/lib/mediawiki_querysiteinfogeneral.cpp
M +3 -3 core/utilities/assistants/webservices/mediawiki/lib/mediawiki_querysiteinfogeneral.h
M +4 -4 core/utilities/assistants/webservices/mediawiki/lib/mediawiki_querysiteinfousergroups.cpp
M +3 -3 core/utilities/assistants/webservices/mediawiki/lib/mediawiki_querysiteinfousergroups.h
M +1 -1 core/utilities/assistants/webservices/mediawiki/lib/mediawiki_revision.cpp
M +1 -1 core/utilities/assistants/webservices/mediawiki/lib/mediawiki_revision.h
M +4 -4 core/utilities/assistants/webservices/mediawiki/lib/mediawiki_upload.cpp
M +3 -3 core/utilities/assistants/webservices/mediawiki/lib/mediawiki_upload.h
M +1 -1 core/utilities/assistants/webservices/mediawiki/lib/mediawiki_usergroup.cpp
M +1 -1 core/utilities/assistants/webservices/mediawiki/lib/mediawiki_usergroup.h
M +3 -3 core/utilities/assistants/webservices/mediawiki/mediawikitalker.cpp
M +2 -2 core/utilities/assistants/webservices/mediawiki/mediawikitalker.h
M +3 -3 core/utilities/assistants/webservices/mediawiki/mediawikiwindow.cpp
https://commits.kde.org/digikam/108e44de79df32fe01073401dd5aba7a03a216ce
diff --git a/core/tests/mediawiki/edittest.cpp b/core/tests/mediawiki/edittest.cpp
index 462108e027..b76ca7f25b 100644
--- a/core/tests/mediawiki/edittest.cpp
+++ b/core/tests/mediawiki/edittest.cpp
@@ -31,11 +31,11 @@
#include <kjob.h>
-#include "mediawiki_mediawiki.h"
+#include "mediawiki_iface.h"
#include "mediawiki_edit.h"
#include "fakeserver/fakeserver.h"
-using mediawiki::MediaWiki;
+using mediawiki::Iface;
using mediawiki::Edit;
Q_DECLARE_METATYPE(FakeServer::Request)
@@ -69,7 +69,7 @@ private Q_SLOTS:
void initTestCase()
{
editCount = 0;
- this->m_mediaWiki = new \
MediaWiki(QUrl(QStringLiteral("http://127.0.0.1:12566"))); + this->m_mediaWiki \
= new Iface(QUrl(QStringLiteral("http://127.0.0.1:12566"))); this->m_infoScenario = \
QStringLiteral("<api><query><pages><page pageid=\"27697087\" ns=\"0\" title=\"API\" \
touched=\"2010-11-25T13:59:03Z\" lastrevid=\"367741756\" counter=\"0\" length=\"70\" \
redirect=\"\" starttimestamp=\"2010-11-25T16:14:51Z\" \
edittoken=\"cecded1f35005d22904a35cc7b736e18+\\\" talkid=\"5477418\" \
fullurl=\"http://en.wikipedia.org/wiki/API\" \
editurl=\"http://en.wikipedia.org/w/index.php?title=API&action=edit\" ><protection \
/></page></pages></query></api>"); }
@@ -276,7 +276,7 @@ private Q_SLOTS:
editCount = 0;
- MediaWiki mediawiki(QUrl(QStringLiteral("http://127.0.0.1:12566")));
+ Iface mediawiki(QUrl(QStringLiteral("http://127.0.0.1:12566")));
FakeServer fakeserver;
if(scenario != QStringLiteral("error serveur"))
@@ -434,7 +434,7 @@ private:
QString CaptchaAnswer;
QString request;
QString m_infoScenario;
- MediaWiki* m_mediaWiki;
+ Iface* m_mediaWiki;
};
QTEST_MAIN(EditTest)
diff --git a/core/tests/mediawiki/examples/editsample/mainwindow.cpp \
b/core/tests/mediawiki/examples/editsample/mainwindow.cpp index \
8bb03bc7ec..7717f75d86 100644
--- a/core/tests/mediawiki/examples/editsample/mainwindow.cpp
+++ b/core/tests/mediawiki/examples/editsample/mainwindow.cpp
@@ -42,7 +42,7 @@ MainWindow::~MainWindow()
//Load page
void MainWindow::on_pushButton2_clicked()
{
- mediawiki = new MediaWiki(QUrl(this->ui->mWikiEdit->text()));
+ mediawiki = new Iface(QUrl(this->ui->mWikiEdit->text()));
QueryRevision* const queryrevision(new QueryRevision(*mediawiki));
queryrevision->setPageName(this->ui->mPageEdit->text());
queryrevision->setProperties(QueryRevision::Content);
diff --git a/core/tests/mediawiki/examples/editsample/mainwindow.h \
b/core/tests/mediawiki/examples/editsample/mainwindow.h index b975c51e88..4b5f08c1de \
100644
--- a/core/tests/mediawiki/examples/editsample/mainwindow.h
+++ b/core/tests/mediawiki/examples/editsample/mainwindow.h
@@ -34,7 +34,7 @@
// Local includes
#include "mediawiki_edit.h"
-#include "mediawiki_mediawiki.h"
+#include "mediawiki_iface.h"
#include "mediawiki_login.h"
#include "mediawiki_queryinfo.h"
#include "mediawiki_queryrevision.h"
@@ -70,7 +70,7 @@ private Q_SLOTS:
private:
Ui::MainWindow* ui;
- MediaWiki* mediawiki;
+ Iface* mediawiki;
};
#endif // MAINWINDOW_H
diff --git a/core/tests/mediawiki/examples/uploadsample/mainwindow.h \
b/core/tests/mediawiki/examples/uploadsample/mainwindow.h index \
54c4485db6..61fb01fc65 100644
--- a/core/tests/mediawiki/examples/uploadsample/mainwindow.h
+++ b/core/tests/mediawiki/examples/uploadsample/mainwindow.h
@@ -34,7 +34,7 @@
// Local includes
#include "mediawiki_upload.h"
-#include "mediawiki_mediawiki.h"
+#include "mediawiki_iface.h"
#include "mediawiki_login.h"
#include "mediawiki_queryinfo.h"
#include "mediawiki_queryrevision.h"
@@ -72,7 +72,7 @@ private:
private:
Ui::MainWindow* ui;
- MediaWiki mediawiki;
+ Iface mediawiki;
};
#endif // MAINWINDOW_H
diff --git a/core/tests/mediawiki/logintest.cpp b/core/tests/mediawiki/logintest.cpp
index f26605c48d..70799bebb6 100644
--- a/core/tests/mediawiki/logintest.cpp
+++ b/core/tests/mediawiki/logintest.cpp
@@ -31,11 +31,11 @@
#include <kjob.h>
-#include "mediawiki_mediawiki.h"
+#include "mediawiki_iface.h"
#include "mediawiki_login.h"
#include "fakeserver/fakeserver.h"
-using mediawiki::MediaWiki;
+using mediawiki::Iface;
using mediawiki::Login;
class LoginTest : public QObject
@@ -68,7 +68,7 @@ private Q_SLOTS:
m_server->addScenario(senario, cookie);
m_server->startAndWait();
- MediaWiki site(QUrl(QStringLiteral("http://127.0.0.1:12566")));
+ Iface site(QUrl(QStringLiteral("http://127.0.0.1:12566")));
Login login(site, QStringLiteral("MyUsername"), QStringLiteral("test"));
connect(&login, SIGNAL(result(KJob*)),this, SLOT(loginHandle(KJob*)));
@@ -90,7 +90,7 @@ private Q_SLOTS:
m_server->addScenario(senario, cookie);
m_server->startAndWait();
- MediaWiki site(QUrl(QStringLiteral("http://127.0.0.1:12566")));
+ Iface site(QUrl(QStringLiteral("http://127.0.0.1:12566")));
Login login(site, QStringLiteral("MyUsername"), QStringLiteral("test"));
connect(&login, SIGNAL(result(KJob*)),this, SLOT(loginHandle(KJob*)));
@@ -113,7 +113,7 @@ private Q_SLOTS:
m_server->addScenario(senario, cookie);
m_server->startAndWait();
- MediaWiki site(QUrl(QStringLiteral("http://127.0.0.1:12566")));
+ Iface site(QUrl(QStringLiteral("http://127.0.0.1:12566")));
Login login(site, QStringLiteral("MyUsername"), QStringLiteral("test"));
connect(&login, SIGNAL(result(KJob*)),this, SLOT(loginHandle(KJob*)));
login.exec();
@@ -131,7 +131,7 @@ private Q_SLOTS:
m_server->addScenario(senario);
m_server->startAndWait();
- MediaWiki site(QUrl(QStringLiteral("http://127.0.0.1:12566")));
+ Iface site(QUrl(QStringLiteral("http://127.0.0.1:12566")));
Login login(site, QStringLiteral("MyUsername"), QStringLiteral("test"));
connect(&login, SIGNAL(result(KJob*)),this, SLOT(loginHandle(KJob*)));
@@ -151,7 +151,7 @@ private Q_SLOTS:
m_server->setScenario(senario);
m_server->startAndWait();
- MediaWiki site(QUrl(QStringLiteral("http://127.0.0.1:12566")));
+ Iface site(QUrl(QStringLiteral("http://127.0.0.1:12566")));
Login login(site, QStringLiteral("MyUsername"), QStringLiteral("test"));
connect(&login, SIGNAL(result(KJob*)),this, SLOT(loginHandle(KJob*)));
@@ -171,7 +171,7 @@ private Q_SLOTS:
m_server->setScenario(senario);
m_server->startAndWait();
- MediaWiki site(QUrl(QStringLiteral("http://127.0.0.1:12566")));
+ Iface site(QUrl(QStringLiteral("http://127.0.0.1:12566")));
Login login(site, QStringLiteral("MyUsername"), QStringLiteral("test"));
connect(&login, SIGNAL(result(KJob*)),this, SLOT(loginHandle(KJob*)));
@@ -191,7 +191,7 @@ private Q_SLOTS:
m_server->setScenario(senario);
m_server->startAndWait();
- MediaWiki site(QUrl(QStringLiteral("http://127.0.0.1:12566")));
+ Iface site(QUrl(QStringLiteral("http://127.0.0.1:12566")));
Login login(site, QStringLiteral("MyUsername"), QStringLiteral("test"));
connect(&login, SIGNAL(result(KJob*)),this, SLOT(loginHandle(KJob*)));
@@ -211,7 +211,7 @@ private Q_SLOTS:
m_server->setScenario(senario);
m_server->startAndWait();
- MediaWiki site(QUrl(QStringLiteral("http://127.0.0.1:12566")));
+ Iface site(QUrl(QStringLiteral("http://127.0.0.1:12566")));
Login login(site, QStringLiteral("MyUsername"), QString());
connect(&login, SIGNAL(result(KJob*)),this, SLOT(loginHandle(KJob*)));
@@ -231,7 +231,7 @@ private Q_SLOTS:
m_server->setScenario(senario);
m_server->startAndWait();
- MediaWiki site(QUrl(QStringLiteral("http://127.0.0.1:12566")));
+ Iface site(QUrl(QStringLiteral("http://127.0.0.1:12566")));
Login login(site, QStringLiteral("MyUsername"), QStringLiteral("test"));
connect(&login, SIGNAL(result(KJob*)),this, SLOT(loginHandle(KJob*)));
@@ -251,7 +251,7 @@ private Q_SLOTS:
m_server->setScenario(senario);
m_server->startAndWait();
- MediaWiki site(QUrl(QStringLiteral("http://127.0.0.1:12566")));
+ Iface site(QUrl(QStringLiteral("http://127.0.0.1:12566")));
Login login(site, QStringLiteral("MyUsername"), QStringLiteral("test"));
connect(&login, SIGNAL(result(KJob*)),this, SLOT(loginHandle(KJob*)));
@@ -271,7 +271,7 @@ private Q_SLOTS:
m_server->setScenario(senario);
m_server->startAndWait();
- MediaWiki site(QUrl(QStringLiteral("http://127.0.0.1:12566")));
+ Iface site(QUrl(QStringLiteral("http://127.0.0.1:12566")));
Login login(site, QStringLiteral("MyUsername"), QStringLiteral("test"));
connect(&login, SIGNAL(result(KJob*)),this, SLOT(loginHandle(KJob*)));
@@ -291,7 +291,7 @@ private Q_SLOTS:
m_server->setScenario(senario);
m_server->startAndWait();
- MediaWiki site(QUrl(QStringLiteral("http://127.0.0.1:12566")));
+ Iface site(QUrl(QStringLiteral("http://127.0.0.1:12566")));
Login login(site, QStringLiteral("MyUsername"), QStringLiteral("test"));
connect(&login, SIGNAL(result(KJob*)),this, SLOT(loginHandle(KJob*)));
@@ -311,7 +311,7 @@ private Q_SLOTS:
m_server->setScenario(senario);
m_server->startAndWait();
- MediaWiki site(QUrl(QStringLiteral("http://127.0.0.1:12566")));
+ Iface site(QUrl(QStringLiteral("http://127.0.0.1:12566")));
Login login(site, QStringLiteral("MyUsername"), QStringLiteral("test"));
connect(&login, SIGNAL(result(KJob*)),this, SLOT(loginHandle(KJob*)));
@@ -334,7 +334,7 @@ private Q_SLOTS:
m_server->addScenario(senario);
m_server->startAndWait();
- MediaWiki site(QUrl(QStringLiteral("http://127.0.0.1:12566")));
+ Iface site(QUrl(QStringLiteral("http://127.0.0.1:12566")));
Login login(site, QStringLiteral("MyUsername"), QStringLiteral("test"));
connect(&login, SIGNAL(result(KJob*)),this, SLOT(loginHandle(KJob*)));
@@ -357,7 +357,7 @@ private Q_SLOTS:
m_server->addScenario(senario);
m_server->startAndWait();
- MediaWiki site(QUrl(QStringLiteral("http://127.0.0.1:12566")));
+ Iface site(QUrl(QStringLiteral("http://127.0.0.1:12566")));
Login login(site, QStringLiteral("MyUsername"), QStringLiteral("test"));
connect(&login, SIGNAL(result(KJob*)),this, SLOT(loginHandle(KJob*)));
@@ -380,7 +380,7 @@ private Q_SLOTS:
m_server->addScenario(senario);
m_server->startAndWait();
- MediaWiki site(QUrl(QStringLiteral("http://127.0.0.1:12566")));
+ Iface site(QUrl(QStringLiteral("http://127.0.0.1:12566")));
Login login(site, QStringLiteral("MyUsername"), QStringLiteral("test"));
connect(&login, SIGNAL(result(KJob*)),this, SLOT(loginHandle(KJob*)));
@@ -403,7 +403,7 @@ private Q_SLOTS:
m_server->addScenario(senario);
m_server->startAndWait();
- MediaWiki site(QUrl(QStringLiteral("http://127.0.0.1:12566")));
+ Iface site(QUrl(QStringLiteral("http://127.0.0.1:12566")));
Login login(site, QStringLiteral("MyUsername"), QStringLiteral("test"));
connect(&login, SIGNAL(result(KJob*)),this, SLOT(loginHandle(KJob*)));
@@ -426,7 +426,7 @@ private Q_SLOTS:
m_server->addScenario(senario);
m_server->startAndWait();
- MediaWiki site(QUrl(QStringLiteral("http://127.0.0.1:12566")));
+ Iface site(QUrl(QStringLiteral("http://127.0.0.1:12566")));
Login login(site, QStringLiteral("MyUsername"), QString());
connect(&login, SIGNAL(result(KJob*)),this, SLOT(loginHandle(KJob*)));
@@ -449,7 +449,7 @@ private Q_SLOTS:
m_server->addScenario(senario);
m_server->startAndWait();
- MediaWiki site(QUrl(QStringLiteral("http://127.0.0.1:12566")));
+ Iface site(QUrl(QStringLiteral("http://127.0.0.1:12566")));
Login login(site, QStringLiteral("MyUsername"), QStringLiteral("test"));
connect(&login, SIGNAL(result(KJob*)),this, SLOT(loginHandle(KJob*)));
@@ -472,7 +472,7 @@ private Q_SLOTS:
m_server->addScenario(senario);
m_server->startAndWait();
- MediaWiki site(QUrl(QStringLiteral("http://127.0.0.1:12566")));
+ Iface site(QUrl(QStringLiteral("http://127.0.0.1:12566")));
Login login(site, QStringLiteral("MyUsername"), QStringLiteral("test"));
connect(&login, SIGNAL(result(KJob*)),this, SLOT(loginHandle(KJob*)));
@@ -495,7 +495,7 @@ private Q_SLOTS:
m_server->addScenario(senario);
m_server->startAndWait();
- MediaWiki site(QUrl(QStringLiteral("http://127.0.0.1:12566")));
+ Iface site(QUrl(QStringLiteral("http://127.0.0.1:12566")));
Login login(site, QStringLiteral("MyUsername"), QStringLiteral("test"));
connect(&login, SIGNAL(result(KJob*)),this, SLOT(loginHandle(KJob*)));
@@ -518,7 +518,7 @@ private Q_SLOTS:
m_server->addScenario(senario);
m_server->startAndWait();
- MediaWiki site(QUrl(QStringLiteral("http://127.0.0.1:12566")));
+ Iface site(QUrl(QStringLiteral("http://127.0.0.1:12566")));
Login login(site, QStringLiteral("MyUsername"), QStringLiteral("test"));
connect(&login, SIGNAL(result(KJob*)),this, SLOT(loginHandle(KJob*)));
@@ -541,7 +541,7 @@ private Q_SLOTS:
m_server->addScenario(senario);
m_server->startAndWait();
- MediaWiki site(QUrl(QStringLiteral("http://127.0.0.1:12566")));
+ Iface site(QUrl(QStringLiteral("http://127.0.0.1:12566")));
Login login(site, QStringLiteral("MyUsername"), QStringLiteral("test"));
connect(&login, SIGNAL(result(KJob*)),this, SLOT(loginHandle(KJob*)));
diff --git a/core/tests/mediawiki/logouttest.cpp \
b/core/tests/mediawiki/logouttest.cpp index b340ad97f3..36ab913a20 100644
--- a/core/tests/mediawiki/logouttest.cpp
+++ b/core/tests/mediawiki/logouttest.cpp
@@ -31,11 +31,11 @@
#include <kjob.h>
-#include "mediawiki_mediawiki.h"
+#include "mediawiki_iface.h"
#include "mediawiki_logout.h"
#include "fakeserver/fakeserver.h"
-using mediawiki::MediaWiki;
+using mediawiki::Iface;
using mediawiki::Logout;
class LogoutTest : public QObject
@@ -55,7 +55,7 @@ private Q_SLOTS:
void initTestCase()
{
logoutCount = 0;
- this->m_mediaWiki = new \
MediaWiki(QUrl(QStringLiteral("http://127.0.0.1:12566"))); + this->m_mediaWiki \
= new Iface(QUrl(QStringLiteral("http://127.0.0.1:12566"))); this->m_server = new \
FakeServer; this->request = QStringLiteral("/?format=xml&action=logout");
}
@@ -93,7 +93,7 @@ private:
int logoutCount;
QString request;
- MediaWiki* m_mediaWiki;
+ Iface* m_mediaWiki;
FakeServer* m_server;
};
diff --git a/core/tests/mediawiki/mediawikitest.cpp \
b/core/tests/mediawiki/mediawikitest.cpp index e530244db8..385fa1dec6 100644
--- a/core/tests/mediawiki/mediawikitest.cpp
+++ b/core/tests/mediawiki/mediawikitest.cpp
@@ -28,11 +28,11 @@
#include <QUrl>
#include <QtTest>
-#include "mediawiki_mediawiki.h"
+#include "mediawiki_iface.h"
-using mediawiki::MediaWiki;
+using mediawiki::Iface;
-class MediaWikiTest : public QObject
+class IfaceTest : public QObject
{
Q_OBJECT
@@ -44,7 +44,7 @@ private Q_SLOTS:
QFETCH(QString, customUserAgent);
QFETCH(QString, userAgent);
- MediaWiki mediawiki(url, customUserAgent);
+ Iface mediawiki(url, customUserAgent);
QCOMPARE(mediawiki.url(), url);
QCOMPARE(mediawiki.userAgent(), userAgent);
@@ -63,6 +63,6 @@ private Q_SLOTS:
};
-QTEST_MAIN(MediaWikiTest)
+QTEST_MAIN(IfaceTest)
#include "mediawikitest.moc"
diff --git a/core/tests/mediawiki/parsetest.cpp b/core/tests/mediawiki/parsetest.cpp
index 661d9bc93b..c1d328ac5d 100644
--- a/core/tests/mediawiki/parsetest.cpp
+++ b/core/tests/mediawiki/parsetest.cpp
@@ -31,11 +31,11 @@
#include <kjob.h>
-#include "mediawiki_mediawiki.h"
+#include "mediawiki_iface.h"
#include "mediawiki_parse.h"
#include "fakeserver/fakeserver.h"
-using mediawiki::MediaWiki;
+using mediawiki::Iface;
using mediawiki::Parse;
Q_DECLARE_METATYPE(FakeServer::Request)
@@ -85,7 +85,7 @@ private Q_SLOTS:
void initTestCase()
{
parseCount = 0;
- this->m_mediaWiki = new \
MediaWiki(QUrl(QStringLiteral("http://127.0.0.1:12566"))); + this->m_mediaWiki \
= new Iface(QUrl(QStringLiteral("http://127.0.0.1:12566"))); }
void result()
@@ -238,7 +238,7 @@ private:
int parseCount;
QString request;
QString parseResult;
- MediaWiki* m_mediaWiki;
+ Iface* m_mediaWiki;
};
QTEST_MAIN(ParseTest)
diff --git a/core/tests/mediawiki/queryimageinfotest.cpp \
b/core/tests/mediawiki/queryimageinfotest.cpp index fb4b4d7715..449268f319 100644
--- a/core/tests/mediawiki/queryimageinfotest.cpp
+++ b/core/tests/mediawiki/queryimageinfotest.cpp
@@ -28,7 +28,7 @@
#include "fakeserver/fakeserver.h"
-#include "mediawiki_mediawiki.h"
+#include "mediawiki_iface.h"
#include "mediawiki_imageinfo.h"
#include "mediawiki_queryimageinfo.h"
@@ -67,7 +67,7 @@ private Q_SLOTS:
fakeserver.startAndWait();
// Prepare the job
- MediaWiki mediawiki(QUrl(QStringLiteral("http://127.0.0.1:12566")));
+ Iface mediawiki(QUrl(QStringLiteral("http://127.0.0.1:12566")));
QueryImageinfo* job = new QueryImageinfo(mediawiki);
job->setTitle(QStringLiteral("Image:Image.bmp"));
job->setProperties(
@@ -154,7 +154,7 @@ private Q_SLOTS:
fakeserver.startAndWait();
// Prepare the job
- MediaWiki mediawiki(QUrl(QStringLiteral("http://127.0.0.1:12566")));
+ Iface mediawiki(QUrl(QStringLiteral("http://127.0.0.1:12566")));
QueryImageinfo* job = new QueryImageinfo(mediawiki);
job->setProperties(
QueryImageinfo::Timestamp|
diff --git a/core/tests/mediawiki/queryimagestest.cpp \
b/core/tests/mediawiki/queryimagestest.cpp index 1d60ca9c20..ee1602fe7d 100644
--- a/core/tests/mediawiki/queryimagestest.cpp
+++ b/core/tests/mediawiki/queryimagestest.cpp
@@ -28,11 +28,11 @@
#include "fakeserver/fakeserver.h"
-#include "mediawiki_mediawiki.h"
+#include "mediawiki_iface.h"
#include "mediawiki_queryimages.h"
#include "mediawiki_image.h"
-using mediawiki::MediaWiki;
+using mediawiki::Iface;
using mediawiki::QueryImages;
using mediawiki::Image;
@@ -84,7 +84,7 @@ private Q_SLOTS:
fakeserver.startAndWait();
// Prepare the job
- MediaWiki mediawiki(QUrl(QStringLiteral("http://127.0.0.1:12566")));
+ Iface mediawiki(QUrl(QStringLiteral("http://127.0.0.1:12566")));
QueryImages * job = new QueryImages(mediawiki);
job->setTitle(title);
job->setLimit(limit);
diff --git a/core/tests/mediawiki/queryinfotest.cpp \
b/core/tests/mediawiki/queryinfotest.cpp index 42067e618b..6e00dcedda 100644
--- a/core/tests/mediawiki/queryinfotest.cpp
+++ b/core/tests/mediawiki/queryinfotest.cpp
@@ -31,13 +31,13 @@
#include <kjob.h>
-#include "mediawiki_mediawiki.h"
+#include "mediawiki_iface.h"
#include "mediawiki_queryinfo.h"
#include "mediawiki_page.h"
#include "mediawiki_protection.h"
#include "fakeserver/fakeserver.h"
-using mediawiki::MediaWiki;
+using mediawiki::Iface;
using mediawiki::QueryInfo;
using mediawiki::Page;
using mediawiki::Protection;
@@ -70,7 +70,7 @@ private Q_SLOTS:
void initTestCase()
{
queryInfoCount = 0;
- this->m_mediaWiki = new \
MediaWiki(QUrl(QStringLiteral("http://127.0.0.1:12566"))); + this->m_mediaWiki \
= new Iface(QUrl(QStringLiteral("http://127.0.0.1:12566"))); }
void constructQuery()
@@ -216,7 +216,7 @@ private:
int queryInfoCount;
Page queryInfoResultsPage;
QVector <Protection> queryInfoResultsProtections;
- MediaWiki* m_mediaWiki;
+ Iface* m_mediaWiki;
};
QTEST_MAIN(QueryInfoTest)
diff --git a/core/tests/mediawiki/queryrevisiontest.cpp \
b/core/tests/mediawiki/queryrevisiontest.cpp index 75a220ab16..d6e506a98f 100644
--- a/core/tests/mediawiki/queryrevisiontest.cpp
+++ b/core/tests/mediawiki/queryrevisiontest.cpp
@@ -36,11 +36,11 @@
#include "fakeserver/fakeserver.h"
-#include "mediawiki_mediawiki.h"
+#include "mediawiki_iface.h"
#include "mediawiki_queryrevision.h"
#include "mediawiki_revision.h"
-using mediawiki::MediaWiki;
+using mediawiki::Iface;
using mediawiki::QueryRevision;
using mediawiki::Revision;
@@ -112,7 +112,7 @@ private Q_SLOTS:
QFETCH(QList<Revision>, results);
- MediaWiki mediawiki(QUrl(QStringLiteral("http://127.0.0.1:12566")));
+ Iface mediawiki(QUrl(QStringLiteral("http://127.0.0.1:12566")));
FakeServer fakeserver;
fakeserver.setScenario(scenario);
fakeserver.startAndWait();
@@ -219,7 +219,7 @@ private Q_SLOTS:
QFETCH(int, error);
- MediaWiki mediawiki(QUrl(QStringLiteral("http://127.0.0.1:12566")));
+ Iface mediawiki(QUrl(QStringLiteral("http://127.0.0.1:12566")));
FakeServer fakeserver;
if(scenario != QStringLiteral("error serveur"))
{
@@ -285,7 +285,7 @@ private Q_SLOTS:
}
void testRvLimit()
{
- MediaWiki mediawiki(QUrl(QStringLiteral("http://127.0.0.1:12566")));
+ Iface mediawiki(QUrl(QStringLiteral("http://127.0.0.1:12566")));
FakeServer::Request \
requestSend(QStringLiteral("GET"),QString(),QStringLiteral("/?format=xml&action=query&prop=revisions&rvlimit=2&titles=API"));
QueryRevision job(mediawiki);
job.setPageName(QStringLiteral("API"));
@@ -306,7 +306,7 @@ private Q_SLOTS:
}
void testRvStartId()
{
- MediaWiki mediawiki(QUrl(QStringLiteral("http://127.0.0.1:12566")));
+ Iface mediawiki(QUrl(QStringLiteral("http://127.0.0.1:12566")));
FakeServer::Request \
requestSend(QStringLiteral("GET"),QString(),QStringLiteral("/?format=xml&action=query&prop=revisions&rvstartid=2&titles=API"));
QueryRevision job(mediawiki);
job.setPageName(QStringLiteral("API"));
@@ -327,7 +327,7 @@ private Q_SLOTS:
}
void testRvEndId()
{
- MediaWiki mediawiki(QUrl(QStringLiteral("http://127.0.0.1:12566")));
+ Iface mediawiki(QUrl(QStringLiteral("http://127.0.0.1:12566")));
FakeServer::Request \
requestSend(QStringLiteral("GET"),QString(),QStringLiteral("/?format=xml&action=query&prop=revisions&rvendid=2&titles=API"));
QueryRevision job(mediawiki);
job.setPageName(QStringLiteral("API"));
@@ -349,7 +349,7 @@ private Q_SLOTS:
void testRvStart()
{
- MediaWiki mediawiki(QUrl(QStringLiteral("http://127.0.0.1:12566")));
+ Iface mediawiki(QUrl(QStringLiteral("http://127.0.0.1:12566")));
FakeServer::Request \
requestSend(QStringLiteral("GET"),QString(),QStringLiteral("/?format=xml&action=query&prop=revisions&rvstart=2010-09-28T15:21:07Z&titles=API"));
QueryRevision job(mediawiki);
job.setPageName(QStringLiteral("API"));
@@ -371,7 +371,7 @@ private Q_SLOTS:
void testRvEnd()
{
- MediaWiki mediawiki(QUrl(QStringLiteral("http://127.0.0.1:12566")));
+ Iface mediawiki(QUrl(QStringLiteral("http://127.0.0.1:12566")));
FakeServer::Request \
requestSend(QStringLiteral("GET"),QString(),QStringLiteral("/?format=xml&action=query&prop=revisions&rvend=2010-09-28T15:21:07Z&titles=API"));
QueryRevision job(mediawiki);
job.setPageName(QStringLiteral("API"));
@@ -393,7 +393,7 @@ private Q_SLOTS:
void testRvUser()
{
- MediaWiki mediawiki(QUrl(QStringLiteral("http://127.0.0.1:12566")));
+ Iface mediawiki(QUrl(QStringLiteral("http://127.0.0.1:12566")));
FakeServer::Request \
requestSend(QStringLiteral("GET"),QString(),QStringLiteral("/?format=xml&action=query&prop=revisions&rvuser=martine&titles=API"));
QueryRevision job(mediawiki);
job.setPageName(QStringLiteral("API"));
@@ -415,7 +415,7 @@ private Q_SLOTS:
void testRvExcludeUser()
{
- MediaWiki mediawiki(QUrl(QStringLiteral("http://127.0.0.1:12566")));
+ Iface mediawiki(QUrl(QStringLiteral("http://127.0.0.1:12566")));
FakeServer::Request \
requestSend(QStringLiteral("GET"),QString(),QStringLiteral("/?format=xml&action=query&prop=revisions&rvexcludeuser=martine&titles=API"));
QueryRevision job(mediawiki);
job.setPageName(QStringLiteral("API"));
@@ -437,7 +437,7 @@ private Q_SLOTS:
void testRvDirOlder()
{
- MediaWiki mediawiki(QUrl(QStringLiteral("http://127.0.0.1:12566")));
+ Iface mediawiki(QUrl(QStringLiteral("http://127.0.0.1:12566")));
FakeServer::Request \
requestSend(QStringLiteral("GET"),QString(),QStringLiteral("/?format=xml&action=query&prop=revisions&rvdir=older&titles=API"));
QueryRevision job(mediawiki);
job.setPageName(QStringLiteral("API"));
@@ -459,7 +459,7 @@ private Q_SLOTS:
void testRvDirNewer()
{
- MediaWiki mediawiki(QUrl(QStringLiteral("http://127.0.0.1:12566")));
+ Iface mediawiki(QUrl(QStringLiteral("http://127.0.0.1:12566")));
FakeServer::Request \
requestSend(QStringLiteral("GET"),QString(),QStringLiteral("/?format=xml&action=query&prop=revisions&rvdir=newer&titles=API"));
QueryRevision job(mediawiki);
job.setPageName(QStringLiteral("API"));
@@ -502,7 +502,7 @@ private Q_SLOTS:
rev2.setContent(QStringLiteral("#REDIRECT [[Application programming \
interface]]{{R from abbreviation}}"));
rev2.setParseTree(QStringLiteral("<root>#REDIRECT [[Application programming \
interface]]<template><title>R from abbreviation</title></template></root>")); \
results << rev2;
- MediaWiki mediawiki(QUrl(QStringLiteral("http://127.0.0.1:12566")));
+ Iface mediawiki(QUrl(QStringLiteral("http://127.0.0.1:12566")));
FakeServer fakeserver;
fakeserver.setScenario(scenario);
@@ -533,7 +533,7 @@ private Q_SLOTS:
}
void testRvSection()
{
- MediaWiki mediawiki(QUrl(QStringLiteral("http://127.0.0.1:12566")));
+ Iface mediawiki(QUrl(QStringLiteral("http://127.0.0.1:12566")));
FakeServer::Request \
requestSend(QStringLiteral("GET"),QString(),QStringLiteral("/?format=xml&action=query&prop=revisions&rvsection=1&titles=API"));
QueryRevision job(mediawiki);
job.setPageName(QStringLiteral("API"));
@@ -568,7 +568,7 @@ private Q_SLOTS:
\
,QStringLiteral("094a45ddbbd5e90d55d79d2a23a8c921+\\"));
- MediaWiki mediawiki(QUrl(QStringLiteral("http://127.0.0.1:12566")));
+ Iface mediawiki(QUrl(QStringLiteral("http://127.0.0.1:12566")));
FakeServer fakeserver;
fakeserver.setScenario(scenario);
@@ -599,7 +599,7 @@ private Q_SLOTS:
}
void testRvExpandTemplates()
{
- MediaWiki mediawiki(QUrl(QStringLiteral("http://127.0.0.1:12566")));
+ Iface mediawiki(QUrl(QStringLiteral("http://127.0.0.1:12566")));
FakeServer::Request \
requestSend(QStringLiteral("GET"),QString(),QStringLiteral("/?format=xml&action=query&prop=revisions&rvexpandtemplates=on&titles=API"));
QueryRevision job(mediawiki);
job.setPageName(QStringLiteral("API"));
@@ -624,7 +624,7 @@ private Q_SLOTS:
int id= 2993;
- MediaWiki mediawiki(QUrl(QStringLiteral("http://127.0.0.1:12566")));
+ Iface mediawiki(QUrl(QStringLiteral("http://127.0.0.1:12566")));
FakeServer fakeserver;
fakeserver.startAndWait();
@@ -655,7 +655,7 @@ private Q_SLOTS:
int id= 2993;
- MediaWiki mediawiki(QUrl(QStringLiteral("http://127.0.0.1:12566")));
+ Iface mediawiki(QUrl(QStringLiteral("http://127.0.0.1:12566")));
FakeServer fakeserver;
fakeserver.startAndWait();
diff --git a/core/tests/mediawiki/querysiteinfogeneraltest.cpp \
b/core/tests/mediawiki/querysiteinfogeneraltest.cpp index d9407faa53..2f6f1bf45c \
100644
--- a/core/tests/mediawiki/querysiteinfogeneraltest.cpp
+++ b/core/tests/mediawiki/querysiteinfogeneraltest.cpp
@@ -33,11 +33,11 @@
#include "fakeserver/fakeserver.h"
-#include "mediawiki_mediawiki.h"
+#include "mediawiki_iface.h"
#include "mediawiki_querysiteinfogeneral.h"
#include "mediawiki_generalinfo.h"
-using mediawiki::MediaWiki;
+using mediawiki::Iface;
using mediawiki::QuerySiteInfoGeneral;
using mediawiki::Generalinfo;
@@ -62,11 +62,11 @@ void initTestCase()
}
void QuerySiteInfoGeneralTestConnectTrue()
{
- MediaWiki mediaWiki(QUrl(QStringLiteral("http://127.0.0.1:12566")));
+ Iface mediaWiki(QUrl(QStringLiteral("http://127.0.0.1:12566")));
FakeServer server;
generalCount = 0;
- QString senario(QStringLiteral("<api><query><general mainpage=\"Main Page\" \
base=\"http://en.wikipedia.org/wiki/Main_Page\" sitename=\"Wikipedia\" \
generator=\"MediaWiki 1.16wmf4\" phpversion=\"5.2.4-2ubuntu5.12wm1\" \
phpsapi=\"apache2handler\" dbtype=\"mysql\" dbversion=\"5.1.46-facebook-r3489-log\" \
rev=\"75268\" case=\"first-letter\" rights=\"Creative Commons Attribution-Share Alike \
3.0 Unported\" lang=\"en\" fallback8bitEncoding=\"windows-1252\" writeapi=\"\" \
timezone=\"UTC\" timeoffset=\"0\" articlepath=\"/wiki/$1\" scriptpath=\"/w\" \
script=\"/w/index.php\" variantarticlepath=\"\" server=\"http://en.wikipedia.org\" \
wikiid=\"enwiki\" time=\"2010-10-24T19:53:13Z\"/></query></api>")); + QString \
senario(QStringLiteral("<api><query><general mainpage=\"Main Page\" \
base=\"http://en.wikipedia.org/wiki/Main_Page\" sitename=\"Wikipedia\" \
generator=\"Iface 1.16wmf4\" phpversion=\"5.2.4-2ubuntu5.12wm1\" \
phpsapi=\"apache2handler\" dbtype=\"mysql\" dbversion=\"5.1.46-facebook-r3489-log\" \
rev=\"75268\" case=\"first-letter\" rights=\"Creative Commons Attribution-Share Alike \
3.0 Unported\" lang=\"en\" fallback8bitEncoding=\"windows-1252\" writeapi=\"\" \
timezone=\"UTC\" timeoffset=\"0\" articlepath=\"/wiki/$1\" scriptpath=\"/w\" \
script=\"/w/index.php\" variantarticlepath=\"\" server=\"http://en.wikipedia.org\" \
wikiid=\"enwiki\" time=\"2010-10-24T19:53:13Z\"/></query></api>")); \
server.addScenario(senario); server.startAndWait();
@@ -85,11 +85,11 @@ void QuerySiteInfoGeneralTestConnectTrue()
void QuerySiteInfoGeneralTestAttribute()
{
- MediaWiki mediaWiki(QUrl(QStringLiteral("http://127.0.0.1:12566")));
+ Iface mediaWiki(QUrl(QStringLiteral("http://127.0.0.1:12566")));
FakeServer server;
generalCount = 0;
- QString senario(QStringLiteral("<api><query><general mainpage=\"Main Page\" \
base=\"http://en.wikipedia.org/wiki/Main_Page\" sitename=\"Wikipedia\" \
generator=\"MediaWiki 1.16wmf4\" phpversion=\"5.2.4-2ubuntu5.12wm1\" \
phpsapi=\"apache2handler\" dbtype=\"mysql\" dbversion=\"5.1.46-facebook-r3489-log\" \
rev=\"75268\" case=\"first-letter\" rights=\"Creative Commons Attribution-Share Alike \
3.0 Unported\" lang=\"en\" fallback8bitEncoding=\"windows-1252\" writeapi=\"\" \
timezone=\"UTC\" timeoffset=\"0\" articlepath=\"/wiki/$1\" scriptpath=\"/w\" \
script=\"/w/index.php\" variantarticlepath=\"\" server=\"http://en.wikipedia.org\" \
wikiid=\"enwiki\" time=\"2010-10-24T19:53:13Z\"/></query></api>")); + QString \
senario(QStringLiteral("<api><query><general mainpage=\"Main Page\" \
base=\"http://en.wikipedia.org/wiki/Main_Page\" sitename=\"Wikipedia\" \
generator=\"Iface 1.16wmf4\" phpversion=\"5.2.4-2ubuntu5.12wm1\" \
phpsapi=\"apache2handler\" dbtype=\"mysql\" dbversion=\"5.1.46-facebook-r3489-log\" \
rev=\"75268\" case=\"first-letter\" rights=\"Creative Commons Attribution-Share Alike \
3.0 Unported\" lang=\"en\" fallback8bitEncoding=\"windows-1252\" writeapi=\"\" \
timezone=\"UTC\" timeoffset=\"0\" articlepath=\"/wiki/$1\" scriptpath=\"/w\" \
script=\"/w/index.php\" variantarticlepath=\"\" server=\"http://en.wikipedia.org\" \
wikiid=\"enwiki\" time=\"2010-10-24T19:53:13Z\"/></query></api>")); \
server.addScenario(senario); server.startAndWait();
@@ -108,7 +108,7 @@ void QuerySiteInfoGeneralTestAttribute()
resultExpected.setMainPage(QStringLiteral("Main Page"));
resultExpected.setUrl(QUrl(QStringLiteral("http://en.wikipedia.org/wiki/Main_Page")));
resultExpected.setSiteName(QStringLiteral("Wikipedia"));
- resultExpected.setGenerator(QStringLiteral("MediaWiki 1.16wmf4"));
+ resultExpected.setGenerator(QStringLiteral("Iface 1.16wmf4"));
resultExpected.setPhpVersion(QStringLiteral("5.2.4-2ubuntu5.12wm1"));
resultExpected.setPhpApi(QStringLiteral("apache2handler"));
resultExpected.setDataBaseType(QStringLiteral("mysql"));
@@ -134,11 +134,11 @@ void QuerySiteInfoGeneralTestAttribute()
void QuerySiteInfoGeneralTestConnectFalseXML()
{
- MediaWiki mediaWiki(QUrl(QStringLiteral("http://127.0.0.1:12566")));
+ Iface mediaWiki(QUrl(QStringLiteral("http://127.0.0.1:12566")));
FakeServer server;
generalCount = 0;
- QString senario(QStringLiteral("<api><query<general mainpage=\"Main Page\" \
base=\"http://en.wikipedia.org/wiki/Main_Page\" sitename=\"Wikipedia\" \
generator=\"MediaWiki 1.16wmf4\" phpversion=\"5.2.4-2ubuntu5.12wm1\" \
phpsapi=\"apache2handler\" dbtype=\"mysql\" dbversion=\"5.1.46-facebook-r3489-log\" \
rev=\"75268\" case=\"first-letter\" rights=\"Creative Commons Attribution-Share Alike \
3.0 Unported\" lang=\"en\" fallback8bitEncoding=\"windows-1252\" writeapi=\"\" \
timezone=\"UTC\" timeoffset=\"0\" articlepath=\"/wiki/$1\" scriptpath=\"/w\" \
script=\"/w/index.php\" variantarticlepath=\"\" server=\"http://en.wikipedia.org\" \
wikiid=\"enwiki\" time=\"2010-10-24T19:53:13Z\"/>")); + QString \
senario(QStringLiteral("<api><query<general mainpage=\"Main Page\" \
base=\"http://en.wikipedia.org/wiki/Main_Page\" sitename=\"Wikipedia\" \
generator=\"Iface 1.16wmf4\" phpversion=\"5.2.4-2ubuntu5.12wm1\" \
phpsapi=\"apache2handler\" dbtype=\"mysql\" dbversion=\"5.1.46-facebook-r3489-log\" \
rev=\"75268\" case=\"first-letter\" rights=\"Creative Commons Attribution-Share Alike \
3.0 Unported\" lang=\"en\" fallback8bitEncoding=\"windows-1252\" writeapi=\"\" \
timezone=\"UTC\" timeoffset=\"0\" articlepath=\"/wiki/$1\" scriptpath=\"/w\" \
script=\"/w/index.php\" variantarticlepath=\"\" server=\"http://en.wikipedia.org\" \
wikiid=\"enwiki\" time=\"2010-10-24T19:53:13Z\"/>")); server.addScenario(senario);
server.startAndWait();
@@ -157,7 +157,7 @@ void QuerySiteInfoGeneralTestConnectFalseXML()
void QuerySiteInfoGeneralTestErrortIncludeAllDenied()
{
- MediaWiki mediaWiki(QUrl(QStringLiteral("http://127.0.0.1:12566")));
+ Iface mediaWiki(QUrl(QStringLiteral("http://127.0.0.1:12566")));
FakeServer server;
generalCount = 0;
diff --git a/core/tests/mediawiki/querysiteinfousergroupstest.cpp \
b/core/tests/mediawiki/querysiteinfousergroupstest.cpp index fb9004e821..f65beb176b \
100644
--- a/core/tests/mediawiki/querysiteinfousergroupstest.cpp
+++ b/core/tests/mediawiki/querysiteinfousergroupstest.cpp
@@ -33,11 +33,11 @@
#include "fakeserver/fakeserver.h"
-#include "mediawiki_mediawiki.h"
+#include "mediawiki_iface.h"
#include "mediawiki_querysiteinfousergroups.h"
#include "mediawiki_usergroup.h"
-using mediawiki::MediaWiki;
+using mediawiki::Iface;
using mediawiki::QuerySiteinfoUsergroups;
using mediawiki::UserGroup;
@@ -70,7 +70,7 @@ private Q_SLOTS:
fakeserver.setScenario(scenario);
fakeserver.startAndWait();
- MediaWiki mediawiki(QUrl(QStringLiteral("http://127.0.0.1:12566")));
+ Iface mediawiki(QUrl(QStringLiteral("http://127.0.0.1:12566")));
QuerySiteinfoUsergroups * job = new QuerySiteinfoUsergroups(mediawiki);
job->setIncludeNumber(includeNumber);
diff --git a/core/tests/mediawiki/uploadtest.cpp \
b/core/tests/mediawiki/uploadtest.cpp index 8c0fff9a40..80aa0cc464 100644
--- a/core/tests/mediawiki/uploadtest.cpp
+++ b/core/tests/mediawiki/uploadtest.cpp
@@ -31,11 +31,11 @@
#include <kjob.h>
-#include "mediawiki_mediawiki.h"
+#include "mediawiki_iface.h"
#include "mediawiki_upload.h"
#include "fakeserver/fakeserver.h"
-using mediawiki::MediaWiki;
+using mediawiki::Iface;
using mediawiki::Upload;
Q_DECLARE_METATYPE(FakeServer::Request)
@@ -56,7 +56,7 @@ private Q_SLOTS:
void initTestCase()
{
uploadCount = 0;
- this->m_mediaWiki = new \
MediaWiki(QUrl(QStringLiteral("http://127.0.0.1:12566"))); + this->m_mediaWiki \
= new Iface(QUrl(QStringLiteral("http://127.0.0.1:12566"))); this->m_infoScenario = \
QStringLiteral("<api><query><pages><page pageid=\"27697087\" ns=\"0\" title=\"API\" \
touched=\"2010-11-25T13:59:03Z\" lastrevid=\"367741756\" counter=\"0\" length=\"70\" \
redirect=\"\" starttimestamp=\"2010-11-25T16:14:51Z\" \
edittoken=\"cecded1f35005d22904a35cc7b736e18%2B\" talkid=\"5477418\" \
fullurl=\"http://en.wikipedia.org/wiki/API\" \
editurl=\"http://en.wikipedia.org/w/index.php?title=API&action=edit\" ><protection \
/></page></pages></query></api>");
this->m_file = new QFile(QCoreApplication::applicationFilePath() + \
QStringLiteral("_image.jpg")); this->m_file->open(QIODevice::ReadOnly);
@@ -104,7 +104,7 @@ private Q_SLOTS:
QFETCH(int, error);
uploadCount = 0;
- MediaWiki mediawiki(QUrl(QStringLiteral("http://127.0.0.1:12566")));
+ Iface mediawiki(QUrl(QStringLiteral("http://127.0.0.1:12566")));
FakeServer fakeserver;
if(scenario != QStringLiteral("error server"))
{
@@ -205,7 +205,7 @@ private:
QString request;
QString m_infoScenario;
QIODevice* m_file;
- MediaWiki* m_mediaWiki;
+ Iface* m_mediaWiki;
};
QTEST_MAIN(UploadTest)
diff --git a/core/utilities/assistants/webservices/CMakeLists.txt \
b/core/utilities/assistants/webservices/CMakeLists.txt index 507cb0dd09..810a5e4840 \
100644
--- a/core/utilities/assistants/webservices/CMakeLists.txt
+++ b/core/utilities/assistants/webservices/CMakeLists.txt
@@ -261,7 +261,7 @@ set(libwsmediawiki_SRCS \
${CMAKE_CURRENT_SOURCE_DIR}/mediawiki/mediawikiwindow.cp
${CMAKE_CURRENT_SOURCE_DIR}/mediawiki/mediawikitalker.cpp
\
${CMAKE_CURRENT_SOURCE_DIR}/mediawiki/lib/mediawiki_image.cpp
\
${CMAKE_CURRENT_SOURCE_DIR}/mediawiki/lib/mediawiki_imageinfo.cpp
- \
${CMAKE_CURRENT_SOURCE_DIR}/mediawiki/lib/mediawiki_mediawiki.cpp + \
${CMAKE_CURRENT_SOURCE_DIR}/mediawiki/lib/mediawiki_iface.cpp
\
${CMAKE_CURRENT_SOURCE_DIR}/mediawiki/lib/mediawiki_login.cpp
\
${CMAKE_CURRENT_SOURCE_DIR}/mediawiki/lib/mediawiki_logout.cpp
\
${CMAKE_CURRENT_SOURCE_DIR}/mediawiki/lib/mediawiki_queryimageinfo.cpp
diff --git a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_edit.cpp \
b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_edit.cpp index \
834d204d81..be15bc6f5e 100644
--- a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_edit.cpp
+++ b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_edit.cpp
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2011-03-22
- * Description : a MediaWiki C++ interface
+ * Description : a Iface C++ interface
*
* Copyright (C) 2011-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2011 by Alexandre Mendes <alex dot mendes1988 at gmail dot \
com> @@ -41,7 +41,7 @@
// Local includes
-#include "mediawiki_mediawiki.h"
+#include "mediawiki_iface.h"
#include "mediawiki_queryinfo.h"
#include "mediawiki_job_p.h"
@@ -61,7 +61,7 @@ class EditPrivate : public JobPrivate
{
public:
- EditPrivate(MediaWiki& mediawiki)
+ EditPrivate(Iface& mediawiki)
: JobPrivate(mediawiki)
{
}
@@ -106,7 +106,7 @@ public:
Result result;
};
-Edit::Edit(MediaWiki& media, QObject* parent)
+Edit::Edit(Iface& media, QObject* parent)
: Job(*new EditPrivate(media), parent)
{
}
diff --git a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_edit.h \
b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_edit.h index \
aa2a423cee..c99cd9df92 100644
--- a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_edit.h
+++ b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_edit.h
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2011-03-22
- * Description : a MediaWiki C++ interface
+ * Description : a Iface C++ interface
*
* Copyright (C) 2011-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2011 by Alexandre Mendes <alex dot mendes1988 at gmail dot \
com> @@ -43,7 +43,7 @@
namespace mediawiki
{
-class MediaWiki;
+class Iface;
class EditPrivate;
/**
@@ -163,7 +163,7 @@ public:
* @brief Constructs an Edit job.
* @param parent the QObject parent
*/
- explicit Edit(MediaWiki& media, QObject* parent = 0);
+ explicit Edit(Iface& media, QObject* parent = 0);
/**
* @brief Destroys the Edit job.
*/
diff --git a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_generalinfo.cpp \
b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_generalinfo.cpp index \
b964b91352..a1070cb190 100644
--- a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_generalinfo.cpp
+++ b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_generalinfo.cpp
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2011-03-22
- * Description : a MediaWiki C++ interface
+ * Description : a Iface C++ interface
*
* Copyright (C) 2011-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2011 by Manuel Campomanes <campomanes dot manuel at gmail dot \
com> @@ -29,7 +29,7 @@
// Local includes
-#include "mediawiki_mediawiki.h"
+#include "mediawiki_iface.h"
namespace mediawiki
{
diff --git a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_generalinfo.h \
b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_generalinfo.h index \
bfe5123222..304af9bf72 100644
--- a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_generalinfo.h
+++ b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_generalinfo.h
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2011-03-22
- * Description : a MediaWiki C++ interface
+ * Description : a Iface C++ interface
*
* Copyright (C) 2011-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2011 by Manuel Campomanes <campomanes dot manuel at gmail dot \
com>
diff --git a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_mediawiki.cpp \
b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_iface.cpp similarity \
index 57% rename from \
core/utilities/assistants/webservices/mediawiki/lib/mediawiki_mediawiki.cpp rename to \
core/utilities/assistants/webservices/mediawiki/lib/mediawiki_iface.cpp index \
56ba1fd184..2b530a73d8 100644
--- a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_mediawiki.cpp
+++ b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_iface.cpp
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2011-03-22
- * Description : a MediaWiki C++ interface
+ * Description : a Iface C++ interface
*
* Copyright (C) 2011-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2011 by Remi Benoit <r3m1 dot benoit at gmail dot com>
@@ -21,8 +21,8 @@
*
* ============================================================ */
-#include "mediawiki_mediawiki.h"
-#include "mediawiki_mediawiki_p.h"
+#include "mediawiki_iface.h"
+#include "mediawiki_iface_p.h"
// Qt includes
@@ -31,32 +31,34 @@
namespace mediawiki
{
-MediaWiki::MediaWiki(const QUrl& url, const QString& customUserAgent)
- : d_ptr(new MediaWikiPrivate(url,
- (customUserAgent.isEmpty() ? QString()
- : \
QString(customUserAgent + QStringLiteral("-"))) + \
MediaWikiPrivate::POSTFIX_USER_AGENT,
- new QNetworkAccessManager()))
+Iface::Iface(const QUrl& url, const QString& customUserAgent)
+ : d(new Private(url,
+ (customUserAgent.isEmpty() ? QString()
+ : QString(customUserAgent +
+ QStringLiteral("-"))) +
+ Private::POSTFIX_USER_AGENT,
+ new QNetworkAccessManager()))
{
}
-MediaWiki::~MediaWiki()
+Iface::~Iface()
{
- delete d_ptr;
+ delete d;
}
-QUrl MediaWiki::url() const
+QUrl Iface::url() const
{
- return d_ptr->url;
+ return d->url;
}
-QString MediaWiki::userAgent() const
+QString Iface::userAgent() const
{
- return d_ptr->userAgent;
+ return d->userAgent;
}
-QNetworkAccessManager* MediaWiki::manager() const
+QNetworkAccessManager* Iface::manager() const
{
- return d_ptr->manager;
+ return d->manager;
}
} // namespace mediawiki
diff --git a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_mediawiki.h \
b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_iface.h similarity \
index 83% rename from \
core/utilities/assistants/webservices/mediawiki/lib/mediawiki_mediawiki.h rename to \
core/utilities/assistants/webservices/mediawiki/lib/mediawiki_iface.h index \
d45a64031d..2dd6b5f495 100644
--- a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_mediawiki.h
+++ b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_iface.h
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2011-03-22
- * Description : a MediaWiki C++ interface
+ * Description : a Iface C++ interface
*
* Copyright (C) 2011-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2011 by Remi Benoit <r3m1 dot benoit at gmail dot com>
@@ -39,26 +39,25 @@ namespace mediawiki
{
/**
- * @brief Provides access to wiki powered by MediaWiki.
+ * @brief Provides access to wiki powered by Iface.
*/
-class DIGIKAM_EXPORT MediaWiki
+class DIGIKAM_EXPORT Iface
{
-
public:
/**
- * @brief Constructs a MediaWiki by its url api.
+ * @brief Constructs a Iface by its url api.
* @param url the url api of the wiki
* @param customUserAgent you can specify the user agent to use
which will be concatenated with the postfix user agent
* else the postfix user agent is used only
*/
- explicit MediaWiki(const QUrl& url, const QString& customUserAgent = QString());
+ explicit Iface(const QUrl& url, const QString& customUserAgent = QString());
/**
- * @brief Destructs the MediaWiki.
+ * @brief Destructs the Iface.
*/
- ~MediaWiki();
+ ~Iface();
/**
* @brief Returns the url api of the wiki.
@@ -80,8 +79,8 @@ public:
private:
- class MediaWikiPrivate;
- MediaWikiPrivate* const d_ptr;
+ class Private;
+ Private* const d;
friend class JobPrivate;
};
diff --git a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_mediawiki_p.h \
b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_iface_p.h similarity \
index 81% rename from \
core/utilities/assistants/webservices/mediawiki/lib/mediawiki_mediawiki_p.h rename to \
core/utilities/assistants/webservices/mediawiki/lib/mediawiki_iface_p.h index \
b9e92258ab..3ede5eddf6 100644
--- a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_mediawiki_p.h
+++ b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_iface_p.h
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2011-03-22
- * Description : a MediaWiki C++ interface
+ * Description : a Iface C++ interface
*
* Copyright (C) 2011-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2011 by Remi Benoit <r3m1 dot benoit at gmail dot com>
@@ -33,19 +33,19 @@
namespace mediawiki
{
-class Q_DECL_HIDDEN MediaWiki::MediaWikiPrivate
+class Q_DECL_HIDDEN Iface::Private
{
public:
- MediaWikiPrivate(const QUrl& url, const QString& userAgent, \
QNetworkAccessManager* const manager) + Private(const QUrl& url, const QString& \
userAgent, QNetworkAccessManager* const manager) : url(url),
userAgent(userAgent),
manager(manager)
{
}
- ~MediaWikiPrivate()
+ ~Private()
{
delete manager;
}
@@ -59,7 +59,7 @@ public:
QNetworkAccessManager* const manager;
};
-const QString MediaWiki::MediaWikiPrivate::POSTFIX_USER_AGENT = \
QString::fromUtf8("mediawiki-silk"); +const QString \
Iface::Private::POSTFIX_USER_AGENT = QString::fromUtf8("mediawiki-silk");
} // namespace mediawiki
diff --git a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_image.cpp \
b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_image.cpp index \
a337302fe2..7a661a59c7 100644
--- a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_image.cpp
+++ b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_image.cpp
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2011-03-22
- * Description : a MediaWiki C++ interface
+ * Description : a Iface C++ interface
*
* Copyright (C) 2011-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2011 by Ludovic Delfau <ludovicdelfau at gmail dot com>
diff --git a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_image.h \
b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_image.h index \
93362ad421..17974ba21c 100644
--- a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_image.h
+++ b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_image.h
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2011-03-22
- * Description : a MediaWiki C++ interface
+ * Description : a Iface C++ interface
*
* Copyright (C) 2011-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2011 by Ludovic Delfau <ludovicdelfau at gmail dot com>
diff --git a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_imageinfo.cpp \
b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_imageinfo.cpp index \
617aa3f878..bced99d8bc 100644
--- a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_imageinfo.cpp
+++ b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_imageinfo.cpp
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2011-03-22
- * Description : a MediaWiki C++ interface
+ * Description : a Iface C++ interface
*
* Copyright (C) 2011-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2011 by Ludovic Delfau <ludovicdelfau at gmail dot com>
diff --git a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_imageinfo.h \
b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_imageinfo.h index \
0ac3e4684d..87f4190348 100644
--- a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_imageinfo.h
+++ b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_imageinfo.h
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2011-03-22
- * Description : a MediaWiki C++ interface
+ * Description : a Iface C++ interface
*
* Copyright (C) 2011-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2011 by Ludovic Delfau <ludovicdelfau at gmail dot com>
diff --git a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_job.cpp \
b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_job.cpp index \
95e6bb6446..3bb29ffb3f 100644
--- a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_job.cpp
+++ b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_job.cpp
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2011-03-22
- * Description : a MediaWiki C++ interface
+ * Description : a Iface C++ interface
*
* Copyright (C) 2011-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2011 by Paolo de Vathaire <paolo dot devathaire at gmail dot \
com> @@ -29,7 +29,7 @@
// Local include
-#include "mediawiki_mediawiki.h"
+#include "mediawiki_iface.h"
#include "mediawiki_job_p.h"
namespace mediawiki
diff --git a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_job.h \
b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_job.h index \
30506371fb..d6ce1742cb 100644
--- a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_job.h
+++ b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_job.h
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2011-03-22
- * Description : a MediaWiki C++ interface
+ * Description : a Iface C++ interface
*
* Copyright (C) 2011-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2011 by Paolo de Vathaire <paolo dot devathaire at gmail dot \
com> @@ -35,11 +35,11 @@
namespace mediawiki
{
-class MediaWiki;
+class Iface;
class JobPrivate;
/**
- * @brief The base class for all MediaWiki jobs.
+ * @brief The base class for all Iface jobs.
*/
class DIGIKAM_EXPORT Job : public KJob
{
diff --git a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_job_p.h \
b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_job_p.h index \
08f8c8dac7..64918e17be 100644
--- a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_job_p.h
+++ b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_job_p.h
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2011-03-22
- * Description : a MediaWiki C++ interface
+ * Description : a Iface C++ interface
*
* Copyright (C) 2011-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2011 by Paolo de Vathaire <paolo dot devathaire at gmail dot \
com> @@ -24,7 +24,7 @@
#ifndef MEDIAWIKI_JOB_P_H
#define MEDIAWIKI_JOB_P_H
-#include "mediawiki_mediawiki.h"
+#include "mediawiki_iface.h"
namespace mediawiki
{
@@ -33,14 +33,14 @@ class JobPrivate
{
public:
- explicit JobPrivate(MediaWiki& mediawiki)
+ explicit JobPrivate(Iface& mediawiki)
: mediawiki(mediawiki),
manager(mediawiki.manager()),
reply(0)
{
}
- MediaWiki& mediawiki;
+ Iface& mediawiki;
QNetworkAccessManager* const manager;
QNetworkReply* reply;
};
diff --git a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_login.cpp \
b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_login.cpp index \
eb77da5647..dce969d8cf 100644
--- a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_login.cpp
+++ b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_login.cpp
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2011-03-22
- * Description : a MediaWiki C++ interface
+ * Description : a Iface C++ interface
*
* Copyright (C) 2011-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2011 by Alexandre Mendes <alex dot mendes1988 at gmail dot \
com> @@ -37,7 +37,7 @@
// Local includes
#include "mediawiki_login.h"
-#include "mediawiki_mediawiki.h"
+#include "mediawiki_iface.h"
#include "mediawiki_job_p.h"
namespace mediawiki
@@ -48,7 +48,7 @@ class LoginPrivate : public JobPrivate
public:
- LoginPrivate(MediaWiki& mediawiki, const QString& login, const QString& \
password) + LoginPrivate(Iface& mediawiki, const QString& login, const QString& \
password) : JobPrivate(mediawiki),
login(login),
password(password)
@@ -88,7 +88,7 @@ public:
QString lgtoken;
};
-Login::Login(MediaWiki& mediawiki, const QString& login, const QString& password, \
QObject* const parent) +Login::Login(Iface& mediawiki, const QString& login, const \
QString& password, QObject* const parent) : Job(*new LoginPrivate(mediawiki, login, \
password), parent) {
}
diff --git a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_login.h \
b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_login.h index \
69ed46f243..d23a5046f3 100644
--- a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_login.h
+++ b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_login.h
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2011-03-22
- * Description : a MediaWiki C++ interface
+ * Description : a Iface C++ interface
*
* Copyright (C) 2011-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2011 by Alexandre Mendes <alex dot mendes1988 at gmail dot \
com> @@ -39,7 +39,7 @@
namespace mediawiki
{
-class MediaWiki;
+class Iface;
class LoginPrivate;
/**
* @brief Login job.
@@ -81,7 +81,7 @@ public:
WrongPassword,
/**
- * @brief Same as WrongPass, returned when an authentication plugin rather \
than MediaWiki itself rejected the password + * @brief Same as WrongPass, \
returned when an authentication plugin rather than Iface itself \
rejected the password
*/
WrongPluginPassword,
@@ -115,7 +115,7 @@ public:
* @param password the QObject parent
* @param parent the QObject parent
*/
- explicit Login(MediaWiki& mediawiki, const QString& login, const QString& \
password, QObject* const parent = 0); + explicit Login(Iface& mediawiki, const \
QString& login, const QString& password, QObject* const parent = 0);
/**
* @brief Destroys the Login job.
diff --git a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_logout.cpp \
b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_logout.cpp index \
87848f49b8..21cfc452a4 100644
--- a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_logout.cpp
+++ b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_logout.cpp
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2011-03-22
- * Description : a MediaWiki C++ interface
+ * Description : a Iface C++ interface
*
* Copyright (C) 2011-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2011 by Alexandre Mendes <alex dot mendes1988 at gmail dot \
com> @@ -36,7 +36,7 @@
// Local includes
-#include "mediawiki_mediawiki.h"
+#include "mediawiki_iface.h"
#include "mediawiki_job_p.h"
namespace mediawiki
@@ -46,13 +46,13 @@ class LogoutPrivate : public JobPrivate
{
public:
- LogoutPrivate(MediaWiki& mediawiki)
+ LogoutPrivate(Iface& mediawiki)
: JobPrivate(mediawiki)
{
}
};
-Logout::Logout(MediaWiki& mediawiki, QObject* const parent)
+Logout::Logout(Iface& mediawiki, QObject* const parent)
: Job(*new LogoutPrivate(mediawiki), parent)
{
}
diff --git a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_logout.h \
b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_logout.h index \
fe71c094d5..37a3511603 100644
--- a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_logout.h
+++ b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_logout.h
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2011-03-22
- * Description : a MediaWiki C++ interface
+ * Description : a Iface C++ interface
*
* Copyright (C) 2011-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2011 by Alexandre Mendes <alex dot mendes1988 at gmail dot \
com> @@ -32,7 +32,7 @@
namespace mediawiki
{
-class MediaWiki;
+class Iface;
class LogoutPrivate;
/**
@@ -51,7 +51,7 @@ public:
* @brief Constructs a Logout job.
* @param parent the QObject parent
*/
- explicit Logout(MediaWiki& mediawiki, QObject* const parent = 0);
+ explicit Logout(Iface& mediawiki, QObject* const parent = 0);
/**
* @brief Destroys the Logout job.
diff --git a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_page.cpp \
b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_page.cpp index \
552cbec26b..fbd09badb8 100644
--- a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_page.cpp
+++ b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_page.cpp
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2011-03-22
- * Description : a MediaWiki C++ interface
+ * Description : a Iface C++ interface
*
* Copyright (C) 2011-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2011 by Joris Munoz <munozjoris at gmail dot com>
diff --git a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_page.h \
b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_page.h index \
64ffae5812..ffcc13a6af 100644
--- a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_page.h
+++ b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_page.h
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2011-03-22
- * Description : a MediaWiki C++ interface
+ * Description : a Iface C++ interface
*
* Copyright (C) 2011-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2011 by Joris Munoz <munozjoris at gmail dot com>
diff --git a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_parse.cpp \
b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_parse.cpp index \
f0b544ef25..dbef27e6c7 100644
--- a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_parse.cpp
+++ b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_parse.cpp
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2011-03-22
- * Description : a MediaWiki C++ interface
+ * Description : a Iface C++ interface
*
* Copyright (C) 2011-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2011 by Alexandre Mendes <alex dot mendes1988 at gmail dot \
com> @@ -36,7 +36,7 @@
// Local includes
#include "mediawiki_job_p.h"
-#include "mediawiki_mediawiki.h"
+#include "mediawiki_iface.h"
namespace mediawiki
{
@@ -46,7 +46,7 @@ class ParsePrivate : public JobPrivate
public:
- ParsePrivate(MediaWiki& mediawiki)
+ ParsePrivate(Iface& mediawiki)
: JobPrivate(mediawiki)
{
}
@@ -54,7 +54,7 @@ public:
QMap<QString, QString> requestParameter;
};
-Parse::Parse(MediaWiki& mediawiki, QObject* const parent)
+Parse::Parse(Iface& mediawiki, QObject* const parent)
: Job(*new ParsePrivate(mediawiki), parent)
{
}
diff --git a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_parse.h \
b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_parse.h index \
35a880f3f4..1e4fdff775 100644
--- a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_parse.h
+++ b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_parse.h
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2011-03-22
- * Description : a MediaWiki C++ interface
+ * Description : a Iface C++ interface
*
* Copyright (C) 2011-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2011 by Alexandre Mendes <alex dot mendes1988 at gmail dot \
com> @@ -38,7 +38,7 @@
namespace mediawiki
{
-class MediaWiki;
+class Iface;
class ParsePrivate;
class DIGIKAM_EXPORT Parse : public Job
@@ -69,7 +69,7 @@ public:
MissingPage
};
- explicit Parse(MediaWiki& mediawiki, QObject* const parent = 0);
+ explicit Parse(Iface& mediawiki, QObject* const parent = 0);
virtual ~Parse();
void setText(const QString& param);
diff --git a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_protection.cpp \
b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_protection.cpp index \
1c802231b8..fba7d35618 100644
--- a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_protection.cpp
+++ b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_protection.cpp
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2011-03-22
- * Description : a MediaWiki C++ interface
+ * Description : a Iface C++ interface
*
* Copyright (C) 2011-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2011 by Vincent Garcia <xavier dot vincent dot garcia at gmail \
dot com>
diff --git a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_protection.h \
b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_protection.h index \
5b01180c99..b729d26c10 100644
--- a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_protection.h
+++ b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_protection.h
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2011-03-22
- * Description : a MediaWiki C++ interface
+ * Description : a Iface C++ interface
*
* Copyright (C) 2011-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2011 by Vincent Garcia <xavier dot vincent dot garcia at gmail \
dot com>
diff --git a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_queryimageinfo.cpp \
b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_queryimageinfo.cpp \
index fe44c52be2..fd8415bbb0 100644
--- a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_queryimageinfo.cpp
+++ b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_queryimageinfo.cpp
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2011-03-22
- * Description : a MediaWiki C++ interface
+ * Description : a Iface C++ interface
*
* Copyright (C) 2011-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2011 by Ludovic Delfau <ludovicdelfau at gmail dot com>
@@ -36,7 +36,7 @@
// Local includes
#include "mediawiki_job_p.h"
-#include "mediawiki_mediawiki.h"
+#include "mediawiki_iface.h"
#include "mediawiki_imageinfo.h"
namespace mediawiki
@@ -47,7 +47,7 @@ class QueryImageinfoPrivate : public JobPrivate
public:
- QueryImageinfoPrivate(MediaWiki& mediawiki)
+ QueryImageinfoPrivate(Iface& mediawiki)
: JobPrivate(mediawiki)
{
onlyOneSignal = false;
@@ -81,7 +81,7 @@ public:
QString height;
};
-QueryImageinfo::QueryImageinfo(MediaWiki& mediawiki, QObject* const parent)
+QueryImageinfo::QueryImageinfo(Iface& mediawiki, QObject* const parent)
: Job(*new QueryImageinfoPrivate(mediawiki), parent)
{
Q_D(QueryImageinfo);
diff --git a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_queryimageinfo.h \
b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_queryimageinfo.h \
index b3a1ce4f62..ad9011defb 100644
--- a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_queryimageinfo.h
+++ b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_queryimageinfo.h
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2011-03-22
- * Description : a MediaWiki C++ interface
+ * Description : a Iface C++ interface
*
* Copyright (C) 2011-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2011 by Ludovic Delfau <ludovicdelfau at gmail dot com>
@@ -37,7 +37,7 @@
namespace mediawiki
{
-class MediaWiki;
+class Iface;
class QueryImageinfoPrivate;
/**
@@ -80,7 +80,7 @@ public:
* @param mediawiki the mediawiki concerned by the job
* @param parent the QObject parent
*/
- explicit QueryImageinfo(MediaWiki& mediawiki, QObject* const parent = 0);
+ explicit QueryImageinfo(Iface& mediawiki, QObject* const parent = 0);
/**
* @brief Destructs a query image info job.
diff --git a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_queryimages.cpp \
b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_queryimages.cpp index \
5704a61bfa..8ef6ee0ad7 100644
--- a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_queryimages.cpp
+++ b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_queryimages.cpp
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2011-03-22
- * Description : a MediaWiki C++ interface
+ * Description : a Iface C++ interface
*
* Copyright (C) 2011-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2011 by Ludovic Delfau <ludovicdelfau at gmail dot com>
@@ -35,7 +35,7 @@
// Local includes
-#include "mediawiki_mediawiki.h"
+#include "mediawiki_iface.h"
#include "mediawiki_job_p.h"
namespace mediawiki
@@ -45,7 +45,7 @@ class QueryImagesPrivate : public JobPrivate
{
public:
- QueryImagesPrivate(MediaWiki& mediawiki, const QString& limit)
+ QueryImagesPrivate(Iface& mediawiki, const QString& limit)
: JobPrivate(mediawiki),
limit(limit)
{
@@ -56,7 +56,7 @@ public:
QString imcontinue;
};
-QueryImages::QueryImages(MediaWiki& mediawiki, QObject* const parent)
+QueryImages::QueryImages(Iface& mediawiki, QObject* const parent)
: Job(*new QueryImagesPrivate(mediawiki, QStringLiteral("10")), parent)
{
}
diff --git a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_queryimages.h \
b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_queryimages.h index \
a815b13501..93ec861bb2 100644
--- a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_queryimages.h
+++ b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_queryimages.h
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2011-03-22
- * Description : a MediaWiki C++ interface
+ * Description : a Iface C++ interface
*
* Copyright (C) 2011-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2011 by Ludovic Delfau <ludovicdelfau at gmail dot com>
@@ -37,7 +37,7 @@
namespace mediawiki
{
-class MediaWiki;
+class Iface;
class QueryImagesPrivate;
/**
@@ -75,7 +75,7 @@ public:
* @param mediawiki the mediawiki concerned by the job
* @param parent the QObject parent
*/
- explicit QueryImages(MediaWiki& mediawiki, QObject* const parent = 0);
+ explicit QueryImages(Iface& mediawiki, QObject* const parent = 0);
/**
* @brief Destroys a query images job.
diff --git a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_queryinfo.cpp \
b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_queryinfo.cpp index \
3b8e3bafdd..73a3ee58bb 100644
--- a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_queryinfo.cpp
+++ b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_queryinfo.cpp
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2011-03-22
- * Description : a MediaWiki C++ interface
+ * Description : a Iface C++ interface
*
* Copyright (C) 2011-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2011 by Alexandre Mendes <alex dot mendes1988 at gmail dot \
com> @@ -38,7 +38,7 @@
// Local includes
-#include "mediawiki_mediawiki.h"
+#include "mediawiki_iface.h"
#include "mediawiki_job_p.h"
namespace mediawiki
@@ -49,7 +49,7 @@ class QueryInfoPrivate : public JobPrivate
public:
- QueryInfoPrivate(MediaWiki& mediawiki)
+ QueryInfoPrivate(Iface& mediawiki)
: JobPrivate(mediawiki)
{
}
@@ -59,7 +59,7 @@ public:
Page page;
};
-QueryInfo::QueryInfo(MediaWiki& mediawiki, QObject* const parent)
+QueryInfo::QueryInfo(Iface& mediawiki, QObject* const parent)
: Job(*new QueryInfoPrivate(mediawiki), parent)
{
}
diff --git a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_queryinfo.h \
b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_queryinfo.h index \
32de16ca93..af920ca5d3 100644
--- a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_queryinfo.h
+++ b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_queryinfo.h
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2011-03-22
- * Description : a MediaWiki C++ interface
+ * Description : a Iface C++ interface
*
* Copyright (C) 2011-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2011 by Alexandre Mendes <alex dot mendes1988 at gmail dot \
com> @@ -41,7 +41,7 @@
namespace mediawiki
{
-class MediaWiki;
+class Iface;
class QueryInfoPrivate;
/**
@@ -61,7 +61,7 @@ public:
* @param mediawiki the mediawiki concerned by the job
* @param parent the QObject parent
*/
- explicit QueryInfo(MediaWiki& mediawiki, QObject* const parent = 0);
+ explicit QueryInfo(Iface& mediawiki, QObject* const parent = 0);
/**
* @brief Destroys the QuerySiteInfoGeneral job.
diff --git a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_queryrevision.cpp \
b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_queryrevision.cpp \
index 939669748c..3eee9216e0 100644
--- a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_queryrevision.cpp
+++ b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_queryrevision.cpp
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2011-03-22
- * Description : a MediaWiki C++ interface
+ * Description : a Iface C++ interface
*
* Copyright (C) 2011-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2011 by Hormiere Guillaume <hormiere dot guillaume at gmail \
dot com> @@ -37,7 +37,7 @@
// Local includes
-#include "mediawiki_mediawiki.h"
+#include "mediawiki_iface.h"
#include "mediawiki_job_p.h"
namespace mediawiki
@@ -48,7 +48,7 @@ class QueryRevisionPrivate : public JobPrivate
public:
- QueryRevisionPrivate(MediaWiki& mediawiki)
+ QueryRevisionPrivate(Iface& mediawiki)
: JobPrivate(mediawiki)
{
}
@@ -56,7 +56,7 @@ public:
QMap<QString, QString> requestParameter;
};
-QueryRevision::QueryRevision(MediaWiki& mediawiki, QObject* const parent)
+QueryRevision::QueryRevision(Iface& mediawiki, QObject* const parent)
: Job(*new QueryRevisionPrivate(mediawiki), parent)
{
}
diff --git a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_queryrevision.h \
b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_queryrevision.h index \
146b667a21..3fa710c45c 100644
--- a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_queryrevision.h
+++ b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_queryrevision.h
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2011-03-22
- * Description : a MediaWiki C++ interface
+ * Description : a Iface C++ interface
*
* Copyright (C) 2011-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2011 by Hormiere Guillaume <hormiere dot guillaume at gmail \
dot com> @@ -40,7 +40,7 @@
namespace mediawiki
{
-class MediaWiki;
+class Iface;
class QueryRevisionPrivate;
/**
@@ -135,7 +135,7 @@ public:
* @param mediawiki the mediawiki concerned by the job
* @param parent the QObject parent
*/
- explicit QueryRevision(MediaWiki& mediawiki, QObject* const parent = 0);
+ explicit QueryRevision(Iface& mediawiki, QObject* const parent = 0);
/**
* @brief Destroys the QueryRevision job.
diff --git a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_querysiteinfogeneral.cpp \
b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_querysiteinfogeneral.cpp
index a864c2b44b..623c3fe815 100644
--- a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_querysiteinfogeneral.cpp
+++ b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_querysiteinfogeneral.cpp
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2011-03-22
- * Description : a MediaWiki C++ interface
+ * Description : a Iface C++ interface
*
* Copyright (C) 2011-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2011 by Hormiere Guillaume <hormiere dot guillaume at gmail \
dot com> @@ -36,7 +36,7 @@
// Local includes
-#include "mediawiki_mediawiki.h"
+#include "mediawiki_iface.h"
#include "mediawiki_job_p.h"
namespace mediawiki
@@ -47,13 +47,13 @@ class QuerySiteInfoGeneralPrivate : public JobPrivate
public:
- QuerySiteInfoGeneralPrivate(MediaWiki& mediawiki)
+ QuerySiteInfoGeneralPrivate(Iface& mediawiki)
: JobPrivate(mediawiki)
{
}
};
-QuerySiteInfoGeneral::QuerySiteInfoGeneral(MediaWiki& mediawiki, QObject* const \
/*parent*/) +QuerySiteInfoGeneral::QuerySiteInfoGeneral(Iface& mediawiki, QObject* \
const /*parent*/) : Job(*new QuerySiteInfoGeneralPrivate(mediawiki))
{
}
diff --git a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_querysiteinfogeneral.h \
b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_querysiteinfogeneral.h
index 395bdb2e53..6cd3fe8ef0 100644
--- a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_querysiteinfogeneral.h
+++ b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_querysiteinfogeneral.h
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2011-03-22
- * Description : a MediaWiki C++ interface
+ * Description : a Iface C++ interface
*
* Copyright (C) 2011-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2011 by Hormiere Guillaume <hormiere dot guillaume at gmail \
dot com> @@ -39,7 +39,7 @@
namespace mediawiki
{
-class MediaWiki;
+class Iface;
class QuerySiteInfoGeneralPrivate;
/**
@@ -66,7 +66,7 @@ public:
* @param mediawiki the mediawiki concerned by the job
* @param parent the QObject parent
*/
- explicit QuerySiteInfoGeneral(MediaWiki& mediawiki, QObject* const parent = 0);
+ explicit QuerySiteInfoGeneral(Iface& mediawiki, QObject* const parent = 0);
/**
* @brief Destroys the QuerySiteInfoGeneral job.
diff --git a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_querysiteinfousergroups.cpp \
b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_querysiteinfousergroups.cpp
index 1bc1f9e390..5337749db3 100644
--- a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_querysiteinfousergroups.cpp
+++ b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_querysiteinfousergroups.cpp
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2011-03-22
- * Description : a MediaWiki C++ interface
+ * Description : a Iface C++ interface
*
* Copyright (C) 2011-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2011 by Ludovic Delfau <ludovicdelfau at gmail dot com>
@@ -35,7 +35,7 @@
// Local includes
-#include "mediawiki_mediawiki.h"
+#include "mediawiki_iface.h"
#include "mediawiki_job_p.h"
namespace mediawiki
@@ -45,7 +45,7 @@ class QuerySiteinfoUsergroupsPrivate : public JobPrivate
{
public:
- QuerySiteinfoUsergroupsPrivate(MediaWiki& mediawiki, QNetworkAccessManager* \
const manager, bool includeNumber) + QuerySiteinfoUsergroupsPrivate(Iface& \
mediawiki, QNetworkAccessManager* const manager, bool includeNumber) : \
JobPrivate(mediawiki), manager(manager),
includeNumber(includeNumber)
@@ -56,7 +56,7 @@ public:
bool includeNumber;
};
-QuerySiteinfoUsergroups::QuerySiteinfoUsergroups(MediaWiki& mediawiki, QObject* \
const parent) +QuerySiteinfoUsergroups::QuerySiteinfoUsergroups(Iface& mediawiki, \
QObject* const parent)
: Job(*new QuerySiteinfoUsergroupsPrivate(mediawiki, new \
QNetworkAccessManager(), false), parent) {
}
diff --git a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_querysiteinfousergroups.h \
b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_querysiteinfousergroups.h
index 8473e85db4..1da3adb2c9 100644
--- a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_querysiteinfousergroups.h
+++ b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_querysiteinfousergroups.h
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2011-03-22
- * Description : a MediaWiki C++ interface
+ * Description : a Iface C++ interface
*
* Copyright (C) 2011-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2011 by Ludovic Delfau <ludovicdelfau at gmail dot com>
@@ -33,7 +33,7 @@
namespace mediawiki
{
-class MediaWiki;
+class Iface;
class QuerySiteinfoUsergroupsPrivate;
/**
@@ -53,7 +53,7 @@ public:
* @param mediawiki the mediawiki concerned by the job
* @param parent the QObject parent
*/
- explicit QuerySiteinfoUsergroups(MediaWiki& mediawiki, QObject* const parent = \
0); + explicit QuerySiteinfoUsergroups(Iface& mediawiki, QObject* const parent = \
0);
/**
* @brief Destroys the UserGroups job.
diff --git a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_revision.cpp \
b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_revision.cpp index \
6ac5668c79..7be45d5fae 100644
--- a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_revision.cpp
+++ b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_revision.cpp
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2011-03-22
- * Description : a MediaWiki C++ interface
+ * Description : a Iface C++ interface
*
* Copyright (C) 2011-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2011 by Robin Bussenot <bussenot dot robin at gmail dot com>
diff --git a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_revision.h \
b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_revision.h index \
6a5f4364e1..73e7cb4154 100644
--- a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_revision.h
+++ b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_revision.h
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2011-03-22
- * Description : a MediaWiki C++ interface
+ * Description : a Iface C++ interface
*
* Copyright (C) 2011-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2011 by Robin Bussenot <bussenot dot robin at gmail dot com>
diff --git a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_upload.cpp \
b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_upload.cpp index \
bae905c395..6e31b0fb90 100644
--- a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_upload.cpp
+++ b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_upload.cpp
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2011-03-22
- * Description : a MediaWiki C++ interface
+ * Description : a Iface C++ interface
*
* Copyright (C) 2011-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2011 by Alexandre Mendes <alex dot mendes1988 at gmail dot \
com> @@ -39,7 +39,7 @@
// Local includes
#include "mediawiki_job_p.h"
-#include "mediawiki_mediawiki.h"
+#include "mediawiki_iface.h"
#include "mediawiki_queryinfo.h"
namespace mediawiki
@@ -49,7 +49,7 @@ class UploadPrivate : public JobPrivate
public:
- UploadPrivate(MediaWiki& mediawiki)
+ UploadPrivate(Iface& mediawiki)
: JobPrivate(mediawiki)
{
file = 0;
@@ -88,7 +88,7 @@ public:
QString token;
};
-Upload::Upload(MediaWiki& mediawiki, QObject* const parent)
+Upload::Upload(Iface& mediawiki, QObject* const parent)
: Job(*new UploadPrivate(mediawiki), parent)
{
}
diff --git a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_upload.h \
b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_upload.h index \
f244ccd629..4c7221068b 100644
--- a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_upload.h
+++ b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_upload.h
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2011-03-22
- * Description : a MediaWiki C++ interface
+ * Description : a Iface C++ interface
*
* Copyright (C) 2011-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2011 by Alexandre Mendes <alex dot mendes1988 at gmail dot \
com> @@ -41,7 +41,7 @@
namespace mediawiki
{
-class MediaWiki;
+class Iface;
class UploadPrivate;
/**
@@ -129,7 +129,7 @@ public:
* @brief Constructs an Upload job.
* @param parent the QObject parent
*/
- Upload(MediaWiki& mediawiki, QObject* const parent = 0);
+ Upload(Iface& mediawiki, QObject* const parent = 0);
/**
* @brief Destroys the Upload job.
diff --git a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_usergroup.cpp \
b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_usergroup.cpp index \
91e32525ae..d3fb249d23 100644
--- a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_usergroup.cpp
+++ b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_usergroup.cpp
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2011-03-22
- * Description : a MediaWiki C++ interface
+ * Description : a Iface C++ interface
*
* Copyright (C) 2011-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2011 by Remi Benoit <r3m1 dot benoit at gmail dot com>
diff --git a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_usergroup.h \
b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_usergroup.h index \
aed20be446..aa58aafe2a 100644
--- a/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_usergroup.h
+++ b/core/utilities/assistants/webservices/mediawiki/lib/mediawiki_usergroup.h
@@ -4,7 +4,7 @@
* http://www.digikam.org
*
* Date : 2011-03-22
- * Description : a MediaWiki C++ interface
+ * Description : a Iface C++ interface
*
* Copyright (C) 2011-2018 by Gilles Caulier <caulier dot gilles at gmail dot com>
* Copyright (C) 2011 by Remi Benoit <r3m1 dot benoit at gmail dot com>
diff --git a/core/utilities/assistants/webservices/mediawiki/mediawikitalker.cpp \
b/core/utilities/assistants/webservices/mediawiki/mediawikitalker.cpp index \
cb961949cf..f10d3e09ae 100644
--- a/core/utilities/assistants/webservices/mediawiki/mediawikitalker.cpp
+++ b/core/utilities/assistants/webservices/mediawiki/mediawikitalker.cpp
@@ -41,7 +41,7 @@
// MediaWiki includes
#include "mediawiki_upload.h"
-#include "mediawiki_mediawiki.h"
+#include "mediawiki_iface.h"
// Local includes
@@ -62,14 +62,14 @@ public:
QList<QUrl> urls;
DInfoInterface* interface;
- MediaWiki* mediawiki;
+ Iface* mediawiki;
QString error;
QString currentFile;
QMap <QString, QMap <QString, QString> > imageDesc;
};
MediaWikiTalker::MediaWikiTalker(DInfoInterface* const iface,
- MediaWiki* const mediawiki,
+ Iface* const mediawiki,
QObject* const parent)
: KJob(parent),
d(new Private)
diff --git a/core/utilities/assistants/webservices/mediawiki/mediawikitalker.h \
b/core/utilities/assistants/webservices/mediawiki/mediawikitalker.h index \
fcbcc243b0..085383f07b 100644
--- a/core/utilities/assistants/webservices/mediawiki/mediawikitalker.h
+++ b/core/utilities/assistants/webservices/mediawiki/mediawikitalker.h
@@ -41,7 +41,7 @@
namespace mediawiki
{
- class MediaWiki;
+ class Iface;
}
using namespace mediawiki;
@@ -55,7 +55,7 @@ class MediaWikiTalker : public KJob
public:
- explicit MediaWikiTalker(DInfoInterface* const iface, MediaWiki* const \
mediawiki, QObject* const parent=0); + explicit MediaWikiTalker(DInfoInterface* \
const iface, Iface* const mediawiki, QObject* const parent=0); ~MediaWikiTalker();
public:
diff --git a/core/utilities/assistants/webservices/mediawiki/mediawikiwindow.cpp \
b/core/utilities/assistants/webservices/mediawiki/mediawikiwindow.cpp index \
0cc660a8c3..5c150fdbbe 100644
--- a/core/utilities/assistants/webservices/mediawiki/mediawikiwindow.cpp
+++ b/core/utilities/assistants/webservices/mediawiki/mediawikiwindow.cpp
@@ -49,7 +49,7 @@
// MediaWiki includes
#include "mediawiki_login.h"
-#include "mediawiki_mediawiki.h"
+#include "mediawiki_iface.h"
// Local includes
@@ -86,7 +86,7 @@ public:
QUrl wikiUrl;
MediaWikiWidget* widget;
- MediaWiki* mediawiki;
+ Iface* mediawiki;
DInfoInterface* iface;
MediaWikiTalker* uploadTalker;
};
@@ -332,7 +332,7 @@ void MediaWikiWindow::slotDoLogin(const QString& login, const \
QString& pass, con d->pass = pass;
d->wikiName = wikiName;
d->wikiUrl = wikiUrl;
- d->mediawiki = new MediaWiki(wikiUrl);
+ d->mediawiki = new Iface(wikiUrl);
Login* const loginJob = new Login(*d->mediawiki, login, pass);
connect(loginJob, SIGNAL(result(KJob*)),
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic