fixed includes

application/main.cpp

@@ -1,5 +1,5 @@
-#include "cli/mainfeatures.h"
-#include "gui/initiate.h"
+#include "../cli/mainfeatures.h"
+#include "../gui/initiate.h"
 
 #if defined(GUI_QTWIDGETS) || defined(GUI_QTQUICK)
 # include <qtutilities/resources/qtconfigarguments.h>
@@ -8,6 +8,7 @@
 #endif
 
 #include <c++utilities/application/failure.h>
+#include <c++utilities/application/commandlineutils.h>
 #include <qtutilities/resources/resources.h>
 
 #include <QCoreApplication>
@@ -40,6 +41,7 @@ int main(int argc, char *argv[])
     try {
         parser.parseArgs(argc, argv);
     } catch (Failure &ex) {
+        CMD_UTILS_START_CONSOLE;
         cout << "Unable to parse arguments. " << ex.what() << "\nSee --help for available commands." << endl;
     }
     // set meta info for application

application/utils.cpp

@@ -1,4 +1,4 @@
-#include "utils.h"
+#include "./utils.h"
 
 #include <QString>
 #include <QTextDocument>

cli/clidownloadinteraction.cpp

@@ -1,7 +1,7 @@
-#include "clidownloadinteraction.h"
+#include "./clidownloadinteraction.h"
 
-#include "network/download.h"
-#include "network/permissionstatus.h"
+#include "../network/download.h"
+#include "../network/permissionstatus.h"
 
 #include <c++utilities/application/commandlineutils.h>
 

cli/mainfeatures.cpp

@@ -1,9 +1,9 @@
-#include "mainfeatures.h"
+#include "./mainfeatures.h"
 
-#include "network/download.h"
-#include "network/httpdownload.h"
-#include "network/youtubedownload.h"
-#include "network/groovesharkdownload.h"
+#include "../network/download.h"
+#include "../network/httpdownload.h"
+#include "../network/youtubedownload.h"
+#include "../network/groovesharkdownload.h"
 
 #include <c++utilities/conversion/stringconversion.h>
 #include <c++utilities/application/argumentparser.h>
