From 4896084e20c3a95a3ce930f08ff951ca28aca78d Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 20 Jul 2019 20:20:58 +0200 Subject: [PATCH] Apply clang-format --- application/utils.cpp | 2 +- application/utils.h | 2 +- cli/clidownloadinteraction.cpp | 2 +- cli/clidownloadinteraction.h | 2 +- cli/mainfeatures.cpp | 4 ++-- cli/mainfeatures.h | 2 +- gui/adddownloaddialog.cpp | 2 +- gui/adddownloaddialog.h | 2 +- gui/addmultipledownloadswizard.cpp | 2 +- gui/addmultipledownloadswizard.h | 4 ++-- gui/downloadinteraction.cpp | 5 +++-- gui/downloadinteraction.h | 2 +- gui/downloadwidget.cpp | 4 ++-- gui/downloadwidget.h | 2 +- gui/initiate.cpp | 2 +- gui/mainwindow.cpp | 7 ++++--- gui/mainwindow.h | 2 +- gui/setrangedialog.cpp | 2 +- gui/setrangedialog.h | 2 +- gui/settings.cpp | 8 ++++---- gui/settings.h | 2 +- itemdelegates/comboboxitemdelegate.cpp | 2 +- itemdelegates/progressbaritemdelegate.cpp | 2 +- model/downloadfinderresultsmodel.cpp | 2 +- model/downloadfinderresultsmodel.h | 4 ++-- model/downloadmodel.cpp | 2 +- model/downloadmodel.h | 2 +- network/authenticationcredentials.h | 8 ++++---- network/bitsharedownload.cpp | 2 +- network/bitsharedownload.h | 2 +- network/download.cpp | 2 +- network/download.h | 2 +- network/downloadrange.cpp | 2 +- network/downloadrange.h | 2 +- network/filenukedownload.cpp | 2 +- network/filenukedownload.h | 2 +- network/finder/downloadfinder.cpp | 2 +- network/finder/downloadfinder.h | 2 +- network/finder/groovesharksearcher.cpp | 2 +- network/finder/groovesharksearcher.h | 2 +- network/finder/linkfinder.cpp | 2 +- network/finder/linkfinder.h | 2 +- network/finder/youtubeplaylist.cpp | 2 +- network/finder/youtubeplaylist.h | 2 +- network/groovesharkdownload.cpp | 2 +- network/groovesharkdownload.h | 2 +- network/httpdownload.cpp | 2 +- network/httpdownload.h | 4 ++-- network/httpdownloadwithinforequst.cpp | 2 +- network/httpdownloadwithinforequst.h | 2 +- network/misc/contentdispositionparser.cpp | 2 +- network/misc/contentdispositionparser.h | 2 +- network/permissionstatus.h | 2 +- network/socksharedownload.cpp | 2 +- network/socksharedownload.h | 2 +- network/spotifydownload.cpp | 2 +- network/spotifydownload.h | 2 +- network/testdownload.cpp | 2 +- network/testdownload.h | 2 +- network/vimeodownload.cpp | 2 +- network/youtubedownload.cpp | 2 +- network/youtubedownload.h | 2 +- 62 files changed, 78 insertions(+), 76 deletions(-) diff --git a/application/utils.cpp b/application/utils.cpp index 03c14c5..3c47bfb 100644 --- a/application/utils.cpp +++ b/application/utils.cpp @@ -70,4 +70,4 @@ QJsonObject loadJsonObjectFromResource(const QString &resource, QString *error) return QJsonObject(); } -} +} // namespace Application diff --git a/application/utils.h b/application/utils.h index a949e11..0a59169 100644 --- a/application/utils.h +++ b/application/utils.h @@ -8,6 +8,6 @@ namespace Application { int substring(const QString &source, QString &target, int startIndex, const QString &startStr, const QString &endStr); void replaceHtmlEntities(QString &text); QJsonObject loadJsonObjectFromResource(const QString &resource, QString *error = nullptr); -} +} // namespace Application #endif // STATIC_H diff --git a/cli/clidownloadinteraction.cpp b/cli/clidownloadinteraction.cpp index d873480..9f942b9 100644 --- a/cli/clidownloadinteraction.cpp +++ b/cli/clidownloadinteraction.cpp @@ -82,4 +82,4 @@ void CliDownloadInteraction::downloadHasSslErrors(Download *download, size_t opt // TODO } } -} +} // namespace Cli diff --git a/cli/clidownloadinteraction.h b/cli/clidownloadinteraction.h index cb3e9aa..048e6b4 100644 --- a/cli/clidownloadinteraction.h +++ b/cli/clidownloadinteraction.h @@ -32,6 +32,6 @@ private slots: void downloadRequiresAuthentication(Network::Download *download, size_t optionIndex, const QString &realm); void downloadHasSslErrors(Network::Download *download, size_t optionIndex, const QList &sslErrors); }; -} +} // namespace Cli #endif // CLI_DOWNLOADINTERACTION_H diff --git a/cli/mainfeatures.cpp b/cli/mainfeatures.cpp index 79febd3..bbb135a 100644 --- a/cli/mainfeatures.cpp +++ b/cli/mainfeatures.cpp @@ -35,7 +35,7 @@ void download(int argc, char *argv[], const ArgumentOccurrence &, const Argument size_t specifiedDownloads = 0; for (const auto &val : urlsArg.values()) { // check whether value denotes target directory or download type - auto parts = splitString >(val, "=", EmptyPartsTreat::Keep, 2); + auto parts = splitString>(val, "=", EmptyPartsTreat::Keep, 2); if (parts.size() >= 2) { if (parts.front() == "type") { // value denotes download type @@ -116,4 +116,4 @@ void download(int argc, char *argv[], const ArgumentOccurrence &, const Argument cout << "TODO" << endl; } } -} +} // namespace Cli diff --git a/cli/mainfeatures.h b/cli/mainfeatures.h index ff3cd50..f339366 100644 --- a/cli/mainfeatures.h +++ b/cli/mainfeatures.h @@ -6,7 +6,7 @@ namespace CppUtilities { class Argument; class ArgumentOccurrence; -} +} // namespace CppUtilities namespace Cli { diff --git a/gui/adddownloaddialog.cpp b/gui/adddownloaddialog.cpp index 3577565..ceffd56 100644 --- a/gui/adddownloaddialog.cpp +++ b/gui/adddownloaddialog.cpp @@ -236,4 +236,4 @@ void AddDownloadDialog::setLastUrl() settings.setValue("lasturl", m_lastUrl); settings.endGroup(); } -} +} // namespace QtGui diff --git a/gui/adddownloaddialog.h b/gui/adddownloaddialog.h index f0860e6..50c7ca2 100644 --- a/gui/adddownloaddialog.h +++ b/gui/adddownloaddialog.h @@ -47,6 +47,6 @@ private: QInputDialog *m_selectDownloadTypeInputDialog; QString m_lastUrl; }; -} +} // namespace QtGui #endif // ADDDOWNLOADDIALOG_H diff --git a/gui/addmultipledownloadswizard.cpp b/gui/addmultipledownloadswizard.cpp index 4acc344..c607988 100644 --- a/gui/addmultipledownloadswizard.cpp +++ b/gui/addmultipledownloadswizard.cpp @@ -402,4 +402,4 @@ QList AddMultipleDownloadsWizard::results() const { return qobject_cast(page(AddMultipleDownloadsResultsPageId))->results(); } -} +} // namespace QtGui diff --git a/gui/addmultipledownloadswizard.h b/gui/addmultipledownloadswizard.h index 5fe97c4..f4e81c5 100644 --- a/gui/addmultipledownloadswizard.h +++ b/gui/addmultipledownloadswizard.h @@ -16,7 +16,7 @@ class ClearLineEdit; namespace Network { class Download; class DownloadFinder; -} +} // namespace Network namespace QtGui { @@ -111,6 +111,6 @@ public: DownloadSource source() const; QList results() const; }; -} +} // namespace QtGui #endif // ADDMULTIPLEDOWNLOADSWIZARD_H diff --git a/gui/downloadinteraction.cpp b/gui/downloadinteraction.cpp index 9f10303..aac7b8d 100644 --- a/gui/downloadinteraction.cpp +++ b/gui/downloadinteraction.cpp @@ -164,7 +164,8 @@ void DownloadInteraction::downloadRequiresRedirectionPermission(Download *downlo const QUrl &newUrl = download->downloadUrl(optionIndex); QString message = tr( "

