From d32bb52390c41cccb6b6964dd30324ea78f090fa Mon Sep 17 00:00:00 2001 From: "Vladimir Golovnev (Glassez)" Date: Mon, 13 Apr 2015 19:19:53 +0300 Subject: [PATCH] Don't add core to INCLUDEPATH. --- src/app/application.cpp | 6 +++--- src/app/main.cpp | 6 +++--- src/core/core.pri | 2 -- src/core/net/dnsupdater.cpp | 2 +- src/core/net/dnsupdater.h | 2 +- src/core/net/smtp.cpp | 4 ++-- src/core/qtlibtorrent/bandwidthscheduler.h | 2 +- src/core/qtlibtorrent/qbtsession.cpp | 18 +++++++++--------- src/core/qtlibtorrent/qbtsession.h | 2 +- src/core/qtlibtorrent/qtorrenthandle.cpp | 8 ++++---- src/core/qtlibtorrent/torrentspeedmonitor.cpp | 2 +- src/core/qtlibtorrent/torrentstatistics.cpp | 6 +++--- src/gui/addnewtorrentdialog.cpp | 6 +++--- src/gui/advancedsettings.h | 2 +- src/gui/deletionconfirmationdlg.h | 4 ++-- src/gui/executionlog.cpp | 2 +- src/gui/geoip/geoipmanager.cpp | 2 +- src/gui/iconprovider.cpp | 2 +- src/gui/mainwindow.cpp | 10 +++++----- src/gui/options_imp.cpp | 6 +++--- src/gui/previewlistdelegate.h | 2 +- src/gui/previewselect.cpp | 6 +++--- src/gui/programupdater.cpp | 4 ++-- src/gui/properties/peerlistdelegate.h | 2 +- src/gui/properties/peerlistwidget.cpp | 4 ++-- src/gui/properties/propertieswidget.cpp | 6 +++--- src/gui/properties/proplistdelegate.h | 2 +- src/gui/properties/trackerlist.cpp | 4 ++-- src/gui/properties/trackersadditiondlg.h | 6 +++--- src/gui/rss/automatedrssdownloader.cpp | 4 ++-- src/gui/rss/htmlbrowser.cpp | 2 +- src/gui/rss/rss_imp.cpp | 2 +- src/gui/rss/rssdownloadrule.cpp | 4 ++-- src/gui/rss/rssdownloadrulelist.cpp | 4 ++-- src/gui/rss/rssfeed.cpp | 12 ++++++------ src/gui/rss/rssmanager.cpp | 4 ++-- src/gui/rss/rssparser.cpp | 4 ++-- src/gui/rss/rsssettingsdlg.cpp | 2 +- src/gui/shutdownconfirm.h | 2 +- src/gui/speedlimitdlg.h | 2 +- src/gui/statsdialog.cpp | 2 +- src/gui/statusbar.cpp | 6 +++--- src/gui/torrentcontentmodel.cpp | 4 ++-- src/gui/torrentcontentmodelfile.cpp | 4 ++-- src/gui/torrentcontentmodelitem.cpp | 4 ++-- src/gui/torrentcreator/torrentcreatordlg.cpp | 8 ++++---- .../torrentcreator/torrentcreatorthread.cpp | 4 ++-- src/gui/torrentimportdlg.cpp | 6 +++--- src/gui/torrentmodel.cpp | 4 ++-- src/gui/transferlistdelegate.cpp | 2 +- src/gui/transferlistfilterswidget.cpp | 10 +++++----- src/gui/transferlistsortmodel.cpp | 2 +- src/gui/transferlistwidget.cpp | 6 +++--- src/gui/updownratiodlg.cpp | 2 +- src/searchengine/engineselectdlg.cpp | 6 +++--- src/searchengine/searchengine.cpp | 6 +++--- src/searchengine/searchlistdelegate.h | 2 +- src/searchengine/searchsortmodel.h | 2 +- src/searchengine/searchtab.cpp | 4 ++-- src/searchengine/supportedengines.h | 4 ++-- src/webui/abstractwebapplication.cpp | 2 +- src/webui/abstractwebapplication.h | 6 +++--- src/webui/btjson.cpp | 4 ++-- src/webui/prefjson.cpp | 6 +++--- src/webui/qtorrentfilter.cpp | 2 +- src/webui/webapplication.cpp | 6 +++--- src/webui/webui.cpp | 6 +++--- 67 files changed, 145 insertions(+), 147 deletions(-) diff --git a/src/app/application.cpp b/src/app/application.cpp index fa4a7f62b..79e814c06 100644 --- a/src/app/application.cpp +++ b/src/app/application.cpp @@ -55,10 +55,10 @@ #endif #include "application.h" -#include "logger.h" -#include "preferences.h" +#include "core/logger.h" +#include "core/preferences.h" #include "qbtsession.h" -#include "torrentpersistentdata.h" +#include "core/torrentpersistentdata.h" static const char PARAMS_SEPARATOR[] = "|"; diff --git a/src/app/main.cpp b/src/app/main.cpp index 26605d8a7..03a010d9e 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -66,9 +66,9 @@ Q_IMPORT_PLUGIN(qico) #include #include #include "application.h" -#include "misc.h" -#include "preferences.h" -#include "logger.h" +#include "core/misc.h" +#include "core/preferences.h" +#include "core/logger.h" // Signal handlers #if defined(Q_OS_UNIX) || defined(STACKTRACE_WIN) diff --git a/src/core/core.pri b/src/core/core.pri index 74dd529ec..43d5ecfd2 100644 --- a/src/core/core.pri +++ b/src/core/core.pri @@ -1,5 +1,3 @@ -INCLUDEPATH += $$PWD - include(qtlibtorrent/qtlibtorrent.pri) HEADERS += \ diff --git a/src/core/net/dnsupdater.cpp b/src/core/net/dnsupdater.cpp index 5d176e733..bb47528b8 100644 --- a/src/core/net/dnsupdater.cpp +++ b/src/core/net/dnsupdater.cpp @@ -36,7 +36,7 @@ #include #endif #include "dnsupdater.h" -#include "logger.h" +#include "core/logger.h" using namespace Net; diff --git a/src/core/net/dnsupdater.h b/src/core/net/dnsupdater.h index a130ef423..9a252405a 100644 --- a/src/core/net/dnsupdater.h +++ b/src/core/net/dnsupdater.h @@ -36,7 +36,7 @@ #include #include #include -#include "preferences.h" +#include "core/preferences.h" namespace Net { diff --git a/src/core/net/smtp.cpp b/src/core/net/smtp.cpp index f895c1924..1a685b48b 100644 --- a/src/core/net/smtp.cpp +++ b/src/core/net/smtp.cpp @@ -33,8 +33,8 @@ */ #include "smtp.h" -#include "preferences.h" -#include "logger.h" +#include "core/preferences.h" +#include "core/logger.h" #include #ifndef QT_NO_OPENSSL diff --git a/src/core/qtlibtorrent/bandwidthscheduler.h b/src/core/qtlibtorrent/bandwidthscheduler.h index 318f8e767..8794eebfb 100644 --- a/src/core/qtlibtorrent/bandwidthscheduler.h +++ b/src/core/qtlibtorrent/bandwidthscheduler.h @@ -4,7 +4,7 @@ #include #include #include -#include "preferences.h" +#include "core/preferences.h" #include diff --git a/src/core/qtlibtorrent/qbtsession.cpp b/src/core/qtlibtorrent/qbtsession.cpp index 01ee5076e..03b077719 100644 --- a/src/core/qtlibtorrent/qbtsession.cpp +++ b/src/core/qtlibtorrent/qbtsession.cpp @@ -39,24 +39,24 @@ #include #include "core/net/smtp.h" -#include "filesystemwatcher.h" +#include "core/filesystemwatcher.h" #include "torrentspeedmonitor.h" #include "torrentstatistics.h" #include "qbtsession.h" #include "alertdispatcher.h" -#include "misc.h" -#include "fs_utils.h" -#include "downloadthread.h" +#include "core/misc.h" +#include "core/fs_utils.h" +#include "core/downloadthread.h" #include "filterparserthread.h" -#include "preferences.h" -#include "scannedfoldersmodel.h" -#include "qtracker.h" -#include "logger.h" +#include "core/preferences.h" +#include "core/scannedfoldersmodel.h" +#include "core/qtracker.h" +#include "core/logger.h" #ifndef DISABLE_GUI #include "shutdownconfirm.h" #include "geoipmanager.h" #endif -#include "torrentpersistentdata.h" +#include "core/torrentpersistentdata.h" #include "bandwidthscheduler.h" #include #include diff --git a/src/core/qtlibtorrent/qbtsession.h b/src/core/qtlibtorrent/qbtsession.h index aac6ae7ac..9c9a12fc8 100644 --- a/src/core/qtlibtorrent/qbtsession.h +++ b/src/core/qtlibtorrent/qbtsession.h @@ -42,7 +42,7 @@ #include "qtorrenthandle.h" #include "trackerinfos.h" -#include "misc.h" +#include "core/misc.h" #ifndef DISABLE_GUI #include "rssdownloadrule.h" diff --git a/src/core/qtlibtorrent/qtorrenthandle.cpp b/src/core/qtlibtorrent/qtorrenthandle.cpp index 79c923e1d..302118223 100644 --- a/src/core/qtlibtorrent/qtorrenthandle.cpp +++ b/src/core/qtlibtorrent/qtorrenthandle.cpp @@ -35,11 +35,11 @@ #include #include #include -#include "fs_utils.h" -#include "misc.h" -#include "preferences.h" +#include "core/fs_utils.h" +#include "core/misc.h" +#include "core/preferences.h" #include "qtorrenthandle.h" -#include "torrentpersistentdata.h" +#include "core/torrentpersistentdata.h" #include "qbtsession.h" #include #include diff --git a/src/core/qtlibtorrent/torrentspeedmonitor.cpp b/src/core/qtlibtorrent/torrentspeedmonitor.cpp index 1cb821dde..1cb6640e2 100644 --- a/src/core/qtlibtorrent/torrentspeedmonitor.cpp +++ b/src/core/qtlibtorrent/torrentspeedmonitor.cpp @@ -31,7 +31,7 @@ #include #include "qbtsession.h" -#include "misc.h" +#include "core/misc.h" #include "torrentspeedmonitor.h" using namespace libtorrent; diff --git a/src/core/qtlibtorrent/torrentstatistics.cpp b/src/core/qtlibtorrent/torrentstatistics.cpp index b143d6ccf..436c9c37c 100644 --- a/src/core/qtlibtorrent/torrentstatistics.cpp +++ b/src/core/qtlibtorrent/torrentstatistics.cpp @@ -5,8 +5,8 @@ #include #include "qbtsession.h" -#include "qinisettings.h" -#include "preferences.h" +#include "core/qinisettings.h" +#include "core/preferences.h" TorrentStatistics::TorrentStatistics(QBtSession* session, QObject* parent) : QObject(parent) @@ -69,7 +69,7 @@ void TorrentStatistics::loadStats() { // Don't forget to remove: // 1. Preferences::getStats() // 2. Preferences::removeStats() - // 3. #include "preferences.h" + // 3. #include "core/preferences.h" Preferences* const pref = Preferences::instance(); QIniSettings s("qBittorrent", "qBittorrent-data"); QVariantHash v = pref->getStats(); diff --git a/src/gui/addnewtorrentdialog.cpp b/src/gui/addnewtorrentdialog.cpp index 2bd8d633b..e9a06b92a 100644 --- a/src/gui/addnewtorrentdialog.cpp +++ b/src/gui/addnewtorrentdialog.cpp @@ -33,11 +33,11 @@ #include "proplistdelegate.h" #include "torrentcontentmodel.h" #include "torrentcontentfiltermodel.h" -#include "preferences.h" -#include "torrentpersistentdata.h" +#include "core/preferences.h" +#include "core/torrentpersistentdata.h" #include "qbtsession.h" #include "iconprovider.h" -#include "fs_utils.h" +#include "core/fs_utils.h" #include "autoexpandabledialog.h" #include "messageboxraised.h" diff --git a/src/gui/advancedsettings.h b/src/gui/advancedsettings.h index 289091163..7c6a0e6bb 100644 --- a/src/gui/advancedsettings.h +++ b/src/gui/advancedsettings.h @@ -10,7 +10,7 @@ #include #include #include -#include "preferences.h" +#include "core/preferences.h" enum AdvSettingsCols {PROPERTY, VALUE}; enum AdvSettingsRows {DISK_CACHE, DISK_CACHE_TTL, OS_CACHE, SAVE_RESUME_DATA_INTERVAL, OUTGOING_PORT_MIN, OUTGOING_PORT_MAX, IGNORE_LIMIT_LAN, RECHECK_COMPLETED, LIST_REFRESH, RESOLVE_COUNTRIES, RESOLVE_HOSTS, MAX_HALF_OPEN, SUPER_SEEDING, NETWORK_IFACE, NETWORK_LISTEN_IPV6, NETWORK_ADDRESS, PROGRAM_NOTIFICATIONS, TRACKER_STATUS, TRACKER_PORT, diff --git a/src/gui/deletionconfirmationdlg.h b/src/gui/deletionconfirmationdlg.h index 4b778d28b..8af23a64e 100644 --- a/src/gui/deletionconfirmationdlg.h +++ b/src/gui/deletionconfirmationdlg.h @@ -34,9 +34,9 @@ #include #include #include "ui_confirmdeletiondlg.h" -#include "preferences.h" +#include "core/preferences.h" #include "iconprovider.h" -#include "misc.h" +#include "core/misc.h" class DeletionConfirmationDlg : public QDialog, private Ui::confirmDeletionDlg { Q_OBJECT diff --git a/src/gui/executionlog.cpp b/src/gui/executionlog.cpp index 7c2be8f4f..2498191aa 100644 --- a/src/gui/executionlog.cpp +++ b/src/gui/executionlog.cpp @@ -35,7 +35,7 @@ #include #include "executionlog.h" #include "ui_executionlog.h" -#include "logger.h" +#include "core/logger.h" #include "iconprovider.h" #include "loglistwidget.h" diff --git a/src/gui/geoip/geoipmanager.cpp b/src/gui/geoip/geoipmanager.cpp index 1e0c58c55..5559545b8 100644 --- a/src/gui/geoip/geoipmanager.cpp +++ b/src/gui/geoip/geoipmanager.cpp @@ -64,7 +64,7 @@ #include #include -#include "fs_utils.h" +#include "core/fs_utils.h" #include using namespace libtorrent; diff --git a/src/gui/iconprovider.cpp b/src/gui/iconprovider.cpp index 2213993a4..3d79e2787 100644 --- a/src/gui/iconprovider.cpp +++ b/src/gui/iconprovider.cpp @@ -29,7 +29,7 @@ */ #include "iconprovider.h" -#include "preferences.h" +#include "core/preferences.h" #if (defined(Q_OS_UNIX) && !defined(Q_OS_MAC)) #include diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index 49091e4f0..f210ffbbf 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -49,7 +49,7 @@ #include "mainwindow.h" #include "transferlistwidget.h" -#include "misc.h" +#include "core/misc.h" #include "torrentcreatordlg.h" #include "downloadfromurldlg.h" #include "addnewtorrentdialog.h" @@ -60,10 +60,10 @@ #include "trackerlogin.h" #include "options_imp.h" #include "speedlimitdlg.h" -#include "preferences.h" +#include "core/preferences.h" #include "trackerlist.h" #include "peerlistwidget.h" -#include "torrentpersistentdata.h" +#include "core/torrentpersistentdata.h" #include "transferlistfilterswidget.h" #include "propertieswidget.h" #include "statusbar.h" @@ -72,7 +72,7 @@ #include "torrentmodel.h" #include "executionlog.h" #include "iconprovider.h" -#include "logger.h" +#include "core/logger.h" #ifndef DISABLE_GUI #include "autoexpandabledialog.h" #endif @@ -86,7 +86,7 @@ void qt_mac_set_dock_menu(QMenu *menu); #endif #include "powermanagement.h" #ifdef Q_OS_WIN -#include "downloadthread.h" +#include "core/downloadthread.h" #endif #include diff --git a/src/gui/options_imp.cpp b/src/gui/options_imp.cpp index e125ee2dc..d2da8e3df 100644 --- a/src/gui/options_imp.cpp +++ b/src/gui/options_imp.cpp @@ -42,10 +42,10 @@ #include #include "options_imp.h" -#include "preferences.h" -#include "fs_utils.h" +#include "core/preferences.h" +#include "core/fs_utils.h" #include "advancedsettings.h" -#include "scannedfoldersmodel.h" +#include "core/scannedfoldersmodel.h" #include "qbtsession.h" #include "iconprovider.h" #include "core/net/dnsupdater.h" diff --git a/src/gui/previewlistdelegate.h b/src/gui/previewlistdelegate.h index 7b7be6871..37951901c 100644 --- a/src/gui/previewlistdelegate.h +++ b/src/gui/previewlistdelegate.h @@ -37,7 +37,7 @@ #include #include #include -#include "misc.h" +#include "core/misc.h" #include "previewselect.h" #ifdef Q_OS_WIN diff --git a/src/gui/previewselect.cpp b/src/gui/previewselect.cpp index d52177994..42c01fbf4 100644 --- a/src/gui/previewselect.cpp +++ b/src/gui/previewselect.cpp @@ -36,11 +36,11 @@ #include #include -#include "misc.h" +#include "core/misc.h" #include "previewlistdelegate.h" #include "previewselect.h" -#include "fs_utils.h" -#include "preferences.h" +#include "core/fs_utils.h" +#include "core/preferences.h" PreviewSelect::PreviewSelect(QWidget* parent, QTorrentHandle h): QDialog(parent), h(h) { setupUi(this); diff --git a/src/gui/programupdater.cpp b/src/gui/programupdater.cpp index b5350431d..80191acf1 100644 --- a/src/gui/programupdater.cpp +++ b/src/gui/programupdater.cpp @@ -39,8 +39,8 @@ #include #include "programupdater.h" -#include "fs_utils.h" -#include "preferences.h" +#include "core/fs_utils.h" +#include "core/preferences.h" #ifdef Q_OS_MAC const QUrl RSS_URL("http://sourceforge.net/projects/qbittorrent/rss?path=/qbittorrent-mac"); diff --git a/src/gui/properties/peerlistdelegate.h b/src/gui/properties/peerlistdelegate.h index a71ed3f8c..aca206768 100644 --- a/src/gui/properties/peerlistdelegate.h +++ b/src/gui/properties/peerlistdelegate.h @@ -33,7 +33,7 @@ #include #include -#include "misc.h" +#include "core/misc.h" class PeerListDelegate: public QItemDelegate { Q_OBJECT diff --git a/src/gui/properties/peerlistwidget.cpp b/src/gui/properties/peerlistwidget.cpp index ea4c787b0..aa7346448 100644 --- a/src/gui/properties/peerlistwidget.cpp +++ b/src/gui/properties/peerlistwidget.cpp @@ -32,14 +32,14 @@ #include "peerlistdelegate.h" #include "peerlistsortmodel.h" #include "core/net/reverseresolution.h" -#include "preferences.h" +#include "core/preferences.h" #include "propertieswidget.h" #include "geoipmanager.h" #include "peeraddition.h" #include "speedlimitdlg.h" #include "iconprovider.h" #include "qtorrenthandle.h" -#include "logger.h" +#include "core/logger.h" #include #include #include diff --git a/src/gui/properties/propertieswidget.cpp b/src/gui/properties/propertieswidget.cpp index c34fb0102..53bca79ec 100644 --- a/src/gui/properties/propertieswidget.cpp +++ b/src/gui/properties/propertieswidget.cpp @@ -43,7 +43,7 @@ #include #include "propertieswidget.h" #include "transferlistwidget.h" -#include "torrentpersistentdata.h" +#include "core/torrentpersistentdata.h" #include "qbtsession.h" #include "proplistdelegate.h" #include "torrentcontentfiltermodel.h" @@ -53,11 +53,11 @@ #include "mainwindow.h" #include "downloadedpiecesbar.h" #include "pieceavailabilitybar.h" -#include "preferences.h" +#include "core/preferences.h" #include "proptabbar.h" #include "iconprovider.h" #include "lineedit.h" -#include "fs_utils.h" +#include "core/fs_utils.h" #include "autoexpandabledialog.h" using namespace libtorrent; diff --git a/src/gui/properties/proplistdelegate.h b/src/gui/properties/proplistdelegate.h index 791cbe481..9a5c3109f 100644 --- a/src/gui/properties/proplistdelegate.h +++ b/src/gui/properties/proplistdelegate.h @@ -40,7 +40,7 @@ #include #include #include -#include "misc.h" +#include "core/misc.h" #include "propertieswidget.h" #ifdef Q_OS_WIN diff --git a/src/gui/properties/trackerlist.cpp b/src/gui/properties/trackerlist.cpp index 3910c0258..22a3a2272 100644 --- a/src/gui/properties/trackerlist.cpp +++ b/src/gui/properties/trackerlist.cpp @@ -43,8 +43,8 @@ #include "trackersadditiondlg.h" #include "iconprovider.h" #include "qbtsession.h" -#include "preferences.h" -#include "misc.h" +#include "core/preferences.h" +#include "core/misc.h" #include "autoexpandabledialog.h" using namespace libtorrent; diff --git a/src/gui/properties/trackersadditiondlg.h b/src/gui/properties/trackersadditiondlg.h index 874a497fc..11efe3761 100644 --- a/src/gui/properties/trackersadditiondlg.h +++ b/src/gui/properties/trackersadditiondlg.h @@ -37,11 +37,11 @@ #include #include #include "iconprovider.h" -#include "misc.h" +#include "core/misc.h" #include "ui_trackersadditiondlg.h" -#include "downloadthread.h" +#include "core/downloadthread.h" #include "qtorrenthandle.h" -#include "fs_utils.h" +#include "core/fs_utils.h" class TrackersAdditionDlg : public QDialog, private Ui::TrackersAdditionDlg{ Q_OBJECT diff --git a/src/gui/rss/automatedrssdownloader.cpp b/src/gui/rss/automatedrssdownloader.cpp index 910a04a13..496329f0a 100644 --- a/src/gui/rss/automatedrssdownloader.cpp +++ b/src/gui/rss/automatedrssdownloader.cpp @@ -37,12 +37,12 @@ #include "automatedrssdownloader.h" #include "ui_automatedrssdownloader.h" #include "rssdownloadrulelist.h" -#include "preferences.h" +#include "core/preferences.h" #include "rssmanager.h" #include "rssfeed.h" #include "iconprovider.h" #include "autoexpandabledialog.h" -#include "fs_utils.h" +#include "core/fs_utils.h" AutomatedRssDownloader::AutomatedRssDownloader(const QWeakPointer& manager, QWidget *parent) : QDialog(parent), diff --git a/src/gui/rss/htmlbrowser.cpp b/src/gui/rss/htmlbrowser.cpp index 3350c9450..07455fb3f 100644 --- a/src/gui/rss/htmlbrowser.cpp +++ b/src/gui/rss/htmlbrowser.cpp @@ -10,7 +10,7 @@ #include #include -#include "fs_utils.h" +#include "core/fs_utils.h" HtmlBrowser::HtmlBrowser(QWidget* parent) : QTextBrowser(parent) diff --git a/src/gui/rss/rss_imp.cpp b/src/gui/rss/rss_imp.cpp index 65565b5e2..f5a1de187 100644 --- a/src/gui/rss/rss_imp.cpp +++ b/src/gui/rss/rss_imp.cpp @@ -41,7 +41,7 @@ #include "feedlistwidget.h" #include "qbtsession.h" #include "cookiesdlg.h" -#include "preferences.h" +#include "core/preferences.h" #include "rsssettingsdlg.h" #include "rssmanager.h" #include "rssfolder.h" diff --git a/src/gui/rss/rssdownloadrule.cpp b/src/gui/rss/rssdownloadrule.cpp index 23ba95993..2127dcecf 100644 --- a/src/gui/rss/rssdownloadrule.cpp +++ b/src/gui/rss/rssdownloadrule.cpp @@ -33,10 +33,10 @@ #include #include "rssdownloadrule.h" -#include "preferences.h" +#include "core/preferences.h" #include "rssfeed.h" #include "rssarticle.h" -#include "fs_utils.h" +#include "core/fs_utils.h" RssDownloadRule::RssDownloadRule(): m_enabled(false), m_useRegex(false), m_apstate(USE_GLOBAL) { diff --git a/src/gui/rss/rssdownloadrulelist.cpp b/src/gui/rss/rssdownloadrulelist.cpp index 295cb6a6c..33ae84ea4 100644 --- a/src/gui/rss/rssdownloadrulelist.cpp +++ b/src/gui/rss/rssdownloadrulelist.cpp @@ -33,8 +33,8 @@ #include #include "rssdownloadrulelist.h" -#include "preferences.h" -#include "qinisettings.h" +#include "core/preferences.h" +#include "core/qinisettings.h" RssDownloadRuleList::RssDownloadRuleList() { diff --git a/src/gui/rss/rssfeed.cpp b/src/gui/rss/rssfeed.cpp index 63b23e92f..36b8f67b9 100644 --- a/src/gui/rss/rssfeed.cpp +++ b/src/gui/rss/rssfeed.cpp @@ -33,15 +33,15 @@ #include "rssmanager.h" #include "qbtsession.h" #include "rssfolder.h" -#include "preferences.h" -#include "qinisettings.h" +#include "core/preferences.h" +#include "core/qinisettings.h" #include "rssarticle.h" #include "rssparser.h" -#include "misc.h" +#include "core/misc.h" #include "rssdownloadrulelist.h" -#include "downloadthread.h" -#include "fs_utils.h" -#include "logger.h" +#include "core/downloadthread.h" +#include "core/fs_utils.h" +#include "core/logger.h" bool rssArticleDateRecentThan(const RssArticlePtr& left, const RssArticlePtr& right) { diff --git a/src/gui/rss/rssmanager.cpp b/src/gui/rss/rssmanager.cpp index 853de3c5c..42e59f3a3 100644 --- a/src/gui/rss/rssmanager.cpp +++ b/src/gui/rss/rssmanager.cpp @@ -30,13 +30,13 @@ #include #include "rssmanager.h" -#include "preferences.h" +#include "core/preferences.h" #include "qbtsession.h" #include "rssfeed.h" #include "rssarticle.h" #include "rssdownloadrulelist.h" #include "rssparser.h" -#include "downloadthread.h" +#include "core/downloadthread.h" static const int MSECS_PER_MIN = 60000; diff --git a/src/gui/rss/rssparser.cpp b/src/gui/rss/rssparser.cpp index 50989cbbe..d0e85a64a 100644 --- a/src/gui/rss/rssparser.cpp +++ b/src/gui/rss/rssparser.cpp @@ -29,8 +29,8 @@ */ #include "rssparser.h" -#include "downloadthread.h" -#include "fs_utils.h" +#include "core/downloadthread.h" +#include "core/fs_utils.h" #include #include #include diff --git a/src/gui/rss/rsssettingsdlg.cpp b/src/gui/rss/rsssettingsdlg.cpp index 195df9ac5..627a30a89 100644 --- a/src/gui/rss/rsssettingsdlg.cpp +++ b/src/gui/rss/rsssettingsdlg.cpp @@ -30,7 +30,7 @@ #include "rsssettingsdlg.h" #include "ui_rsssettingsdlg.h" -#include "preferences.h" +#include "core/preferences.h" RssSettingsDlg::RssSettingsDlg(QWidget *parent) : QDialog(parent), diff --git a/src/gui/shutdownconfirm.h b/src/gui/shutdownconfirm.h index 774d9bc5e..a8013f846 100644 --- a/src/gui/shutdownconfirm.h +++ b/src/gui/shutdownconfirm.h @@ -33,7 +33,7 @@ #include #include -#include "misc.h" +#include "core/misc.h" class ShutdownConfirmDlg : public QMessageBox { diff --git a/src/gui/speedlimitdlg.h b/src/gui/speedlimitdlg.h index 96a36171d..f084d330b 100644 --- a/src/gui/speedlimitdlg.h +++ b/src/gui/speedlimitdlg.h @@ -34,7 +34,7 @@ #include #include #include "ui_bandwidth_limit.h" -#include "misc.h" +#include "core/misc.h" #include "qbtsession.h" class SpeedLimitDialog : public QDialog, private Ui_bandwidth_dlg { diff --git a/src/gui/statsdialog.cpp b/src/gui/statsdialog.cpp index f90e38716..b093c8595 100644 --- a/src/gui/statsdialog.cpp +++ b/src/gui/statsdialog.cpp @@ -31,7 +31,7 @@ #include "statsdialog.h" #include "ui_statsdialog.h" -#include "misc.h" +#include "core/misc.h" #include #include diff --git a/src/gui/statusbar.cpp b/src/gui/statusbar.cpp index d775d068a..aee363506 100644 --- a/src/gui/statusbar.cpp +++ b/src/gui/statusbar.cpp @@ -36,9 +36,9 @@ #include "qbtsession.h" #include "speedlimitdlg.h" #include "iconprovider.h" -#include "preferences.h" -#include "misc.h" -#include "logger.h" +#include "core/preferences.h" +#include "core/misc.h" +#include "core/logger.h" #include #include diff --git a/src/gui/torrentcontentmodel.cpp b/src/gui/torrentcontentmodel.cpp index 97e8242b3..83f775075 100644 --- a/src/gui/torrentcontentmodel.cpp +++ b/src/gui/torrentcontentmodel.cpp @@ -29,8 +29,8 @@ */ #include "iconprovider.h" -#include "misc.h" -#include "fs_utils.h" +#include "core/misc.h" +#include "core/fs_utils.h" #include "torrentcontentmodel.h" #include "torrentcontentmodelitem.h" #include "torrentcontentmodelfolder.h" diff --git a/src/gui/torrentcontentmodelfile.cpp b/src/gui/torrentcontentmodelfile.cpp index d8312e8c7..e9c2f8701 100644 --- a/src/gui/torrentcontentmodelfile.cpp +++ b/src/gui/torrentcontentmodelfile.cpp @@ -30,8 +30,8 @@ #include "torrentcontentmodelfile.h" #include "torrentcontentmodelfolder.h" -#include "fs_utils.h" -#include "misc.h" +#include "core/fs_utils.h" +#include "core/misc.h" TorrentContentModelFile::TorrentContentModelFile(const libtorrent::file_entry& f, TorrentContentModelFolder* parent, diff --git a/src/gui/torrentcontentmodelitem.cpp b/src/gui/torrentcontentmodelitem.cpp index 429d8eddb..03385389d 100644 --- a/src/gui/torrentcontentmodelitem.cpp +++ b/src/gui/torrentcontentmodelitem.cpp @@ -28,8 +28,8 @@ * Contact : chris@qbittorrent.org */ -#include "misc.h" -#include "fs_utils.h" +#include "core/misc.h" +#include "core/fs_utils.h" #include "torrentcontentmodelitem.h" #include "torrentcontentmodelfolder.h" #include diff --git a/src/gui/torrentcreator/torrentcreatordlg.cpp b/src/gui/torrentcreator/torrentcreatordlg.cpp index 882192ce6..0092b2905 100644 --- a/src/gui/torrentcreator/torrentcreatordlg.cpp +++ b/src/gui/torrentcreator/torrentcreatordlg.cpp @@ -32,11 +32,11 @@ #include #include -#include "torrentpersistentdata.h" +#include "core/torrentpersistentdata.h" #include "torrentcreatordlg.h" -#include "fs_utils.h" -#include "misc.h" -#include "preferences.h" +#include "core/fs_utils.h" +#include "core/misc.h" +#include "core/preferences.h" #include "torrentcreatorthread.h" #include "iconprovider.h" #include "qbtsession.h" diff --git a/src/gui/torrentcreator/torrentcreatorthread.cpp b/src/gui/torrentcreator/torrentcreatorthread.cpp index 88f9666d1..43853befd 100644 --- a/src/gui/torrentcreator/torrentcreatorthread.cpp +++ b/src/gui/torrentcreator/torrentcreatorthread.cpp @@ -41,8 +41,8 @@ #include #include "torrentcreatorthread.h" -#include "fs_utils.h" -#include "misc.h" +#include "core/fs_utils.h" +#include "core/misc.h" #include #include diff --git a/src/gui/torrentimportdlg.cpp b/src/gui/torrentimportdlg.cpp index ed3a71993..12db5eadc 100644 --- a/src/gui/torrentimportdlg.cpp +++ b/src/gui/torrentimportdlg.cpp @@ -34,11 +34,11 @@ #include "torrentimportdlg.h" #include "ui_torrentimportdlg.h" -#include "preferences.h" +#include "core/preferences.h" #include "qbtsession.h" -#include "torrentpersistentdata.h" +#include "core/torrentpersistentdata.h" #include "iconprovider.h" -#include "fs_utils.h" +#include "core/fs_utils.h" using namespace libtorrent; diff --git a/src/gui/torrentmodel.cpp b/src/gui/torrentmodel.cpp index e694a551e..c680206e6 100644 --- a/src/gui/torrentmodel.cpp +++ b/src/gui/torrentmodel.cpp @@ -33,9 +33,9 @@ #include #include "torrentmodel.h" -#include "torrentpersistentdata.h" +#include "core/torrentpersistentdata.h" #include "qbtsession.h" -#include "fs_utils.h" +#include "core/fs_utils.h" #include diff --git a/src/gui/transferlistdelegate.cpp b/src/gui/transferlistdelegate.cpp index eb660401b..020a60355 100644 --- a/src/gui/transferlistdelegate.cpp +++ b/src/gui/transferlistdelegate.cpp @@ -34,7 +34,7 @@ #include #include #include -#include "misc.h" +#include "core/misc.h" #include "torrentmodel.h" #include "qbtsession.h" diff --git a/src/gui/transferlistfilterswidget.cpp b/src/gui/transferlistfilterswidget.cpp index 5886c498d..1000668d5 100644 --- a/src/gui/transferlistfilterswidget.cpp +++ b/src/gui/transferlistfilterswidget.cpp @@ -41,15 +41,15 @@ #include "transferlistdelegate.h" #include "transferlistwidget.h" -#include "preferences.h" +#include "core/preferences.h" #include "torrentmodel.h" #include "iconprovider.h" -#include "fs_utils.h" +#include "core/fs_utils.h" #include "autoexpandabledialog.h" #include "torrentfilterenum.h" -#include "misc.h" -#include "downloadthread.h" -#include "logger.h" +#include "core/misc.h" +#include "core/downloadthread.h" +#include "core/logger.h" FiltersBase::FiltersBase(QWidget *parent, TransferListWidget *transferList) : QListWidget(parent) diff --git a/src/gui/transferlistsortmodel.cpp b/src/gui/transferlistsortmodel.cpp index 0574e44c4..ebced81e1 100644 --- a/src/gui/transferlistsortmodel.cpp +++ b/src/gui/transferlistsortmodel.cpp @@ -31,7 +31,7 @@ #include "transferlistsortmodel.h" #include "torrentmodel.h" -#include "misc.h" +#include "core/misc.h" TransferListSortModel::TransferListSortModel(QObject *parent) : QSortFilterProxyModel(parent) diff --git a/src/gui/transferlistwidget.cpp b/src/gui/transferlistwidget.cpp index db5fbc65f..80c7fcfc9 100644 --- a/src/gui/transferlistwidget.cpp +++ b/src/gui/transferlistwidget.cpp @@ -49,19 +49,19 @@ #include "transferlistwidget.h" #include "qbtsession.h" -#include "torrentpersistentdata.h" +#include "core/torrentpersistentdata.h" #include "transferlistdelegate.h" #include "previewselect.h" #include "speedlimitdlg.h" #include "updownratiodlg.h" #include "options_imp.h" #include "mainwindow.h" -#include "preferences.h" +#include "core/preferences.h" #include "torrentmodel.h" #include "deletionconfirmationdlg.h" #include "propertieswidget.h" #include "iconprovider.h" -#include "fs_utils.h" +#include "core/fs_utils.h" #include "autoexpandabledialog.h" #include "transferlistsortmodel.h" diff --git a/src/gui/updownratiodlg.cpp b/src/gui/updownratiodlg.cpp index 78686544f..f5705fc39 100644 --- a/src/gui/updownratiodlg.cpp +++ b/src/gui/updownratiodlg.cpp @@ -31,7 +31,7 @@ #include "updownratiodlg.h" #include "ui_updownratiodlg.h" -#include "preferences.h" +#include "core/preferences.h" UpDownRatioDlg::UpDownRatioDlg(bool useDefault, qreal initialValue, qreal maxValue, QWidget *parent) diff --git a/src/searchengine/engineselectdlg.cpp b/src/searchengine/engineselectdlg.cpp index e8736fac8..5ededabb0 100644 --- a/src/searchengine/engineselectdlg.cpp +++ b/src/searchengine/engineselectdlg.cpp @@ -29,9 +29,9 @@ */ #include "engineselectdlg.h" -#include "downloadthread.h" -#include "fs_utils.h" -#include "misc.h" +#include "core/downloadthread.h" +#include "core/fs_utils.h" +#include "core/misc.h" #include "ico.h" #include "searchengine.h" #include "pluginsource.h" diff --git a/src/searchengine/searchengine.cpp b/src/searchengine/searchengine.cpp index 4293a7d11..40543eb4a 100644 --- a/src/searchengine/searchengine.cpp +++ b/src/searchengine/searchengine.cpp @@ -49,9 +49,9 @@ #include "searchengine.h" #include "qbtsession.h" -#include "fs_utils.h" -#include "misc.h" -#include "preferences.h" +#include "core/fs_utils.h" +#include "core/misc.h" +#include "core/preferences.h" #include "searchlistdelegate.h" #include "mainwindow.h" #include "iconprovider.h" diff --git a/src/searchengine/searchlistdelegate.h b/src/searchengine/searchlistdelegate.h index 98a55d085..ad07963c0 100644 --- a/src/searchengine/searchlistdelegate.h +++ b/src/searchengine/searchlistdelegate.h @@ -36,7 +36,7 @@ #include #include #include -#include "misc.h" +#include "core/misc.h" #include "searchengine.h" class SearchListDelegate: public QItemDelegate { diff --git a/src/searchengine/searchsortmodel.h b/src/searchengine/searchsortmodel.h index 7692128f3..bb5817b2a 100644 --- a/src/searchengine/searchsortmodel.h +++ b/src/searchengine/searchsortmodel.h @@ -2,7 +2,7 @@ #define SEARCHSORTMODEL_H #include -#include "misc.h" +#include "core/misc.h" class SearchSortModel : public QSortFilterProxyModel { Q_OBJECT diff --git a/src/searchengine/searchtab.cpp b/src/searchengine/searchtab.cpp index 558ee03d6..63ac09fc3 100644 --- a/src/searchengine/searchtab.cpp +++ b/src/searchengine/searchtab.cpp @@ -36,9 +36,9 @@ #include "searchtab.h" #include "searchlistdelegate.h" -#include "misc.h" +#include "core/misc.h" #include "searchengine.h" -#include "preferences.h" +#include "core/preferences.h" SearchTab::SearchTab(SearchEngine *parent) : QWidget(), parent(parent) { diff --git a/src/searchengine/supportedengines.h b/src/searchengine/supportedengines.h index 62c568d3b..e453f6b5a 100644 --- a/src/searchengine/supportedengines.h +++ b/src/searchengine/supportedengines.h @@ -41,8 +41,8 @@ #include #include -#include "fs_utils.h" -#include "preferences.h" +#include "core/fs_utils.h" +#include "core/preferences.h" class SearchCategories: public QObject, public QHash { Q_OBJECT diff --git a/src/webui/abstractwebapplication.cpp b/src/webui/abstractwebapplication.cpp index b325b7d8c..0adefc450 100644 --- a/src/webui/abstractwebapplication.cpp +++ b/src/webui/abstractwebapplication.cpp @@ -35,7 +35,7 @@ #include #include -#include "preferences.h" +#include "core/preferences.h" #include "websessiondata.h" #include "abstractwebapplication.h" diff --git a/src/webui/abstractwebapplication.h b/src/webui/abstractwebapplication.h index bac977fca..152a39f8a 100644 --- a/src/webui/abstractwebapplication.h +++ b/src/webui/abstractwebapplication.h @@ -32,9 +32,9 @@ #include #include #include -#include "http/types.h" -#include "http/responsebuilder.h" -#include "http/irequesthandler.h" +#include "core/http/types.h" +#include "core/http/responsebuilder.h" +#include "core/http/irequesthandler.h" struct WebSession; struct WebSessionData; diff --git a/src/webui/btjson.cpp b/src/webui/btjson.cpp index d74f97033..f682a4af2 100644 --- a/src/webui/btjson.cpp +++ b/src/webui/btjson.cpp @@ -29,9 +29,9 @@ */ #include "btjson.h" -#include "fs_utils.h" +#include "core/fs_utils.h" #include "qbtsession.h" -#include "torrentpersistentdata.h" +#include "core/torrentpersistentdata.h" #include "qtorrentfilter.h" #include "jsonutils.h" diff --git a/src/webui/prefjson.cpp b/src/webui/prefjson.cpp index e5e0709a3..02ac99d87 100644 --- a/src/webui/prefjson.cpp +++ b/src/webui/prefjson.cpp @@ -29,10 +29,10 @@ */ #include "prefjson.h" -#include "preferences.h" +#include "core/preferences.h" #include "qbtsession.h" -#include "scannedfoldersmodel.h" -#include "fs_utils.h" +#include "core/scannedfoldersmodel.h" +#include "core/fs_utils.h" #include #ifndef QT_NO_OPENSSL diff --git a/src/webui/qtorrentfilter.cpp b/src/webui/qtorrentfilter.cpp index 8a661bb6f..5cd62d531 100644 --- a/src/webui/qtorrentfilter.cpp +++ b/src/webui/qtorrentfilter.cpp @@ -26,7 +26,7 @@ * exception statement from your version. */ -#include "torrentpersistentdata.h" +#include "core/torrentpersistentdata.h" #include "qtorrentfilter.h" QTorrentFilter::QTorrentFilter(QString filter, QString label) diff --git a/src/webui/webapplication.cpp b/src/webui/webapplication.cpp index 90adb1519..92a55f179 100644 --- a/src/webui/webapplication.cpp +++ b/src/webui/webapplication.cpp @@ -37,9 +37,9 @@ // TODO: Drop GUI dependency! #include "iconprovider.h" #endif -#include "misc.h" -#include "fs_utils.h" -#include "preferences.h" +#include "core/misc.h" +#include "core/fs_utils.h" +#include "core/preferences.h" #include "btjson.h" #include "prefjson.h" #include "qbtsession.h" diff --git a/src/webui/webui.cpp b/src/webui/webui.cpp index 723675ab2..244f345d8 100644 --- a/src/webui/webui.cpp +++ b/src/webui/webui.cpp @@ -27,11 +27,11 @@ */ #include "webui.h" -#include "http/server.h" +#include "core/http/server.h" #include "webapplication.h" #include "core/net/dnsupdater.h" -#include "preferences.h" -#include "logger.h" +#include "core/preferences.h" +#include "core/logger.h" WebUI::WebUI(QObject *parent) : QObject(parent) {