From 1287c933689b0287c64ff37af0fe93a7286bad0b Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Wed, 18 Jul 2018 17:19:24 +0200
Subject: [PATCH] Overload `KiwixApp::instance()` to return a `KiwixApp*`.

---
 kiwixapp.cpp           | 4 ++++
 kiwixapp.h             | 1 +
 kiwixschemehandler.cpp | 2 +-
 kiwixwebview.cpp       | 2 +-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/kiwixapp.cpp b/kiwixapp.cpp
index dfc2bb2..f8a02ee 100644
--- a/kiwixapp.cpp
+++ b/kiwixapp.cpp
@@ -53,6 +53,10 @@ KiwixApp::~KiwixApp()
     delete mainWindow;
 }
 
+KiwixApp *KiwixApp::instance()
+{
+    return static_cast<KiwixApp*>(QApplication::instance());
+}
 
 void KiwixApp::openZimFile(const QString &zimfile)
 {
diff --git a/kiwixapp.h b/kiwixapp.h
index f0e1c69..4f85ee5 100644
--- a/kiwixapp.h
+++ b/kiwixapp.h
@@ -15,6 +15,7 @@ class KiwixApp : public QApplication
 public:
     KiwixApp(int& argc, char *argv[]);
     virtual ~KiwixApp();
+    static KiwixApp* instance();
 
     void openZimFile(const QString& zimfile);
 
diff --git a/kiwixschemehandler.cpp b/kiwixschemehandler.cpp
index 7e4e462..af1a9f7 100644
--- a/kiwixschemehandler.cpp
+++ b/kiwixschemehandler.cpp
@@ -20,7 +20,7 @@ KiwixSchemeHandler::requestStarted(QWebEngineUrlRequestJob *request)
     qDebug() << "Handling request" << qurl;
     if (url[0] == '/')
         url = url.substr(1);
-    auto library = static_cast<KiwixApp*>(KiwixApp::instance())->getLibrary();
+    auto library = KiwixApp::instance()->getLibrary();
     auto zim_id = qurl.host();
     auto reader = library->getReader(zim_id);
     if ( reader == nullptr) {
diff --git a/kiwixwebview.cpp b/kiwixwebview.cpp
index 7aa230e..b847e26 100644
--- a/kiwixwebview.cpp
+++ b/kiwixwebview.cpp
@@ -8,7 +8,7 @@ KiwixWebView::KiwixWebView(QWidget *parent)
     : QWebEngineView(parent)
 {
     auto profile = page()->profile();
-    auto app = static_cast<KiwixApp*>(KiwixApp::instance());
+    auto app = KiwixApp::instance();
     profile->installUrlSchemeHandler("zim", app->getSchemeHandler());
     profile->setRequestInterceptor(app->getRequestInterceptor());
 }