From 5881c3ef9f39c35ef0e923bf6f205e0cd465143e Mon Sep 17 00:00:00 2001
From: Emmanuel Engelhart <kelson@kiwix.org>
Date: Mon, 12 Apr 2021 13:24:49 +0200
Subject: [PATCH] Revert "Reorder include to avoid header conflict beetween
 Xapiand and Qt (#616)"

This reverts commit 56bb1a219c91279e10dabff7fc67b21c9cc0e05a.
---
 src/about.cpp                  | 2 +-
 src/contentmanager.cpp         | 2 +-
 src/contentmanager.h           | 5 ++---
 src/contentmanagerside.cpp     | 2 +-
 src/contentmanagerside.h       | 5 ++---
 src/contentmanagerview.cpp     | 2 +-
 src/contenttypefilter.cpp      | 4 ++--
 src/findinpagebar.cpp          | 4 ++--
 src/fullscreennotification.cpp | 4 ++--
 src/kprofile.cpp               | 3 ++-
 src/localkiwixserver.cpp       | 2 +-
 src/mainmenu.cpp               | 3 +--
 src/mainwindow.cpp             | 5 +++--
 src/mainwindow.h               | 9 ++++-----
 src/opdsrequestmanager.cpp     | 2 +-
 src/opdsrequestmanager.h       | 7 +++----
 src/readinglistbar.cpp         | 2 +-
 src/searchbar.cpp              | 2 +-
 src/settingsmanager.cpp        | 2 +-
 src/settingsmanagerview.cpp    | 2 +-
 src/static_content.cpp         | 4 +++-
 src/suggestionlistworker.cpp   | 2 +-
 src/tabbar.cpp                 | 2 +-
 src/topwidget.cpp              | 3 ++-
 src/webpage.cpp                | 2 +-
 src/webview.cpp                | 2 +-
 src/zimview.cpp                | 2 +-
 27 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/src/about.cpp b/src/about.cpp
index e5268d7..ffc3837 100644
--- a/src/about.cpp
+++ b/src/about.cpp
@@ -1,6 +1,6 @@
-#include "kiwixapp.h"
 #include "about.h"
 #include "ui_about.h"
+#include "kiwixapp.h"
 
 #define _STR(...) # __VA_ARGS__
 #define STR(X) _STR(X)
diff --git a/src/contentmanager.cpp b/src/contentmanager.cpp
index 3c05b17..9b9116f 100644
--- a/src/contentmanager.cpp
+++ b/src/contentmanager.cpp
@@ -1,6 +1,6 @@
-#include "kiwixapp.h"
 #include "contentmanager.h"
 
+#include "kiwixapp.h"
 #include "static_content.h"
 #include <kiwix/tools/networkTools.h>
 #include <kiwix/tools/otherTools.h>
diff --git a/src/contentmanager.h b/src/contentmanager.h
index d7197a5..eac25e0 100644
--- a/src/contentmanager.h
+++ b/src/contentmanager.h
@@ -1,15 +1,14 @@
 #ifndef CONTENTMANAGER_H
 #define CONTENTMANAGER_H
 
+#include <QObject>
+#include <math.h>
 #include "library.h"
 #include "contentmanagerview.h"
 #include <kiwix/downloader.h>
 #include "opdsrequestmanager.h"
 #include "contenttypefilter.h"
 
-#include <QObject>
-#include <math.h>
-
 class ContentManager : public QObject
 {
     Q_OBJECT
diff --git a/src/contentmanagerside.cpp b/src/contentmanagerside.cpp
index 1d87add..e44fca8 100644
--- a/src/contentmanagerside.cpp
+++ b/src/contentmanagerside.cpp
@@ -1,6 +1,6 @@
-#include "kiwixapp.h"
 #include "contentmanagerside.h"
 #include "ui_contentmanagerside.h"
+#include "kiwixapp.h"
 
 #include <QLocale>
 
diff --git a/src/contentmanagerside.h b/src/contentmanagerside.h
index 122c116..da8dcff 100644
--- a/src/contentmanagerside.h
+++ b/src/contentmanagerside.h
@@ -1,12 +1,11 @@
 #ifndef CONTENTMANAGERSIDE_H
 #define CONTENTMANAGERSIDE_H
 
-#include "contentmanager.h"
-#include "contenttypefilter.h"
-
 #include <QWidget>
 #include <QListWidget>
 #include <QCheckBox>
+#include "contentmanager.h"
+#include "contenttypefilter.h"
 
 namespace Ui {
 class contentmanagerside;
diff --git a/src/contentmanagerview.cpp b/src/contentmanagerview.cpp
index 8bdf7dd..4e14a97 100644
--- a/src/contentmanagerview.cpp
+++ b/src/contentmanagerview.cpp
@@ -1,7 +1,7 @@
-#include "kiwixapp.h"
 #include "contentmanagerview.h"
 #include <QFile>
 #include <QWebEngineProfile>
+#include "kiwixapp.h"
 
 ContentManagerView::ContentManagerView(QWidget *parent)
     : QWebEngineView(parent)
diff --git a/src/contenttypefilter.cpp b/src/contenttypefilter.cpp
index fafba1b..4a10f77 100644
--- a/src/contenttypefilter.cpp
+++ b/src/contenttypefilter.cpp
@@ -1,5 +1,5 @@
-#include "kiwixapp.h"
 #include "contenttypefilter.h"
+#include "kiwixapp.h"
 
 ContentTypeFilter::ContentTypeFilter(QString name, QWidget *parent)
 : QCheckBox(parent),
@@ -18,4 +18,4 @@ void ContentTypeFilter::onStateChanged(int state)
 {
     setText(gt(m_name) + " : " + m_states[static_cast<Qt::CheckState>(state)]);
     setStyleSheet((state == 0) ? "" : "*{font-weight: bold}");
-}
+}
\ No newline at end of file
diff --git a/src/findinpagebar.cpp b/src/findinpagebar.cpp
index 69b65c5..06ec6cf 100644
--- a/src/findinpagebar.cpp
+++ b/src/findinpagebar.cpp
@@ -1,6 +1,6 @@
-#include "kiwixapp.h"
 #include "findinpagebar.h"
 #include "ui_findinpagebar.h"
+#include "kiwixapp.h"
 
 FindInPageBar::FindInPageBar(QWidget *parent) :
     QFrame(parent),
@@ -66,4 +66,4 @@ void FindInPageBar::keyPressEvent(QKeyEvent *event)
         default:
             QWidget::keyPressEvent(event);
     }
-}
+}
\ No newline at end of file
diff --git a/src/fullscreennotification.cpp b/src/fullscreennotification.cpp
index f1b284a..641002b 100644
--- a/src/fullscreennotification.cpp
+++ b/src/fullscreennotification.cpp
@@ -1,5 +1,5 @@
-#include "kiwixapp.h"
 #include "fullscreennotification.h"
