fix includes

Author: oltolm

src/config.cpp

@@ -25,8 +25,6 @@
 #include <QtGlobal>         // qPrintable, qWarning
 
 #include "config.h"
-#include "settings.h"   // QSettings
-#include "mainwindow.h"
 
 Config* pConfig;
 

src/main.cpp

@@ -25,7 +25,9 @@
 
 #include "config.h"     // Config, pConfig
 #include "mainwindow.h" // MainWindow ::mainWindow
+#if defined (USE_KDE)
 #include "version.h"    // APP_VERSION_MAJOR, APP_VERSION_MINOR
+#endif
 
 #if defined USE_DBUS
 	#include <QDBusConnection>

src/qtwebengine/dataprovider.cpp

@@ -25,8 +25,8 @@
 #include <QUrl>
 #include <QWebEngineUrlRequestJob>
 
-#include "../mainwindow.h" // ::mainWindow
-#include "../mimehelper.h" // MimeHelper::mimeType
+#include "mainwindow.h" // ::mainWindow
+#include "mimehelper.h" // MimeHelper::mimeType
 #include "dataprovider.h"  // DataProvider, QWebEngineUrlSchemeHandler
 #include "ebook.h"         // EBook
 #include "ebook_chm.h"     // EBook_CHM::URL_SCHEME_CHM

src/qtwebengine/viewwindow.cpp

@@ -40,12 +40,12 @@
 #include <QWebEngineScript>
 #include <QWidget>
 
-#include "../i18n.h"
+#include "i18n.h"
 
-#include "../browser-settings.hpp"  // BrowserSettings
-#include "../mainwindow.h"          // ::mainWindow
-#include "../viewwindow.h"          // ViewWindow, QWebEngineView
-#include "../viewwindowmgr.h"       // ViewWindowMgr
+#include "browser-settings.hpp"  // BrowserSettings
+#include "mainwindow.h"          // ::mainWindow
+#include "viewwindow.h"          // ViewWindow, QWebEngineView
+#include "viewwindowmgr.h"       // ViewWindowMgr
 #include "webenginepage.h"          // WebEnginePage
 
 

src/qtwebengine/viewwindowmgr.cpp

@@ -34,13 +34,13 @@
 #include <QWebEnginePage>     // QWebEnginePage::{ FindFlag, FindBackward, FindCaseSensitively }
 #include <QWidget>
 
-#include "../i18n.h"
+#include "i18n.h"
 
-#include "../config.h"        // ::pConfig
-#include "../mainwindow.h"    // MainWindow, ::mainWindow
-#include "../settings.h"      // Settings
-#include "../viewwindow.h"    // ViewWindow
-#include "../viewwindowmgr.h"
+#include "config.h"        // ::pConfig
+#include "mainwindow.h"    // MainWindow, ::mainWindow
+#include "settings.h"      // Settings
+#include "viewwindow.h"    // ViewWindow
+#include "viewwindowmgr.h"
 
 
 // A small overriden class to handle a middle click

src/qtwebkit/dataprovider.cpp

@@ -24,9 +24,9 @@
 #include <QtGlobal>        // qint64, qPrintable, qDebug, qWarning
 #include <QUrl>
 
-#include "../config.h"     // ::pConfig
-#include "../mainwindow.h" // ::mainWindow
-#include "../mimehelper.h" // MimeHelper::mimeType
+#include "config.h"     // ::pConfig
+#include "mainwindow.h" // ::mainWindow
+#include "mimehelper.h" // MimeHelper::mimeType
 #include "dataprovider.h"
 
 

src/qtwebkit/viewwindow.cpp

@@ -35,12 +35,12 @@
 #include <QWebSettings>
 #include <QWidget>
 
-#include "../i18n.h"
+#include "i18n.h"
 
-#include "../browser-settings.hpp"  // BrowserSettings
-#include "../mainwindow.h"          // ::mainWindow
-#include "../viewwindow.h"          // ViewWindow, QWebView
-#include "../viewwindowmgr.h"       // ViewWindowMgr
+#include "browser-settings.hpp"  // BrowserSettings
+#include "mainwindow.h"          // ::mainWindow
+#include "viewwindow.h"
+#include "viewwindowmgr.h"       // ViewWindowMgr
 #include "dataprovider.h"           // KCHMNetworkAccessManager