Merge pull request #858 from kiwix/fix_compilation

Fix compilation after removing of wrapping in libkiwix
kiwix · Jul 8, 2022 · f1aafc1 · f1aafc1
2 parents 8649da5 + 847b4b4
commit f1aafc1
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 10 deletions.
diff --git a/src/contentmanager.cpp b/src/contentmanager.cpp
@@ -402,7 +402,7 @@ void ContentManager::updateLibrary() {
     try {
         emit(pendingRequest(true));
         m_remoteLibraryManager.doUpdate(m_currentLanguage, m_categoryFilter);
-    } catch (runtime_error&) {}
+    } catch (std::runtime_error&) {}
 }
 
 #define CATALOG_URL "library.kiwix.org"

diff --git a/src/kiwixapp.cpp b/src/kiwixapp.cpp
@@ -37,7 +37,7 @@ KiwixApp::KiwixApp(int& argc, char *argv[])
 {
     try {
         m_translation.setTranslation(QLocale());
-    } catch (exception& e) {
+    } catch (std::exception& e) {
         QMessageBox::critical(nullptr, "Translation error", e.what());
         return;
     }
@@ -60,7 +60,7 @@ void KiwixApp::init()
 {
     try {
         mp_downloader = new kiwix::Downloader();
-    } catch (exception& e) {
+    } catch (std::exception& e) {
         QMessageBox::critical(nullptr, gt("error-downloader-window-title"),
         gt("error-downloader-launch-message") + "<br><br>" + e.what());
     }
@@ -236,7 +236,7 @@ void KiwixApp::openRandomUrl(bool newTab)
     if (zimId.isEmpty()) {
         return;
     }
-    
+
     try {
         auto archive = m_library.getArchive(zimId);
         auto entry = archive->getRandomEntry();

diff --git a/src/kiwixapp.h b/src/kiwixapp.h
@@ -18,6 +18,7 @@
 #include <kiwix/name_mapper.h>
 
 #include <mutex>
+#include <iostream>
 
 
 class KiwixApp : public QtSingleApplication

diff --git a/src/library.h b/src/library.h
@@ -3,8 +3,6 @@
 
 #include <kiwix/book.h>
 #include <kiwix/library.h>
-#include <kiwix/reader.h>
-#include <kiwix/searcher.h>
 #include <zim/archive.h>
 #include <zim/search.h>
 #include <qstring.h>

diff --git a/src/main.cpp b/src/main.cpp
@@ -4,6 +4,7 @@
 
 #include <QCommandLineParser>
 #include <iostream>
+#include <sstream>
 #if QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)
   #include <QWebEngineUrlScheme>
 #endif

diff --git a/src/readinglistbar.cpp b/src/readinglistbar.cpp
@@ -2,6 +2,7 @@
 #include "ui_readinglistbar.h"
 #include "kiwixapp.h"
 #include "zim/error.h"
+#include "zim/item.h"
 
 #include <QListWidgetItem>
 

diff --git a/src/urlschemehandler.cpp b/src/urlschemehandler.cpp
@@ -10,6 +10,7 @@
 #include <kiwix/name_mapper.h>
 #include <zim/search.h>
 #include <zim/entry.h>
+#include <zim/item.h>
 #include <zim/error.h>
 
 
@@ -125,7 +126,7 @@ UrlSchemeHandler::handleSearchRequest(QWebEngineUrlRequestJob* request)
     std::shared_ptr<zim::Search> search;
     try {
         auto searcher = app->getLibrary()->getSearcher(bookId);
-        search = make_shared<zim::Search>(searcher->search(searchQuery));
+        search = std::make_shared<zim::Search>(searcher->search(searchQuery));
     } catch(...) {
         request->fail(QWebEngineUrlRequestJob::UrlInvalid);
         return;

diff --git a/src/webview.cpp b/src/webview.cpp
@@ -10,6 +10,7 @@
 #include <QWebEngineHistory>
 #include <QVBoxLayout>
 #include <zim/error.h>
+#include <zim/item.h>
 
 void WebViewBackMenu::showEvent(QShowEvent *)
 {

diff --git a/src/webview.h b/src/webview.h
@@ -6,7 +6,6 @@
 #include <QWheelEvent>
 #include <QMenu>
 
-#include <kiwix/reader.h>
 #include "findinpagebar.h"
 
 class QWebEngineHistoryItem;

diff --git a/src/zimview.cpp b/src/zimview.cpp
@@ -24,7 +24,7 @@ ZimView::ZimView(TabBar *tabBar, QWidget *parent)
                     return;
                 auto zoomFactor = mp_webView->zoomFactor();
                 zoomFactor += 0.1;
-                zoomFactor = max(min(zoomFactor, 5.0), 0.25);
+                zoomFactor = std::max(std::min(zoomFactor, 5.0), 0.25);
                 mp_webView->setZoomFactor(zoomFactor);
                 auto key = mp_webView->zimId() + "/zoomFactor";
                 KiwixApp::instance()->getSettingsManager()->setSettings(key, zoomFactor);
@@ -35,7 +35,7 @@ ZimView::ZimView(TabBar *tabBar, QWidget *parent)
                     return;
                 auto zoomFactor = mp_webView->zoomFactor();
                 zoomFactor -= 0.1;
-                zoomFactor = max(min(zoomFactor, 5.0), 0.25);
+                zoomFactor = std::max(std::min(zoomFactor, 5.0), 0.25);
                 mp_webView->setZoomFactor(zoomFactor);
                 auto key = mp_webView->zimId() + "/zoomFactor";
                 KiwixApp::instance()->getSettingsManager()->setSettings(key, zoomFactor);