+#include "kiwixapp.h"
 #include <QSequentialAnimationGroup>
 #include <QGraphicsOpacityEffect>
 #include <QPropertyAnimation>
@@ -45,4 +45,4 @@ void FullScreenNotification::showEvent(QShowEvent *event)
     if (!m_previouslyVisible && isVisible())
         emit shown();
     m_previouslyVisible = isVisible();
-}
+}
\ No newline at end of file
diff --git a/src/kprofile.cpp b/src/kprofile.cpp
index 379e22f..ec63507 100644
--- a/src/kprofile.cpp
+++ b/src/kprofile.cpp
@@ -1,5 +1,6 @@
-#include "kiwixapp.h"
 #include "kprofile.h"
+
+#include "kiwixapp.h"
 #include <QFileDialog>
 #include <QMessageBox>
 #include <QWebEngineSettings>
diff --git a/src/localkiwixserver.cpp b/src/localkiwixserver.cpp
index 120ea26..be50790 100644
--- a/src/localkiwixserver.cpp
+++ b/src/localkiwixserver.cpp
@@ -1,6 +1,6 @@
-#include "kiwixapp.h"
 #include "localkiwixserver.h"
 #include "ui_localkiwixserver.h"
+#include "kiwixapp.h"
 #include <QDesktopServices>
 #include <QMessageBox>
 #include <thread>
