From 3e46893e2d84a7202313f5f1d9a24272005f948b Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Thu, 19 Jul 2018 10:59:57 +0200
Subject: [PATCH] Rename classes and files.

Mainly remove the `Kiwix` part in the name :
- KiwixSchemeHandler -> UrlSchemeHandler
- KiwixRequestInterceptor -> RequestInterceptor
- KiwixWebView -> WebView
- KTabWidget -> TabWidget
---
 kiwix-desktop.pro                             | 18 ++++++++---------
 src/kiwixapp.h                                | 18 ++++++++---------
 src/kiwixrequestinterceptor.h                 | 14 -------------
 src/kiwixschemehandler.h                      | 13 ------------
 src/ktabwidget.h                              | 20 -------------------
 src/mainwindow.cpp                            |  2 +-
 src/mainwindow.h                              |  6 +++---
 ...interceptor.cpp => requestinterceptor.cpp} |  6 +++---
 src/requestinterceptor.h                      | 14 +++++++++++++
 src/{ktabwidget.cpp => tabwidget.cpp}         | 20 +++++++++----------
 src/tabwidget.h                               | 20 +++++++++++++++++++
 ...schemehandler.cpp => urlschemehandler.cpp} |  6 +++---
 src/urlschemehandler.h                        | 13 ++++++++++++
 src/{kiwixwebview.cpp => webview.cpp}         | 12 +++++------
 src/{kiwixwebview.h => webview.h}             | 12 +++++------
 ui/mainwindow.ui                              |  6 +++---
 16 files changed, 100 insertions(+), 100 deletions(-)
 delete mode 100644 src/kiwixrequestinterceptor.h
 delete mode 100644 src/kiwixschemehandler.h
 delete mode 100644 src/ktabwidget.h
 rename src/{kiwixrequestinterceptor.cpp => requestinterceptor.cpp} (63%)
 create mode 100644 src/requestinterceptor.h
 rename src/{ktabwidget.cpp => tabwidget.cpp} (54%)
 create mode 100644 src/tabwidget.h
 rename src/{kiwixschemehandler.cpp => urlschemehandler.cpp} (90%)
 create mode 100644 src/urlschemehandler.h
 rename src/{kiwixwebview.cpp => webview.cpp} (76%)
 rename src/{kiwixwebview.h => webview.h} (70%)

diff --git a/kiwix-desktop.pro b/kiwix-desktop.pro
index 67708c5..4d24946 100644
--- a/kiwix-desktop.pro
+++ b/kiwix-desktop.pro
@@ -32,26 +32,26 @@ DEFINES += QT_DEPRECATED_WARNINGS
 SOURCES += \
     src/main.cpp \
     src/mainwindow.cpp \
-    src/kiwixschemehandler.cpp \
     src/kiwixapp.cpp \
     src/blobbuffer.cpp \
-    src/kiwixrequestinterceptor.cpp \
-    src/kiwixwebview.cpp \
     src/library.cpp \
     src/topwidget.cpp \
-    src/ktabwidget.cpp
+    src/requestinterceptor.cpp \
+    src/urlschemehandler.cpp \
+    src/tabwidget.cpp \
+    src/webview.cpp
 
 HEADERS += \
     src/mainwindow.h \
-    src/kiwixschemehandler.h \
     src/kiwixapp.h \
     src/blobbuffer.h \
-    src/kiwixrequestinterceptor.h \
-    src/kiwixwebview.h \
     src/library.h \
     src/topwidget.h \
-    src/ktabwidget.h \
-    src/kconstants.h
+    src/kconstants.h \
+    src/requestinterceptor.h \
+    src/urlschemehandler.h \
+    src/tabwidget.h \
+    src/webview.h
 
 FORMS += \
     ui/mainwindow.ui
diff --git a/src/kiwixapp.h b/src/kiwixapp.h
index 79642a5..dc6c907 100644
--- a/src/kiwixapp.h
+++ b/src/kiwixapp.h
@@ -3,9 +3,9 @@
 
 #include "library.h"
 #include "mainwindow.h"