@@ -23,6 +23,7 @@ namespace Cli {
 
 void download(int argc, char *argv[], const StringVector &parameterValues, const Argument &noConfirmArg)
 {
+    CMD_UTILS_START_CONSOLE;
     // init Qt
     QCoreApplication app(argc, argv);
     QObject rootObj;

gui/adddownloaddialog.cpp

@@ -1,15 +1,16 @@
-#include "adddownloaddialog.h"
-#include "ui_adddownloaddialog.h"
+#include "./adddownloaddialog.h"
 
-#include "network/youtubedownload.h"
-#include "network/socksharedownload.h"
-#include "network/bitsharedownload.h"
-#include "network/groovesharkdownload.h"
-#include "network/filenukedownload.h"
+#include "../network/youtubedownload.h"
+#include "../network/socksharedownload.h"
+#include "../network/bitsharedownload.h"
+#include "../network/groovesharkdownload.h"
+#include "../network/filenukedownload.h"
 #ifdef UNDER_CONSTRUCTION
-#include "network/spotifydownload.h"
+#include "../network/spotifydownload.h"
 #endif
 
+#include "gui/ui_adddownloaddialog.h"
+
 #include <QInputDialog>
 #include <QSettings>
 #include <QClipboard>

gui/addmultipledownloadswizard.cpp

@@ -1,14 +1,14 @@
-#include "addmultipledownloadswizard.h"
-#include "downloadinteraction.h"
-#include "settings.h"
+#include "./addmultipledownloadswizard.h"
+#include "./downloadinteraction.h"
+#include "./settings.h"
 
-#include "network/download.h"
-#include "network/finder/downloadfinder.h"
-#include "network/finder/linkfinder.h"
-#include "network/finder/youtubeplaylist.h"
-#include "network/finder/groovesharksearcher.h"
+#include "../network/download.h"
+#include "../network/finder/downloadfinder.h"
+#include "../network/finder/linkfinder.h"
+#include "../network/finder/youtubeplaylist.h"
+#include "../network/finder/groovesharksearcher.h"
 
-#include "model/downloadfinderresultsmodel.h"
+#include "../model/downloadfinderresultsmodel.h"
 
 #include <qtutilities/widgets/clearlineedit.h>
 

gui/downloadinteraction.cpp

@@ -1,8 +1,8 @@
-#include "downloadinteraction.h"
-#include "settings.h"
+#include "./downloadinteraction.h"
+#include "./settings.h"
 
-#include "network/download.h"
-#include "network/permissionstatus.h"
+#include "../network/download.h"
+#include "../network/permissionstatus.h"
 
 #include <qtutilities/enterpassworddialog/enterpassworddialog.h>
 

gui/downloadwidget.cpp

@@ -1,5 +1,6 @@
-#include "downloadwidget.h"
-#include "ui_downloadwidget.h"
+#include "./downloadwidget.h"
+
+#include "gui/ui_downloadwidget.h"
 
 #include <QPaintEvent>
 #include <QMouseEvent>

gui/initiate.cpp

@@ -1,6 +1,6 @@
-#include "initiate.h"
-#include "settings.h"
-#include "mainwindow.h"
+#include "./initiate.h"
+#include "./settings.h"
+#include "./mainwindow.h"
 
 #include <qtutilities/resources/qtconfigarguments.h>
 #include <qtutilities/resources/resources.h>
@@ -32,6 +32,7 @@ int runWidgetsGui(int argc, char *argv[], const QtConfigArguments &qtConfigArgs)
     QtGui::saveSettings();
     return r;
 #else
+    CMD_UTILS_START_CONSOLE;
     cout << "Application has not been build with Qt widgets GUI support." << endl;
     return 0;
 #endif

gui/mainwindow.cpp

@@ -1,24 +1,25 @@
-#include "mainwindow.h"
-#include "ui_mainwindow.h"
-#include "downloadinteraction.h"
-#include "setrangedialog.h"
-#include "adddownloaddialog.h"
-#include "addmultipledownloadswizard.h"
-#include "settings.h"
+#include "./mainwindow.h"
+#include "./downloadinteraction.h"
+#include "./setrangedialog.h"
+#include "./adddownloaddialog.h"
+#include "./addmultipledownloadswizard.h"
+#include "./settings.h"
 
-#include "network/download.h"
-#include "network/youtubedownload.h"
-#include "network/socksharedownload.h"
-#include "network/groovesharkdownload.h"
-#include "network/bitsharedownload.h"
+#include "../network/download.h"
+#include "../network/youtubedownload.h"
+#include "../network/socksharedownload.h"
+#include "../network/groovesharkdownload.h"
+#include "../network/bitsharedownload.h"
 #ifdef CONFIG_TESTDOWNLOAD
-#include "network/testdownload.h"
+#include "../network/testdownload.h"
 #endif
 
-#include "model/downloadmodel.h"
+#include "../model/downloadmodel.h"
 
-#include "itemdelegates/progressbaritemdelegate.h"
-#include "itemdelegates/comboboxitemdelegate.h"
+#include "../itemdelegates/progressbaritemdelegate.h"
+#include "../itemdelegates/comboboxitemdelegate.h"
+
+#include "gui/ui_mainwindow.h"
 
 #include <qtutilities/aboutdialog/aboutdialog.h>
 #include <qtutilities/enterpassworddialog/enterpassworddialog.h>

gui/setrangedialog.cpp

@@ -1,7 +1,8 @@
-#include "setrangedialog.h"
-#include "ui_setrangedialog.h"
+#include "./setrangedialog.h"
 
-#include "network/downloadrange.h"
+#include "../network/downloadrange.h"
+
+#include "gui/ui_setrangedialog.h"
 
 #include <QMessageBox>
 

gui/settings.cpp

@@ -1,7 +1,7 @@
-#include "settings.h"
+#include "./settings.h"
 
-#include "network/download.h"
-#include "network/groovesharkdownload.h"
+#include "../network/download.h"
+#include "../network/groovesharkdownload.h"
 
 #include <qtutilities/settingsdialog/optioncategory.h>
 #include <qtutilities/settingsdialog/optioncategorymodel.h>

gui/settings.h

@@ -2,9 +2,9 @@
 #define SETTINGSDIALOG_H
 
 // is not required here when building with GCC 4.9.1 or Clan 3.5 - MinGW 4.9.1 fails without including UI headers here
-#include "ui_targetpage.h"
-#include "ui_proxypage.h"
-#include "ui_useragentpage.h"
+#include "gui/ui_targetpage.h"
+#include "gui/ui_proxypage.h"
+#include "gui/ui_useragentpage.h"
 
 #include <qtutilities/settingsdialog/settingsdialog.h>
 #include <qtutilities/settingsdialog/optionpage.h>

itemdelegates/comboboxitemdelegate.cpp

@@ -1,4 +1,4 @@
-#include "comboboxitemdelegate.h"
+#include "./comboboxitemdelegate.h"
 
 #include "../model/downloadmodel.h"
 

itemdelegates/progressbaritemdelegate.cpp

@@ -1,6 +1,7 @@
-#include "progressbaritemdelegate.h"
+#include "./progressbaritemdelegate.h"
 
 #include "../network/download.h"
+
 #include "../model/downloadmodel.h"
 
 #include <QApplication>

model/downloadfinderresultsmodel.cpp

@@ -1,7 +1,7 @@
-#include "downloadfinderresultsmodel.h"
+#include "./downloadfinderresultsmodel.h"
 
-#include "network/finder/downloadfinder.h"
-#include "network/download.h"
+#include "../network/finder/downloadfinder.h"
+#include "../network/download.h"
 
 #include <functional>
 

model/downloadmodel.cpp

@@ -1,5 +1,6 @@
-#include "downloadmodel.h"
-#include "network/download.h"
+#include "./downloadmodel.h"
+
+#include "../network/download.h"
 
 #include <c++utilities/conversion/stringconversion.h>
 

network/bitsharedownload.cpp

@@ -1,4 +1,5 @@
-#include "bitsharedownload.h"
+#include "./bitsharedownload.h"
+
 #include "../application/utils.h"
 
 #include <QUrlQuery>

network/bitsharedownload.h

@@ -1,7 +1,7 @@
 #ifndef BITSHAREDOWNLOAD_H
 #define BITSHAREDOWNLOAD_H
 
-#include "httpdownloadwithinforequst.h"
+#include "./httpdownloadwithinforequst.h"
 
 namespace Network {
 

network/download.cpp

@@ -1,10 +1,10 @@
-#include "download.h"
-#include "permissionstatus.h"
+#include "./download.h"
+#include "./permissionstatus.h"
 // these includes are only needed to provide the Download::fromUrl method
-#include "httpdownload.h"
-#include "youtubedownload.h"
-#include "socksharedownload.h"
-#include "bitsharedownload.h"
+#include "./httpdownload.h"
+#include "./youtubedownload.h"
+#include "./socksharedownload.h"
+#include "./bitsharedownload.h"
 
 #include <c++utilities/io/path.h>
 #include <c++utilities/misc/random.h>

network/download.h

@@ -1,8 +1,8 @@
 #ifndef DOWNLOAD_H
 #define DOWNLOAD_H
 
-#include "downloadrange.h"
-#include "optiondata.h"
+#include "./downloadrange.h"
+#include "./optiondata.h"
 
 #include <c++utilities/chrono/timespan.h>
 

network/downloadrange.cpp

@@ -1,4 +1,4 @@
-#include "downloadrange.h"
+#include "./downloadrange.h"
 
 namespace Network {
 

network/filenukedownload.cpp

@@ -1,4 +1,5 @@
-#include "filenukedownload.h"
+#include "./filenukedownload.h"
+
 #include "../application/utils.h"
 
 #include <QUrlQuery>

network/filenukedownload.h

@@ -1,7 +1,7 @@
 #ifndef FILENUKE_DOWNLOAD_H
 #define FILENUKE_DOWNLOAD_H
 
-#include "httpdownloadwithinforequst.h"
+#include "./httpdownloadwithinforequst.h"
 
 namespace Network {
 

network/finder/downloadfinder.cpp

@@ -1,4 +1,4 @@
-#include "downloadfinder.h"
+#include "./downloadfinder.h"
 
 #include "../download.h"
 

network/finder/groovesharksearcher.cpp

@@ -1,4 +1,4 @@
-#include "groovesharksearcher.h"
+#include "./groovesharksearcher.h"
 
 #include "../groovesharkdownload.h"
 

network/finder/groovesharksearcher.h

@@ -1,7 +1,7 @@
 #ifndef GROOVESHARKALBUM_H
 #define GROOVESHARKALBUM_H
 
-#include "downloadfinder.h"
+#include "./downloadfinder.h"
 
 #include <QStringList>
 

network/finder/linkfinder.cpp

@@ -1,6 +1,7 @@
-#include "linkfinder.h"
+#include "./linkfinder.h"
 
 #include "../httpdownload.h"
+
 #include "../../application/utils.h"
 
 #include <QRegExp>

network/finder/linkfinder.h

@@ -1,7 +1,7 @@
 #ifndef LINKFINDER_H
 #define LINKFINDER_H
 
-#include "downloadfinder.h"
+#include "./downloadfinder.h"
 
 #include <QUrl>
 

network/finder/youtubeplaylist.cpp

@@ -1,4 +1,4 @@
-#include "youtubeplaylist.h"
+#include "./youtubeplaylist.h"
 
 #include "../httpdownload.h"
 #include "../youtubedownload.h"

network/finder/youtubeplaylist.h

@@ -1,7 +1,7 @@
 #ifndef YOUTUBEPLAYLIST_H
 #define YOUTUBEPLAYLIST_H
 
-#include "downloadfinder.h"
+#include "./downloadfinder.h"
 
 namespace Network {
 

network/groovesharkdownload.cpp

@@ -1,4 +1,5 @@
-#include "groovesharkdownload.h"
+#include "./groovesharkdownload.h"
+
 #include "../application/utils.h"
 
 #include <QUrlQuery>

network/groovesharkdownload.h

@@ -1,7 +1,7 @@
 #ifndef GROOVESHARKDOWNLOAD_H
 #define GROOVESHARKDOWNLOAD_H
 
-#include "httpdownloadwithinforequst.h"
+#include "./httpdownloadwithinforequst.h"
 
 namespace Network {
 

network/httpdownload.cpp

@@ -1,5 +1,6 @@
-#include "httpdownload.h"
-#include "misc/contentdispositionparser.h"
+#include "./httpdownload.h"
+
+#include "./misc/contentdispositionparser.h"
 
 #include <QFileInfo>
 

network/httpdownload.h

@@ -1,7 +1,7 @@
 #ifndef HTTPDOWNLOAD_H
 #define HTTPDOWNLOAD_H
 
-#include "download.h"
+#include "./download.h"
 
 #include <QNetworkAccessManager>
 #include <QEventLoop>

network/httpdownloadwithinforequst.cpp

@@ -1,5 +1,5 @@
-#include "httpdownloadwithinforequst.h"
-#include "permissionstatus.h"
+#include "./httpdownloadwithinforequst.h"
+#include "./permissionstatus.h"
 
 namespace Network {
 

network/httpdownloadwithinforequst.h

@@ -1,7 +1,7 @@
 #ifndef HTTPDOWNLOADWITHINFOREQUST_H
 #define HTTPDOWNLOADWITHINFOREQUST_H
 
-#include "httpdownload.h"
+#include "./httpdownload.h"
 
 #include <QBuffer>
 #include <QList>

network/misc/contentdispositionparser.cpp

@@ -1,4 +1,4 @@
-#include "contentdispositionparser.h"
+#include "./contentdispositionparser.h"
 
 namespace Network {
 

network/optiondata.cpp

@@ -1,5 +1,5 @@
-#include "optiondata.h"
-#include "permissionstatus.h"
+#include "./optiondata.h"
+#include "./permissionstatus.h"
 
 #include <QIODevice>
 

network/optiondata.h

@@ -1,7 +1,7 @@
 #ifndef NETWORK_OPTIONDATA_H
 #define NETWORK_OPTIONDATA_H
 
-#include "authenticationcredentials.h"
+#include "./authenticationcredentials.h"
 
 #include <QString>
 #include <QUrl>

network/socksharedownload.cpp

@@ -1,4 +1,5 @@
-#include "socksharedownload.h"
+#include "./socksharedownload.h"
+
 #include "../application/utils.h"
 
 #include <QUrlQuery>

network/socksharedownload.h

@@ -1,7 +1,7 @@
 #ifndef SOCKSHAREDOWNLOAD_H
 #define SOCKSHAREDOWNLOAD_H
 
-#include "httpdownloadwithinforequst.h"
+#include "./httpdownloadwithinforequst.h"
 
 namespace Network {
 

network/spotifydownload.cpp

@@ -1,4 +1,5 @@
-#include "spotifydownload.h"
+#include "./spotifydownload.h"
+
 #include "../application/utils.h"
 
 #include <QUrlQuery>

network/spotifydownload.h

@@ -1,7 +1,7 @@
 #ifndef SPOTIFYDOWNLOAD_H
 #define SPOTIFYDOWNLOAD_H
 
-#include "httpdownloadwithinforequst.h"
+#include "./httpdownloadwithinforequst.h"
 
 namespace Network {
 

network/testdownload.cpp

@@ -1,4 +1,4 @@
-#include "testdownload.h"
+#include "./testdownload.h"
 
 namespace Network {
 

network/testdownload.h

@@ -1,7 +1,7 @@
 #ifndef TESTDOWNLOAD_H
 #define TESTDOWNLOAD_H
 
-#include "download.h"
+#include "./download.h"
 
 #include <QTimer>
 

network/youtubedownload.cpp

@@ -1,4 +1,5 @@
-#include "youtubedownload.h"
+#include "./youtubedownload.h"
+
 #include "../application/utils.h"
 
 #include <QUrlQuery>

network/youtubedownload.h

@@ -1,7 +1,7 @@
 #ifndef YOUTUBEDOWNLOAD_H
 #define YOUTUBEDOWNLOAD_H
 
-#include "httpdownloadwithinforequst.h"
+#include "./httpdownloadwithinforequst.h"
 
 #include <QStringList>
 #include <QHash>