diff --git a/src/mainmenu.cpp b/src/mainmenu.cpp
index dc5f690..6a99d37 100644
--- a/src/mainmenu.cpp
+++ b/src/mainmenu.cpp
@@ -1,8 +1,7 @@
-#include "kiwixapp.h"
-
 #include <QTranslator>
 
 #include "mainmenu.h"
+#include "kiwixapp.h"
 #include "menuproxystyle.h"
 
 #define ADD_ACTION(ID) addAction(app->getAction(KiwixApp::ID));
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index ab8e0e4..edecb2e 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1,8 +1,9 @@
-#include "kiwixapp.h"
+
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
 #include "ui_about.h"
 
+#include "kiwixapp.h"
 #include "kconstants.h"
 
 #include <QDesktopServices>
@@ -92,4 +93,4 @@ QStackedWidget *MainWindow::getSideDockWidget()
 ContentManagerSide *MainWindow::getSideContentManager()
 {
     return mp_ui->contentmanagerside;
-}
+}
\ No newline at end of file
diff --git a/src/mainwindow.h b/src/mainwindow.h
index d7ea236..9321c7c 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -1,15 +1,14 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include "contentmanagerside.h"
-#include "localkiwixserver.h"
+#include <QMainWindow>
+#include <QDockWidget>
 #include "webview.h"
 #include "tabbar.h"
 #include "topwidget.h"
 #include "about.h"