-#include "ktabwidget.h"
-#include "kiwixschemehandler.h"
-#include "kiwixrequestinterceptor.h"
+#include "tabwidget.h"
+#include "urlschemehandler.h"
+#include "requestinterceptor.h"
 
 #include <QApplication>
 #include <QErrorMessage>
@@ -23,21 +23,21 @@ public:
 
     void showMessage(const QString& message);
 
-    KiwixSchemeHandler* getSchemeHandler() { return &schemeHandler; }
-    KiwixRequestInterceptor* getRequestInterceptor() { return &requestIntercetor; }
+    UrlSchemeHandler* getSchemeHandler() { return &schemeHandler; }
+    RequestInterceptor* getRequestInterceptor() { return &requestIntercetor; }
     Library* getLibrary() { return &library; }
     MainWindow* getMainWindow() { return mainWindow; }
-    KTabWidget* getTabWidget() { return tabWidget; }
+    TabWidget* getTabWidget() { return tabWidget; }
 
 
 private:
     Library library;
     MainWindow* mainWindow;
-    KTabWidget* tabWidget;
+    TabWidget* tabWidget;
     QErrorMessage* errorDialog;
 
-    KiwixSchemeHandler schemeHandler;
-    KiwixRequestInterceptor requestIntercetor;
+    UrlSchemeHandler schemeHandler;
+    RequestInterceptor requestIntercetor;
 };
 
 #endif // KIWIXAPP_H
diff --git a/src/kiwixrequestinterceptor.h b/src/kiwixrequestinterceptor.h
deleted file mode 100644
index 75f2ea6..0000000
--- a/src/kiwixrequestinterceptor.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef KIWIXREQUESTINTERCEPTOR_H
-#define KIWIXREQUESTINTERCEPTOR_H
-
-#include <QWebEngineUrlRequestInterceptor>
-
-
-class KiwixRequestInterceptor : public QWebEngineUrlRequestInterceptor
-{
-public:
-    KiwixRequestInterceptor();
-    virtual void interceptRequest(QWebEngineUrlRequestInfo &info);
-};
-
-#endif // KIWIXREQUESTINTERCEPTOR_H
diff --git a/src/kiwixschemehandler.h b/src/kiwixschemehandler.h
deleted file mode 100644
index 14d35af..0000000
--- a/src/kiwixschemehandler.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef KIWIXSCHEMEHANDLER_H
-#define KIWIXSCHEMEHANDLER_H
-
-#include <QWebEngineUrlSchemeHandler>
-
-class KiwixSchemeHandler : public QWebEngineUrlSchemeHandler
-{
-public:
-    KiwixSchemeHandler();
-    void requestStarted(QWebEngineUrlRequestJob *request);
-};
-
-#endif // KIWIXSCHEMEHANDLER_H
diff --git a/src/ktabwidget.h b/src/ktabwidget.h
deleted file mode 100644
index 0df8a46..0000000
--- a/src/ktabwidget.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef KTABWIDGET_H
-#define KTABWIDGET_H
-
-#include <QTableWidget>
-#include <memory>
-#include <kiwix/reader.h>
-#include "kiwixwebview.h"
-
-class KTabWidget : public QTabWidget
-{
-public:
-    KTabWidget(QWidget* parent=nullptr);
-
-    KiwixWebView* createNewTab(bool setCurrent);
-    void openUrl(std::shared_ptr<kiwix::Reader> reader, const QUrl &url, bool newTab);
-    void setTitleOf(KiwixWebView* webView, const QString& title);
-    void setIconOf(KiwixWebView* webView, const QIcon& icon);
-};
-
-#endif // KTABWIDGET_H
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 511e618..d142b3d 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -23,7 +23,7 @@ MainWindow::~MainWindow()
     delete ui;
 }
 
