Revert "Reorder include to avoid header conflict beetween Xapiand and Qt (#616)"

This reverts commit 56bb1a219c91279e10dabff7fc67b21c9cc0e05a.

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)

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>

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

src/contentmanagerside.cpp

@@ -1,6 +1,6 @@
-#include "kiwixapp.h"
 #include "contentmanagerside.h"
 #include "ui_contentmanagerside.h"
+#include "kiwixapp.h"
 
 #include <QLocale>
 

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;

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)

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}");
-}
+}

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);
     }
-}
+}

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();
-}
+}

src/kprofile.cpp

@@ -1,5 +1,6 @@
-#include "kiwixapp.h"
 #include "kprofile.h"
+
+#include "kiwixapp.h"
 #include <QFileDialog>
 #include <QMessageBox>
 #include <QWebEngineSettings>

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>

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));

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;
-}
+}

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;

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)

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

src/readinglistbar.cpp

@@ -1,6 +1,6 @@
-#include "kiwixapp.h"
 #include "readinglistbar.h"
 #include "ui_readinglistbar.h"
+#include "kiwixapp.h"
 
 #include <QListWidgetItem>
 

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) :

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>

src/settingsmanagerview.cpp

@@ -1,5 +1,5 @@
-#include "kiwixapp.h"
 #include "settingsmanagerview.h"
+#include "kiwixapp.h"
 #include <QFile>
 
 SettingsManagerView::SettingsManagerView(QWidget *parent) : QWebEngineView(parent)

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;

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),

src/tabbar.cpp

@@ -1,6 +1,6 @@
-#include "kiwixapp.h"
 #include "tabbar.h"
 
+#include "kiwixapp.h"
 #include <QAction>
 #include <QTimer>
 #include <QWebEnginePage>

src/topwidget.cpp

@@ -1,6 +1,7 @@
-#include "kiwixapp.h"
 #include "topwidget.h"
+
 #include "kconstants.h"
+#include "kiwixapp.h"
 #include "mainmenu.h"
 
 #include <QMouseEvent>

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) :

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>

src/zimview.cpp

@@ -1,5 +1,5 @@
-#include "kiwixapp.h"
 #include "zimview.h"
+#include "kiwixapp.h"
 #include <QAction>
 #include <QVBoxLayout>
 #include <QToolTip>