-
-#include <QMainWindow>
-#include <QDockWidget>
+#include "contentmanagerside.h"
+#include "localkiwixserver.h"
 
 namespace Ui {
 class MainWindow;
diff --git a/src/opdsrequestmanager.cpp b/src/opdsrequestmanager.cpp
index 076898b..9947e7b 100644
--- a/src/opdsrequestmanager.cpp
+++ b/src/opdsrequestmanager.cpp
@@ -1,6 +1,6 @@
-#include "kiwixapp.h"
 #include "opdsrequestmanager.h"
 #include "static_content.h"
+#include "kiwixapp.h"
 
 OpdsRequestManager::OpdsRequestManager()
 : mp_reply(nullptr)
diff --git a/src/opdsrequestmanager.h b/src/opdsrequestmanager.h
index 1c1f30e..63ccd0d 100644
--- a/src/opdsrequestmanager.h
+++ b/src/opdsrequestmanager.h
@@ -1,11 +1,10 @@
 #ifndef OPDSREQUESTMANAGER_H
 #define OPDSREQUESTMANAGER_H
 
-#include <kiwix/library.h>
-#include <kiwix/manager.h>
-
 #include <QObject>
 #include <QtNetwork>
+#include <kiwix/library.h>
+#include <kiwix/manager.h>
 
 class OpdsRequestManager : public QObject
 {
@@ -30,4 +29,4 @@ public slots:
     void receiveContent();
 };
 
-#endif // OPDSREQUESTMANAGER_H
+#endif // OPDSREQUESTMANAGER_H
\ No newline at end of file
diff --git a/src/readinglistbar.cpp b/src/readinglistbar.cpp
index e05d28a..686e5bd 100644
--- a/src/readinglistbar.cpp
+++ b/src/readinglistbar.cpp
@@ -1,6 +1,6 @@
-#include "kiwixapp.h"
 #include "readinglistbar.h"
 #include "ui_readinglistbar.h"
+#include "kiwixapp.h"
 
 #include <QListWidgetItem>
 
diff --git a/src/searchbar.cpp b/src/searchbar.cpp
index 5e3bc98..f7f76e3 100644
--- a/src/searchbar.cpp
+++ b/src/searchbar.cpp
@@ -1,9 +1,9 @@
-#include "kiwixapp.h"
 #include "searchbar.h"
 
 #include <QCompleter>
 #include <QFocusEvent>
 
+#include "kiwixapp.h"
 #include "suggestionlistworker.h"
 
 SearchButton::SearchButton(QWidget *parent) :
diff --git a/src/settingsmanager.cpp b/src/settingsmanager.cpp
index dcf99ca..b9b350b 100644
--- a/src/settingsmanager.cpp
+++ b/src/settingsmanager.cpp
@@ -1,6 +1,6 @@
-#include "kiwixapp.h"
 #include "settingsmanager.h"
 #include "kiwix/tools/pathTools.h"
+#include "kiwixapp.h"
 #include <QDir>
 #include <QFileDialog>
 #include <QMessageBox>
diff --git a/src/settingsmanagerview.cpp b/src/settingsmanagerview.cpp
index 4191bac..2082c7d 100644
--- a/src/settingsmanagerview.cpp
+++ b/src/settingsmanagerview.cpp
@@ -1,5 +1,5 @@
-#include "kiwixapp.h"
 #include "settingsmanagerview.h"
+#include "kiwixapp.h"
 #include <QFile>
 
 SettingsManagerView::SettingsManagerView(QWidget *parent) : QWebEngineView(parent)
diff --git a/src/static_content.cpp b/src/static_content.cpp
index e4fde9e..3eafaa0 100644
--- a/src/static_content.cpp
+++ b/src/static_content.cpp
@@ -1,5 +1,7 @@
-#include "kiwixapp.h"
+
 #include "static_content.h"
+#include "kiwixapp.h"
+
 
 std::vector<QLocale::Language> S_LANGUAGES;
 std::vector<std::pair<QString, QString>> S_CATEGORIES;
diff --git a/src/suggestionlistworker.cpp b/src/suggestionlistworker.cpp
index 712fbd4..bf1d05d 100644
--- a/src/suggestionlistworker.cpp
+++ b/src/suggestionlistworker.cpp
@@ -1,5 +1,5 @@
-#include "kiwixapp.h"
 #include "suggestionlistworker.h"
+#include "kiwixapp.h"
 
 SuggestionListWorker::SuggestionListWorker(const QString& text, int token, QObject *parent)
 : QThread(parent),
diff --git a/src/tabbar.cpp b/src/tabbar.cpp
index cf85011..4417709 100644
--- a/src/tabbar.cpp
+++ b/src/tabbar.cpp
@@ -1,6 +1,6 @@
-#include "kiwixapp.h"
 #include "tabbar.h"
 
+#include "kiwixapp.h"
 #include <QAction>
 #include <QTimer>
 #include <QWebEnginePage>
diff --git a/src/topwidget.cpp b/src/topwidget.cpp
index 15cf868..c3945c1 100644
--- a/src/topwidget.cpp
+++ b/src/topwidget.cpp
@@ -1,6 +1,7 @@
-#include "kiwixapp.h"
 #include "topwidget.h"
+
 #include "kconstants.h"
+#include "kiwixapp.h"
 #include "mainmenu.h"
 
 #include <QMouseEvent>
diff --git a/src/webpage.cpp b/src/webpage.cpp
index 317cf52..1ff3d67 100644
--- a/src/webpage.cpp
+++ b/src/webpage.cpp
@@ -1,9 +1,9 @@
-#include "kiwixapp.h"
 #include "webpage.h"
 
 #include <QDesktopServices>
 #include <QFileDialog>
 #include <QMessageBox>
+#include "kiwixapp.h"
 #include <QWebEngineProfile>
 
 WebPage::WebPage(QObject *parent) :
diff --git a/src/webview.cpp b/src/webview.cpp
index 58acc80..73929e4 100644
--- a/src/webview.cpp
+++ b/src/webview.cpp
@@ -1,10 +1,10 @@
-#include "kiwixapp.h"
 #include "webview.h"
 
 #include <QDesktopServices>
 #include <QMenu>
 #include <QAction>
 #include <iostream>
+#include "kiwixapp.h"
 #include "webpage.h"
 #include <QToolTip>
 #include <QWebEngineSettings>
diff --git a/src/zimview.cpp b/src/zimview.cpp
index 3c8ef44..ebe7b26 100644
--- a/src/zimview.cpp
+++ b/src/zimview.cpp
@@ -1,5 +1,5 @@
-#include "kiwixapp.h"
 #include "zimview.h"
+#include "kiwixapp.h"
 #include <QAction>
 #include <QVBoxLayout>
 #include <QToolTip>