-KTabWidget* MainWindow::getTabWidget()
+TabWidget* MainWindow::getTabWidget()
 {
     return ui->tabWidget;
 }
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 376bea6..67a9eda 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -2,8 +2,8 @@
 #define MAINWINDOW_H
 
 #include <QMainWindow>
-#include "kiwixwebview.h"
-#include "ktabwidget.h"
+#include "webview.h"
+#include "tabwidget.h"
 
 namespace Ui {
 class MainWindow;
@@ -17,7 +17,7 @@ public:
     explicit MainWindow(QWidget *parent = 0);
     ~MainWindow();
 
-    KTabWidget* getTabWidget();
+    TabWidget* getTabWidget();
 
 private:
     Ui::MainWindow *ui;
diff --git a/src/kiwixrequestinterceptor.cpp b/src/requestinterceptor.cpp
similarity index 63%
rename from src/kiwixrequestinterceptor.cpp
rename to src/requestinterceptor.cpp
index 234367e..34d2aaa 100644
--- a/src/kiwixrequestinterceptor.cpp
+++ b/src/requestinterceptor.cpp
@@ -1,16 +1,16 @@
-#include "kiwixrequestinterceptor.h"
+#include "requestinterceptor.h"
 
 #include <QWebEngineUrlRequestInfo>
 #include <QDebug>
 #include <iostream>
 
-KiwixRequestInterceptor::KiwixRequestInterceptor()
+RequestInterceptor::RequestInterceptor()
 {
 
 }
 
 
-void KiwixRequestInterceptor::interceptRequest(QWebEngineUrlRequestInfo &info)
+void RequestInterceptor::interceptRequest(QWebEngineUrlRequestInfo &info)
 {
     auto url = info.requestUrl();
     auto urlString = url.toString();
diff --git a/src/requestinterceptor.h b/src/requestinterceptor.h
new file mode 100644
index 0000000..8c60244
--- /dev/null
+++ b/src/requestinterceptor.h
@@ -0,0 +1,14 @@
+#ifndef REQUESTINTERCEPTOR_H
+#define REQUESTINTERCEPTOR_H
+
+#include <QWebEngineUrlRequestInterceptor>
+
+
+class RequestInterceptor : public QWebEngineUrlRequestInterceptor
+{
+public:
+    RequestInterceptor();
+    virtual void interceptRequest(QWebEngineUrlRequestInfo &info);
+};
+
+#endif // REQUESTINTERCEPTOR_H
diff --git a/src/ktabwidget.cpp b/src/tabwidget.cpp
similarity index 54%
rename from src/ktabwidget.cpp
rename to src/tabwidget.cpp
index a7c5179..9c6719f 100644
--- a/src/ktabwidget.cpp
+++ b/src/tabwidget.cpp
@@ -1,17 +1,17 @@
-#include "ktabwidget.h"
+#include "tabwidget.h"
 
-KTabWidget::KTabWidget(QWidget *parent) :
+TabWidget::TabWidget(QWidget *parent) :
     QTabWidget(parent)
 {
 
 }
 
-KiwixWebView* KTabWidget::createNewTab(bool setCurrent)
+WebView* TabWidget::createNewTab(bool setCurrent)
 {
-    KiwixWebView* webView = new KiwixWebView();
-    QObject::connect(webView, &KiwixWebView::titleChanged, this,
+    WebView* webView = new WebView();
+    QObject::connect(webView, &WebView::titleChanged, this,
                      [=](const QString& str) { setTitleOf(webView, str); });
-    QObject::connect(webView, &KiwixWebView::iconChanged, this,
+    QObject::connect(webView, &WebView::iconChanged, this,
                      [=](const QIcon& icon) { setIconOf(webView, icon);  });
     // Ownership of webview is passed to the tabWidget
     addTab(webView, "");
@@ -21,16 +21,16 @@ KiwixWebView* KTabWidget::createNewTab(bool setCurrent)
     return webView;
 }
 
-void KTabWidget::openUrl(std::shared_ptr<kiwix::Reader> reader, const QUrl& url, bool newTab)
+void TabWidget::openUrl(std::shared_ptr<kiwix::Reader> reader, const QUrl& url, bool newTab)
 {
-    KiwixWebView* webView = nullptr;
+    WebView* webView = nullptr;
     if (newTab || !currentWidget()) {
         webView = createNewTab(true);
     }
     webView->setUrl(url);
 }
 
-void KTabWidget::setTitleOf(KiwixWebView* webView, const QString& title)
+void TabWidget::setTitleOf(WebView* webView, const QString& title)
 {
     if (title.startsWith("zim://")) {
         auto url = QUrl(title);
@@ -40,7 +40,7 @@ void KTabWidget::setTitleOf(KiwixWebView* webView, const QString& title)
     }
 }
 
-void KTabWidget::setIconOf(KiwixWebView *webView, const QIcon &icon)
+void TabWidget::setIconOf(WebView *webView, const QIcon &icon)
 {
     setTabIcon(indexOf(webView), icon);
 }
diff --git a/src/tabwidget.h b/src/tabwidget.h
new file mode 100644
index 0000000..856a934
--- /dev/null
+++ b/src/tabwidget.h
@@ -0,0 +1,20 @@
+#ifndef TABWIDGET_H
+#define TABWIDGET_H
+
+#include <QTableWidget>
+#include <memory>
+#include <kiwix/reader.h>
+#include "webview.h"
+
+class TabWidget : public QTabWidget
+{
+public:
+    TabWidget(QWidget* parent=nullptr);
+
+    WebView* createNewTab(bool setCurrent);
+    void openUrl(std::shared_ptr<kiwix::Reader> reader, const QUrl &url, bool newTab);
+    void setTitleOf(WebView* webView, const QString& title);
+    void setIconOf(WebView* webView, const QIcon& icon);
+};
+
+#endif // TABWIDGET_H
diff --git a/src/kiwixschemehandler.cpp b/src/urlschemehandler.cpp
similarity index 90%
rename from src/kiwixschemehandler.cpp
rename to src/urlschemehandler.cpp
index af1a9f7..d2c2677 100644
--- a/src/kiwixschemehandler.cpp
+++ b/src/urlschemehandler.cpp
@@ -1,19 +1,19 @@
 #include "kiwixapp.h"
-#include "kiwixschemehandler.h"
+#include "urlschemehandler.h"
 #include "blobbuffer.h"
 #include <QDebug>
 #include <QWebEngineUrlRequestJob>
 #include <QTextStream>
 #include <iostream>
 
-KiwixSchemeHandler::KiwixSchemeHandler()
+UrlSchemeHandler::UrlSchemeHandler()
 {
 
 }
 
 
 void
-KiwixSchemeHandler::requestStarted(QWebEngineUrlRequestJob *request)
+UrlSchemeHandler::requestStarted(QWebEngineUrlRequestJob *request)
 {
     auto qurl = request->requestUrl();
     std::string url = qurl.path().toUtf8().constData();
diff --git a/src/urlschemehandler.h b/src/urlschemehandler.h
new file mode 100644
index 0000000..97b2320
--- /dev/null
+++ b/src/urlschemehandler.h
@@ -0,0 +1,13 @@
+#ifndef URLSCHEMEHANDLER_H
+#define URLSCHEMEHANDLER_H
+
+#include <QWebEngineUrlSchemeHandler>
+
+class UrlSchemeHandler : public QWebEngineUrlSchemeHandler
+{
+public:
+    UrlSchemeHandler();
+    void requestStarted(QWebEngineUrlRequestJob *request);
+};
+
+#endif // URLSCHEMEHANDLER_H
diff --git a/src/kiwixwebview.cpp b/src/webview.cpp
similarity index 76%
rename from src/kiwixwebview.cpp
rename to src/webview.cpp
index b95a473..4d39230 100644
--- a/src/kiwixwebview.cpp
+++ b/src/webview.cpp
@@ -1,23 +1,23 @@
-#include "kiwixwebview.h"
+#include "webview.h"
 
 #include <QWebEngineProfile>
 #include <iostream>
 #include "kiwixapp.h"
 
-KiwixWebView::KiwixWebView(QWidget *parent)
+WebView::WebView(QWidget *parent)
     : QWebEngineView(parent)
 {
     auto profile = page()->profile();
     auto app = KiwixApp::instance();
     profile->installUrlSchemeHandler("zim", app->getSchemeHandler());
     profile->setRequestInterceptor(app->getRequestInterceptor());
-    QObject::connect(this, &QWebEngineView::urlChanged, this, &KiwixWebView::onUrlChanged);
+    QObject::connect(this, &QWebEngineView::urlChanged, this, &WebView::onUrlChanged);
 }
 
-KiwixWebView::~KiwixWebView()
+WebView::~WebView()
 {}
 
-QWebEngineView* KiwixWebView::createWindow(QWebEnginePage::WebWindowType type)
+QWebEngineView* WebView::createWindow(QWebEnginePage::WebWindowType type)
 {
     if ( type==QWebEnginePage::WebBrowserBackgroundTab
       || type==QWebEnginePage::WebBrowserTab )
@@ -28,7 +28,7 @@ QWebEngineView* KiwixWebView::createWindow(QWebEnginePage::WebWindowType type)
     return nullptr;
 }
 
-void KiwixWebView::onUrlChanged(const QUrl& url) {
+void WebView::onUrlChanged(const QUrl& url) {
     if (currentHost != url.host() ) {
         currentHost = url.host();
         auto app = KiwixApp::instance();
diff --git a/src/kiwixwebview.h b/src/webview.h
similarity index 70%
rename from src/kiwixwebview.h
rename to src/webview.h
index 3378b3f..5bc8e8f 100644
--- a/src/kiwixwebview.h
+++ b/src/webview.h
@@ -1,19 +1,19 @@
-#ifndef KIWIXWEBVIEW_H
-#define KIWIXWEBVIEW_H
+#ifndef WEBVIEW_H
+#define WEBVIEW_H
 
 #include <QWebEngineView>
 #include <QIcon>
 
 #include <kiwix/reader.h>
 
-class KiwixWebView : public QWebEngineView
+class WebView : public QWebEngineView
 {
     Q_OBJECT
     Q_PROPERTY(const QIcon icon READ icon NOTIFY iconChanged);
 
 public:
-    KiwixWebView(QWidget *parent = Q_NULLPTR);
-    virtual ~KiwixWebView();
+    WebView(QWidget *parent = Q_NULLPTR);
+    virtual ~WebView();
 
     const QIcon &icon() { return _icon; }
 
@@ -29,4 +29,4 @@ protected:
     QIcon _icon;
 };
 
-#endif // KIWIXWEBVIEW_H
+#endif // WEBVIEW_H
diff --git a/ui/mainwindow.ui b/ui/mainwindow.ui
index 0681395..050f6c8 100644
--- a/ui/mainwindow.ui
+++ b/ui/mainwindow.ui
@@ -19,7 +19,7 @@
   <widget class="QWidget" name="centralWidget">
    <layout class="QVBoxLayout" name="verticalLayout_2">
     <item>
-     <widget class="KTabWidget" name="tabWidget">
+     <widget class="TabWidget" name="tabWidget">
       <property name="tabShape">
        <enum>QTabWidget::Rounded</enum>
       </property>
@@ -51,9 +51,9 @@
    <header>src/topwidget.h</header>
   </customwidget>
   <customwidget>
-   <class>KTabWidget</class>
+   <class>TabWidget</class>
    <extends>QTabWidget</extends>
-   <header>src/ktabwidget.h</header>
+   <header>src/tabwidget.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>