Martchus
/
videodownloader
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed includes

This commit is contained in:
Martchus 2015-09-08 17:05:59 +02:00
parent 8960d5be53
commit 14ed11470f
48 changed files with 127 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
application/main.cpp
View File

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

2
application/utils.cpp
View File

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

6
cli/clidownloadinteraction.cpp
View File

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

11
cli/mainfeatures.cpp
View File

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

17
gui/adddownloaddialog.cpp
View File

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

18
gui/addmultipledownloadswizard.cpp
View File

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

8
gui/downloadinteraction.cpp
View File

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

5
gui/downloadwidget.cpp
View File

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

7
gui/initiate.cpp
View File

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

33
gui/mainwindow.cpp
View File

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

7
gui/setrangedialog.cpp
View File

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

6
gui/settings.cpp
View File

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

6
gui/settings.h
View File

@ -2,9 +2,9 @@
#define SETTINGSDIALOG_H #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 // 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 "gui/ui_targetpage.h"
#include "ui_proxypage.h" #include "gui/ui_proxypage.h"
#include "ui_useragentpage.h" #include "gui/ui_useragentpage.h"
#include <qtutilities/settingsdialog/settingsdialog.h> #include <qtutilities/settingsdialog/settingsdialog.h>
#include <qtutilities/settingsdialog/optionpage.h> #include <qtutilities/settingsdialog/optionpage.h>

2
itemdelegates/comboboxitemdelegate.cpp
View File

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

3
itemdelegates/progressbaritemdelegate.cpp
View File

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

6
model/downloadfinderresultsmodel.cpp
View File

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

5
model/downloadmodel.cpp
View File

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

3
network/bitsharedownload.cpp
View File

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

2
network/bitsharedownload.h
View File

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

12
network/download.cpp
View File

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

4
network/download.h
View File

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

2
network/downloadrange.cpp
View File

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

3
network/filenukedownload.cpp
View File

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

2
network/filenukedownload.h
View File

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

2
network/finder/downloadfinder.cpp
View File

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

2
network/finder/groovesharksearcher.cpp
View File

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

2
network/finder/groovesharksearcher.h
View File

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

3
network/finder/linkfinder.cpp
View File

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

2
network/finder/linkfinder.h
View File

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

2
network/finder/youtubeplaylist.cpp
View File

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

2
network/finder/youtubeplaylist.h
View File

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

3
network/groovesharkdownload.cpp
View File

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

2
network/groovesharkdownload.h
View File

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

5
network/httpdownload.cpp
View File

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

2
network/httpdownload.h
View File

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

4
network/httpdownloadwithinforequst.cpp
View File

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

2
network/httpdownloadwithinforequst.h
View File

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

2
network/misc/contentdispositionparser.cpp
View File

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

4
network/optiondata.cpp
View File

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

2
network/optiondata.h
View File

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

3
network/socksharedownload.cpp
View File

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

2
network/socksharedownload.h
View File

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

3
network/spotifydownload.cpp
View File

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

2
network/spotifydownload.h
View File

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

2
network/testdownload.cpp
View File

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

2
network/testdownload.h
View File

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

3
network/youtubedownload.cpp
View File

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

2
network/youtubedownload.h
View File

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