Do you want to redirect form %1 to %2?

The redirection URL will be added to the options so you can it select " - "later, too.

").arg(originalUrl.toString(), newUrl.toString()); + "later, too.

") + .arg(originalUrl.toString(), newUrl.toString()); QMessageBox *dlg = new QMessageBox(m_parentWidget); dlg->setModal(false); dlg->setTextFormat(Qt::RichText); @@ -246,4 +247,4 @@ void DownloadInteraction::downloadHasSslErrors(Download *download, size_t option connect(download, &Download::destroyed, dlg, &QMessageBox::deleteLater); dlg->show(); } -} +} // namespace QtGui diff --git a/gui/downloadinteraction.h b/gui/downloadinteraction.h index ab1fb45..ba34298 100644 --- a/gui/downloadinteraction.h +++ b/gui/downloadinteraction.h @@ -35,6 +35,6 @@ private slots: private: QWidget *m_parentWidget; }; -} +} // namespace QtGui #endif // DOWNLOADINTERACTION_H diff --git a/gui/downloadwidget.cpp b/gui/downloadwidget.cpp index 22c1f80..de2aa8c 100644 --- a/gui/downloadwidget.cpp +++ b/gui/downloadwidget.cpp @@ -5,8 +5,8 @@ #include #include #include -#include #include +#include namespace QtGui { @@ -29,4 +29,4 @@ void DownloadWidget::paintEvent(QPaintEvent *) option.backgroundColor = palette().color(QPalette::Highlight); painter.drawPrimitive(QStyle::PE_FrameFocusRect, option); } -} +} // namespace QtGui diff --git a/gui/downloadwidget.h b/gui/downloadwidget.h index 69cdcc3..0b08348 100644 --- a/gui/downloadwidget.h +++ b/gui/downloadwidget.h @@ -23,6 +23,6 @@ private: std::unique_ptr m_ui; }; -} +} // namespace QtGui #endif // DOWNLOADWIDGET_H diff --git a/gui/initiate.cpp b/gui/initiate.cpp index 3835592..8671f22 100644 --- a/gui/initiate.cpp +++ b/gui/initiate.cpp @@ -43,4 +43,4 @@ int runWidgetsGui(int argc, char *argv[], const QtConfigArguments &qtConfigArgs) return 0; #endif } -} +} // namespace QtGui diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp index 5965204..46dd570 100644 --- a/gui/mainwindow.cpp +++ b/gui/mainwindow.cpp @@ -295,8 +295,9 @@ void MainWindow::settingsAccepted() void MainWindow::showTrayIconMessage() { - m_trayIcon->showMessage(windowTitle(), tr("The downloader will keep running in the system tray. To terminate the program, " - "choose \"Quit\" in the context menu of the system tray entry.")); + m_trayIcon->showMessage(windowTitle(), + tr("The downloader will keep running in the system tray. To terminate the program, " + "choose \"Quit\" in the context menu of the system tray entry.")); } void MainWindow::checkForDownloadsToStartAutomatically() @@ -921,4 +922,4 @@ void MainWindow::setupTrayIcon() #endif #endif } -} +} // namespace QtGui diff --git a/gui/mainwindow.h b/gui/mainwindow.h index 8ef1421..aa75091 100644 --- a/gui/mainwindow.h +++ b/gui/mainwindow.h @@ -119,6 +119,6 @@ private: SettingsDialog *m_settingsDlg; QtUtilities::AboutDialog *m_aboutDlg; }; -} +} // namespace QtGui #endif // MAINWINDOW_H diff --git a/gui/setrangedialog.cpp b/gui/setrangedialog.cpp index 0c9f5d7..4927550 100644 --- a/gui/setrangedialog.cpp +++ b/gui/setrangedialog.cpp @@ -46,4 +46,4 @@ void SetRangeDialog::confirm() QMessageBox::warning(this, this->windowTitle(), tr("Values are invalid.")); } } -} +} // namespace QtGui diff --git a/gui/setrangedialog.h b/gui/setrangedialog.h index 9502ede..64fea07 100644 --- a/gui/setrangedialog.h +++ b/gui/setrangedialog.h @@ -29,6 +29,6 @@ private: std::unique_ptr m_ui; Network::DownloadRange &m_range; }; -} +} // namespace QtGui #endif // SETRANGEDIALOG_H diff --git a/gui/settings.cpp b/gui/settings.cpp index d99f95c..66e3d34 100644 --- a/gui/settings.cpp +++ b/gui/settings.cpp @@ -481,9 +481,9 @@ void restoreSettings() UiPage::multiSelection() = settings.value("multiselection").toBool(); // load grooveshark authentication file - const auto errorMsg = QApplication::translate( - "QtGui::Settings", "Unable to read Grooveshark authentication information file.\n\nReason: %1\n\nThe values stored in this file are required " - "when connection to Grooveshark. Built-in will values be used instead, but these might be deprecated."); + const auto errorMsg = QApplication::translate("QtGui::Settings", + "Unable to read Grooveshark authentication information file.\n\nReason: %1\n\nThe values stored in this file are required " + "when connection to Grooveshark. Built-in will values be used instead, but these might be deprecated."); const auto groovesharkAuthenticationFile = ConfigFile::locateConfigFile(QStringLiteral(PROJECT_NAME), QStringLiteral("json/groovesharkauthenticationinfo.json"), &settings); QString reason; @@ -536,7 +536,7 @@ void applySettingsToDownload(Download *download) download->setCustomUserAgent(UserAgentPage::useCustomUserAgent() ? UserAgentPage::customUserAgent() : QString()); download->setProxy(ProxyPage::proxy()); } -} +} // namespace QtGui INSTANTIATE_UI_FILE_BASED_OPTION_PAGE_NS(QtGui, TargetPage) INSTANTIATE_UI_FILE_BASED_OPTION_PAGE_NS(QtGui, ProxyPage) diff --git a/gui/settings.h b/gui/settings.h index 74f7e71..1ebcdb5 100644 --- a/gui/settings.h +++ b/gui/settings.h @@ -86,7 +86,7 @@ QtUtilities::QtSettings &qtSettings(); void restoreSettings(); void saveSettings(); void applySettingsToDownload(Network::Download *download); -} +} // namespace QtGui DECLARE_EXTERN_UI_FILE_BASED_OPTION_PAGE_NS(QtGui, TargetPage) DECLARE_EXTERN_UI_FILE_BASED_OPTION_PAGE_NS(QtGui, ProxyPage) diff --git a/itemdelegates/comboboxitemdelegate.cpp b/itemdelegates/comboboxitemdelegate.cpp index aeabdd4..0cbff49 100644 --- a/itemdelegates/comboboxitemdelegate.cpp +++ b/itemdelegates/comboboxitemdelegate.cpp @@ -72,4 +72,4 @@ void ComboBoxItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem & { QStyledItemDelegate::paint(painter, option, index); } -} +} // namespace QtGui diff --git a/itemdelegates/progressbaritemdelegate.cpp b/itemdelegates/progressbaritemdelegate.cpp index 303fcbe..21ab2c7 100644 --- a/itemdelegates/progressbaritemdelegate.cpp +++ b/itemdelegates/progressbaritemdelegate.cpp @@ -30,4 +30,4 @@ void ProgressBarItemDelegate::paint(QPainter *painter, const QStyleOptionViewIte // draw the progress bar onto the view. QApplication::style()->drawControl(QStyle::CE_ProgressBar, &progressBarOption, painter); } -} +} // namespace QtGui diff --git a/model/downloadfinderresultsmodel.cpp b/model/downloadfinderresultsmodel.cpp index b979e51..2206bb9 100644 --- a/model/downloadfinderresultsmodel.cpp +++ b/model/downloadfinderresultsmodel.cpp @@ -183,4 +183,4 @@ void DownloadFinderResultsModel::downloadChangedStatus(Download *download) } } } -} +} // namespace QtGui diff --git a/model/downloadfinderresultsmodel.h b/model/downloadfinderresultsmodel.h index 7527b85..f424b71 100644 --- a/model/downloadfinderresultsmodel.h +++ b/model/downloadfinderresultsmodel.h @@ -10,7 +10,7 @@ class TimeSpan; namespace Network { class Download; class DownloadFinder; -} +} // namespace Network namespace QtGui { @@ -82,6 +82,6 @@ constexpr int DownloadFinderResultsModel::lastColumn() { return idColumn(); } -} +} // namespace QtGui #endif // DOWNLOADFINDERRESULTSMODEL_H diff --git a/model/downloadmodel.cpp b/model/downloadmodel.cpp index ca0487c..05f6b83 100644 --- a/model/downloadmodel.cpp +++ b/model/downloadmodel.cpp @@ -332,4 +332,4 @@ QString DownloadModel::progressString(Download *download) } return QString(); } -} +} // namespace QtGui diff --git a/model/downloadmodel.h b/model/downloadmodel.h index 90abee8..f48a0e9 100644 --- a/model/downloadmodel.h +++ b/model/downloadmodel.h @@ -100,6 +100,6 @@ constexpr int DownloadModel::lastColumn() { return progressColumn(); } -} +} // namespace QtGui #endif // DOWNLOADMODEL_H diff --git a/network/authenticationcredentials.h b/network/authenticationcredentials.h index fc5b95c..04c6db6 100644 --- a/network/authenticationcredentials.h +++ b/network/authenticationcredentials.h @@ -19,7 +19,7 @@ public: const QString &userName() const; const QString &password() const; - const QList > options() const; + const QList> options() const; bool isIncomplete() const; void clear(); @@ -27,7 +27,7 @@ private: bool m_requested; QString m_userName; QString m_password; - QList > m_options; + QList> m_options; }; inline AuthenticationCredentials::AuthenticationCredentials() @@ -52,7 +52,7 @@ inline const QString &AuthenticationCredentials::password() const return m_password; } -inline const QList > AuthenticationCredentials::options() const +inline const QList> AuthenticationCredentials::options() const { return m_options; } @@ -68,6 +68,6 @@ inline void AuthenticationCredentials::clear() m_password.clear(); m_options.clear(); } -} +} // namespace Network #endif // AUTHENTICATIONCREDENTIALS diff --git a/network/bitsharedownload.cpp b/network/bitsharedownload.cpp index 9f50abd..26dd1f1 100644 --- a/network/bitsharedownload.cpp +++ b/network/bitsharedownload.cpp @@ -50,4 +50,4 @@ void BitshareDownload::evalVideoInformation(Download *, QBuffer *videoInfoBuffer reportInitiated(false, tr("The stream url couldn't be found.")); } } -} +} // namespace Network diff --git a/network/bitsharedownload.h b/network/bitsharedownload.h index ad1db6a..fc64145 100644 --- a/network/bitsharedownload.h +++ b/network/bitsharedownload.h @@ -20,6 +20,6 @@ protected: private: QByteArray m_postData; }; -} +} // namespace Network #endif // BITSHAREDOWNLOAD_H diff --git a/network/download.cpp b/network/download.cpp index cac0ebe..dfde549 100644 --- a/network/download.cpp +++ b/network/download.cpp @@ -1247,4 +1247,4 @@ void Download::setIgnoreSslErrorsPermission(size_t optionIndex, PermissionStatus * * To be implemented when subclassing. */ -} +} // namespace Network diff --git a/network/download.h b/network/download.h index 0cb2528..f41409b 100644 --- a/network/download.h +++ b/network/download.h @@ -992,6 +992,6 @@ inline AuthenticationCredentials &Download::initialAuthenticationCredentials() { return m_initAuthData; } -} +} // namespace Network #endif // DOWNLOAD_H diff --git a/network/downloadrange.cpp b/network/downloadrange.cpp index 419716b..80c5327 100644 --- a/network/downloadrange.cpp +++ b/network/downloadrange.cpp @@ -83,4 +83,4 @@ bool DownloadRange::setEndOffset(qint64 value) } return true; } -} +} // namespace Network diff --git a/network/downloadrange.h b/network/downloadrange.h index d67befe..509cef0 100644 --- a/network/downloadrange.h +++ b/network/downloadrange.h @@ -92,6 +92,6 @@ inline void DownloadRange::setUsedForWritingOutput(bool value) { m_useForWritingOutput = value; } -} +} // namespace Network #endif // DOWNLOADRANGE_H diff --git a/network/filenukedownload.cpp b/network/filenukedownload.cpp index 23edfa7..f78bd27 100644 --- a/network/filenukedownload.cpp +++ b/network/filenukedownload.cpp @@ -110,4 +110,4 @@ QString FileNukeDownload::typeName() const { return tr("FileNuke"); } -} +} // namespace Network diff --git a/network/filenukedownload.h b/network/filenukedownload.h index 21d4565..98d2d31 100644 --- a/network/filenukedownload.h +++ b/network/filenukedownload.h @@ -22,6 +22,6 @@ private: QByteArray m_postData; QUrl m_playlistUrl; }; -} +} // namespace Network #endif // FILENUKE_H diff --git a/network/finder/downloadfinder.cpp b/network/finder/downloadfinder.cpp index e332692..861d2bf 100644 --- a/network/finder/downloadfinder.cpp +++ b/network/finder/downloadfinder.cpp @@ -239,4 +239,4 @@ void DownloadFinder::emitNewResultsSignal() * * Needs to be implemented when subclassing. */ -} +} // namespace Network diff --git a/network/finder/downloadfinder.h b/network/finder/downloadfinder.h index 24a5da3..a1da511 100644 --- a/network/finder/downloadfinder.h +++ b/network/finder/downloadfinder.h @@ -180,6 +180,6 @@ inline void DownloadFinder::emitFinishedSignal(bool success, const QString &reas m_finished = true; emit finished(success, reason); } -} +} // namespace Network #endif // VIDEOFINDER_H diff --git a/network/finder/groovesharksearcher.cpp b/network/finder/groovesharksearcher.cpp index 0a1ffe2..2657a8e 100644 --- a/network/finder/groovesharksearcher.cpp +++ b/network/finder/groovesharksearcher.cpp @@ -219,4 +219,4 @@ DownloadFinder::ParsingResult GroovesharkSearcher::parseResults(const QByteArray return ParsingResult::Error; } } -} +} // namespace Network diff --git a/network/finder/groovesharksearcher.h b/network/finder/groovesharksearcher.h index e28e56c..5c300a4 100644 --- a/network/finder/groovesharksearcher.h +++ b/network/finder/groovesharksearcher.h @@ -64,6 +64,6 @@ inline bool GroovesharkSearcher::verified() const { return m_verified; } -} +} // namespace Network #endif // GROOVESHARKALBUM_H diff --git a/network/finder/linkfinder.cpp b/network/finder/linkfinder.cpp index b2446bf..13a183f 100644 --- a/network/finder/linkfinder.cpp +++ b/network/finder/linkfinder.cpp @@ -94,4 +94,4 @@ DownloadFinder::ParsingResult LinkFinder::parseResults(const QByteArray &data, Q } return DownloadFinder::ParsingResult::Success; } -} +} // namespace Network diff --git a/network/finder/linkfinder.h b/network/finder/linkfinder.h index 3dfce8a..e1bb31b 100644 --- a/network/finder/linkfinder.h +++ b/network/finder/linkfinder.h @@ -21,6 +21,6 @@ protected slots: private: QUrl m_url; }; -} +} // namespace Network #endif // LINKFINDER_H diff --git a/network/finder/youtubeplaylist.cpp b/network/finder/youtubeplaylist.cpp index a01b328..89f110a 100644 --- a/network/finder/youtubeplaylist.cpp +++ b/network/finder/youtubeplaylist.cpp @@ -113,4 +113,4 @@ YoutubePlaylist::ParsingResult YoutubePlaylist::parseResults(const QByteArray &d return ParsingResult::Error; } } -} +} // namespace Network diff --git a/network/finder/youtubeplaylist.h b/network/finder/youtubeplaylist.h index 63e1fe3..3b9d86a 100644 --- a/network/finder/youtubeplaylist.h +++ b/network/finder/youtubeplaylist.h @@ -20,6 +20,6 @@ protected slots: private: QString m_playlistId; }; -} +} // namespace Network #endif // YOUTUBEPLAYLIST_H diff --git a/network/groovesharkdownload.cpp b/network/groovesharkdownload.cpp index ede8421..66df96e 100644 --- a/network/groovesharkdownload.cpp +++ b/network/groovesharkdownload.cpp @@ -483,4 +483,4 @@ QString GroovesharkDownload::typeName() const { return tr("Grooveshark"); } -} +} // namespace Network diff --git a/network/groovesharkdownload.h b/network/groovesharkdownload.h index 1547b3e..fdc421b 100644 --- a/network/groovesharkdownload.h +++ b/network/groovesharkdownload.h @@ -77,7 +77,7 @@ private: GroovesharkRequestType m_requestType; QVariant m_requestData; }; -} +} // namespace Network Q_DECLARE_METATYPE(Network::GroovesharkGetSongsRequestData) diff --git a/network/httpdownload.cpp b/network/httpdownload.cpp index eee261a..9b4e9fa 100644 --- a/network/httpdownload.cpp +++ b/network/httpdownload.cpp @@ -290,4 +290,4 @@ void HttpDownload::slotDownloadProgress(qint64 bytesReceived, qint64 bytesToRece reportDownloadProgressUpdate(optionIndex, bytesReceived, bytesToReceive); } } -} +} // namespace Network diff --git a/network/httpdownload.h b/network/httpdownload.h index da32d18..d25c9de 100644 --- a/network/httpdownload.h +++ b/network/httpdownload.h @@ -158,7 +158,7 @@ inline QString HttpDownload::rawCookies() const */ inline QList HttpDownload::cookies() const { - return m_setCookie.isValid() ? qvariant_cast >(m_setCookie) : QList(); + return m_setCookie.isValid() ? qvariant_cast>(m_setCookie) : QList(); } /*! @@ -225,6 +225,6 @@ inline QString HttpDownload::typeName() const { return initialUrl().scheme(); } -} +} // namespace Network #endif // HTTPDOWNLOAD_H diff --git a/network/httpdownloadwithinforequst.cpp b/network/httpdownloadwithinforequst.cpp index 5b6140c..fc06a76 100644 --- a/network/httpdownloadwithinforequst.cpp +++ b/network/httpdownloadwithinforequst.cpp @@ -92,4 +92,4 @@ void HttpDownloadWithInfoRequst::infoRequestChangedStatus(Download *download) default:; } } -} +} // namespace Network diff --git a/network/httpdownloadwithinforequst.h b/network/httpdownloadwithinforequst.h index b71519f..978654b 100644 --- a/network/httpdownloadwithinforequst.h +++ b/network/httpdownloadwithinforequst.h @@ -32,6 +32,6 @@ private: std::unique_ptr m_infoDownload; std::unique_ptr m_infoBuffer; }; -} +} // namespace Network #endif // HTTPDOWNLOADWITHINFOREQUST_H diff --git a/network/misc/contentdispositionparser.cpp b/network/misc/contentdispositionparser.cpp index 2bc3d72..272ce18 100644 --- a/network/misc/contentdispositionparser.cpp +++ b/network/misc/contentdispositionparser.cpp @@ -129,4 +129,4 @@ const QMap &ContentDispositionParser::data() { return m_data; } -} +} // namespace Network diff --git a/network/misc/contentdispositionparser.h b/network/misc/contentdispositionparser.h index 076e276..3bf9022 100644 --- a/network/misc/contentdispositionparser.h +++ b/network/misc/contentdispositionparser.h @@ -30,6 +30,6 @@ private: bool m_attachment; QMap m_data; }; -} +} // namespace Network #endif // CONTENTDISPOSITIONPHARSER_H diff --git a/network/permissionstatus.h b/network/permissionstatus.h index 5838f9f..1af0508 100644 --- a/network/permissionstatus.h +++ b/network/permissionstatus.h @@ -28,6 +28,6 @@ inline void usePermission(PermissionStatus &permission) default:; } } -} +} // namespace Network #endif // PERMISSIONSTATUS diff --git a/network/socksharedownload.cpp b/network/socksharedownload.cpp index 8957b53..2d088f1 100644 --- a/network/socksharedownload.cpp +++ b/network/socksharedownload.cpp @@ -135,4 +135,4 @@ void SockshareDownload::evalVideoInformation(Download *, QBuffer *videoInfoBuffe reportInitiated(false, tr("Internal error.")); } } -} +} // namespace Network diff --git a/network/socksharedownload.h b/network/socksharedownload.h index 269fdcc..54383d2 100644 --- a/network/socksharedownload.h +++ b/network/socksharedownload.h @@ -22,6 +22,6 @@ private: QByteArray m_postData; QUrl m_playlistUrl; }; -} +} // namespace Network #endif // SOCKSHAREDOWNLOAD_H diff --git a/network/spotifydownload.cpp b/network/spotifydownload.cpp index d834302..d088a25 100644 --- a/network/spotifydownload.cpp +++ b/network/spotifydownload.cpp @@ -150,4 +150,4 @@ void SpotifyDownload::evalVideoInformation(Download *, QBuffer *videoInfoBuffer) } } } -} +} // namespace Network diff --git a/network/spotifydownload.h b/network/spotifydownload.h index d94c81e..47540c7 100644 --- a/network/spotifydownload.h +++ b/network/spotifydownload.h @@ -35,6 +35,6 @@ private: SpotifyRequestType m_currentRequest; int m_triesToGetAuthenticationData; }; -} +} // namespace Network #endif // SPOTIFYDOWNLOAD_H diff --git a/network/testdownload.cpp b/network/testdownload.cpp index 6c373a8..507ec34 100644 --- a/network/testdownload.cpp +++ b/network/testdownload.cpp @@ -69,4 +69,4 @@ void TestDownload::tick() reportDownloadComplete(0); } } -} +} // namespace Network diff --git a/network/testdownload.h b/network/testdownload.h index d2306ff..155949d 100644 --- a/network/testdownload.h +++ b/network/testdownload.h @@ -27,6 +27,6 @@ private slots: private: QTimer m_timer; }; -} +} // namespace Network #endif // TESTDOWNLOAD_H diff --git a/network/vimeodownload.cpp b/network/vimeodownload.cpp index cc7cf2f..43bfa58 100644 --- a/network/vimeodownload.cpp +++ b/network/vimeodownload.cpp @@ -51,7 +51,7 @@ Download *VimeoDownload::infoRequestDownload(bool &success, QString &reasonForFa #if QT_VERSION >= 0x050400 .toString() #endif - ); + ); success = true; return new HttpDownload(QUrl(QStringLiteral("https://player.vimeo.com/video/%1/config").arg(this->id()))); } diff --git a/network/youtubedownload.cpp b/network/youtubedownload.cpp index 9135014..db5e1d3 100644 --- a/network/youtubedownload.cpp +++ b/network/youtubedownload.cpp @@ -221,4 +221,4 @@ QString YoutubeDownload::typeName() const { return tr("YouTube"); } -} +} // namespace Network diff --git a/network/youtubedownload.h b/network/youtubedownload.h index ff28b4b..e807e03 100644 --- a/network/youtubedownload.h +++ b/network/youtubedownload.h @@ -29,6 +29,6 @@ private: QStringList m_itags; static QJsonObject m_itagInfo; }; -} +} // namespace Network #endif // YOUTUBEDOWNLOAD_H