From 4d006dbabf66082ba22d4c2616a445b07c18cb5e Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 29 Aug 2015 21:34:47 +0200 Subject: [PATCH] removed not fully implemented platforms --- gui/adddownloaddialog.cpp | 24 ++++++++++++++++-------- videodownloader.pro | 14 ++++++++++++-- 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/gui/adddownloaddialog.cpp b/gui/adddownloaddialog.cpp index c0e17ef..77adbe1 100644 --- a/gui/adddownloaddialog.cpp +++ b/gui/adddownloaddialog.cpp @@ -6,7 +6,9 @@ #include "network/bitsharedownload.h" #include "network/groovesharkdownload.h" #include "network/filenukedownload.h" +#ifdef UNDER_CONSTRUCTION #include "network/spotifydownload.h" +#endif #include #include @@ -21,10 +23,13 @@ QStringList AddDownloadDialog::m_knownDownloadTypeNames = QStringList() << QStringLiteral("standard http(s)/ftp") << QStringLiteral("Youtube") << QStringLiteral("Grooveshark") - << QStringLiteral("Spotify") << QStringLiteral("Sockshare/Putlocker") << QStringLiteral("Bitshare") - << QStringLiteral("FileNuke"); + << QStringLiteral("FileNuke") +#ifdef UNDER_CONSTRUCTION + << QStringLiteral("Spotify") +#endif + ; AddDownloadDialog::AddDownloadDialog(QWidget *parent) : QDialog(parent), @@ -63,12 +68,13 @@ AddDownloadDialog::AddDownloadDialog(QWidget *parent) : } AddDownloadDialog::~AddDownloadDialog() -{ } +{} Download *AddDownloadDialog::result() const { - if(!hasValidInput()) + if(!hasValidInput()) { return nullptr; + } QString res(m_ui->urlLineEdit->text()); switch(m_downloadTypeIndex) { @@ -79,13 +85,15 @@ Download *AddDownloadDialog::result() const case 2: return new GroovesharkDownload(res); case 3: - return new SpotifyDownload(res); - case 4: return new SockshareDownload(QUrl(res)); - case 5: + case 4: return new BitshareDownload(QUrl(res)); - case 6: + case 5: return new FileNukeDownload(QUrl(res)); +#ifdef UNDER_CONSTRUCTION + case 6: + return new SpotifyDownload(res); +#endif default: return nullptr; } diff --git a/videodownloader.pro b/videodownloader.pro index 65d8fc2..b3e0227 100644 --- a/videodownloader.pro +++ b/videodownloader.pro @@ -20,6 +20,10 @@ testdownload { DEFINES += CONFIG_TESTDOWNLOAD } +underconstruction { + DEFINES += UNDER_CONSTRUCTION +} + !notrayicon { DEFINES += CONFIG_USE_TRAY_ICON usetrayiconalways { @@ -43,7 +47,6 @@ SOURCES += application/main.cpp \ network/httpdownloadwithinforequst.cpp \ network/misc/contentdispositionparser.cpp \ network/socksharedownload.cpp \ - network/spotifydownload.cpp \ network/youtubedownload.cpp \ gui/adddownloaddialog.cpp \ gui/addmultipledownloadswizard.cpp \ @@ -76,7 +79,6 @@ HEADERS += application/main.h \ network/httpdownloadwithinforequst.h \ network/misc/contentdispositionparser.h \ network/socksharedownload.h \ - network/spotifydownload.h \ network/youtubedownload.h \ gui/adddownloaddialog.h \ gui/addmultipledownloadswizard.h \ @@ -101,6 +103,14 @@ testdownload { HEADERS += network/testdownload.h } +underconstruction { +SOURCES += \ + network/spotifydownload.cpp + +HEADERS += \ + network/spotifydownload.h +} + FORMS += gui/adddownloaddialog.ui \ gui/downloadwidget.ui \ gui/setrangedialog.ui \