Don't add core to INCLUDEPATH.

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"
 

src/gui/advancedsettings.h

@@ -10,7 +10,7 @@
 #include <QComboBox>
 #include <QNetworkInterface>
 #include <libtorrent/version.hpp>
-#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,

src/gui/deletionconfirmationdlg.h

@@ -34,9 +34,9 @@
 #include <QDialog>
 #include <QPushButton>
 #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

src/gui/executionlog.cpp

@@ -35,7 +35,7 @@
 #include <QPalette>
 #include "executionlog.h"
 #include "ui_executionlog.h"
-#include "logger.h"
+#include "core/logger.h"
 #include "iconprovider.h"
 #include "loglistwidget.h"
 

src/gui/geoip/geoipmanager.cpp

@@ -64,7 +64,7 @@
 #include <QFile>
 #include <QChar>
 
-#include "fs_utils.h"
+#include "core/fs_utils.h"
 #include <libtorrent/session.hpp>
 
 using namespace libtorrent;

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 <QDir>

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 <libtorrent/session.hpp>

src/gui/options_imp.cpp

@@ -42,10 +42,10 @@
 #include <libtorrent/version.hpp>
 
 #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"

src/gui/previewlistdelegate.h

@@ -37,7 +37,7 @@
 #include <QModelIndex>
 #include <QPainter>
 #include <QApplication>
-#include "misc.h"
+#include "core/misc.h"
 #include "previewselect.h"
 
 #ifdef Q_OS_WIN

src/gui/previewselect.cpp

@@ -36,11 +36,11 @@
 #include <libtorrent/version.hpp>
 #include <libtorrent/session.hpp>
 
-#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);

src/gui/programupdater.cpp

@@ -39,8 +39,8 @@
 #include <QStringList>
 
 #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");

src/gui/properties/peerlistdelegate.h

@@ -33,7 +33,7 @@
 
 #include <QItemDelegate>
 #include <QPainter>
-#include "misc.h"
+#include "core/misc.h"
 
 class PeerListDelegate: public QItemDelegate {
   Q_OBJECT

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 <QStandardItemModel>
 #include <QSortFilterProxyModel>
 #include <QSet>

src/gui/properties/propertieswidget.cpp

@@ -43,7 +43,7 @@
 #include <libtorrent/version.hpp>
 #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;

src/gui/properties/proplistdelegate.h

@@ -40,7 +40,7 @@
 #include <QPainter>
 #include <QProgressBar>
 #include <QApplication>
-#include "misc.h"
+#include "core/misc.h"
 #include "propertieswidget.h"
 
 #ifdef Q_OS_WIN

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;

src/gui/properties/trackersadditiondlg.h

@@ -37,11 +37,11 @@
 #include <QFile>
 #include <QUrl>
 #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

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<RssManager>& manager, QWidget *parent) :
   QDialog(parent),

src/gui/rss/htmlbrowser.cpp

@@ -10,7 +10,7 @@
 #include <QDateTime>
 #include <QScrollBar>
 
-#include "fs_utils.h"
+#include "core/fs_utils.h"
 
 HtmlBrowser::HtmlBrowser(QWidget* parent)
     : QTextBrowser(parent)

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"

src/gui/rss/rssdownloadrule.cpp

@@ -33,10 +33,10 @@
 #include <QDir>
 
 #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)
 {

src/gui/rss/rssdownloadrulelist.cpp

@@ -33,8 +33,8 @@
 #include <QDebug>
 
 #include "rssdownloadrulelist.h"
-#include "preferences.h"
-#include "qinisettings.h"
+#include "core/preferences.h"
+#include "core/qinisettings.h"
 
 RssDownloadRuleList::RssDownloadRuleList()
 {

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)
 {

src/gui/rss/rssmanager.cpp

@@ -30,13 +30,13 @@
 
 #include <QDebug>
 #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;
 

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 <QDebug>
 #include <QFile>
 #include <QRegExp>

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),

src/gui/shutdownconfirm.h

@@ -33,7 +33,7 @@
 
 #include <QMessageBox>
 #include <QTimer>
-#include "misc.h"
+#include "core/misc.h"
 
 class ShutdownConfirmDlg : public QMessageBox
 {

src/gui/speedlimitdlg.h

@@ -34,7 +34,7 @@
 #include <QDialog>
 #include <QList>
 #include "ui_bandwidth_limit.h"
-#include "misc.h"
+#include "core/misc.h"
 #include "qbtsession.h"
 
 class SpeedLimitDialog : public QDialog, private Ui_bandwidth_dlg {

src/gui/statsdialog.cpp

@@ -31,7 +31,7 @@
 #include "statsdialog.h"
 #include "ui_statsdialog.h"
 
-#include "misc.h"
+#include "core/misc.h"
 #include <libtorrent/session.hpp>
 #include <libtorrent/disk_io_thread.hpp>
 

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 <libtorrent/session.hpp>
 #include <libtorrent/session_status.hpp>

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"

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,

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 <QDebug>

src/gui/torrentcreator/torrentcreatordlg.cpp

@@ -32,11 +32,11 @@
 #include <QFileDialog>
 #include <QMessageBox>
 
-#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"

src/gui/torrentcreator/torrentcreatorthread.cpp

@@ -41,8 +41,8 @@
 #include <QDir>
 
 #include "torrentcreatorthread.h"
-#include "fs_utils.h"
-#include "misc.h"
+#include "core/fs_utils.h"
+#include "core/misc.h"
 
 #include <boost/bind.hpp>
 #include <iostream>

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;
 

src/gui/torrentmodel.cpp

@@ -33,9 +33,9 @@
 #include <QPalette>
 
 #include "torrentmodel.h"
-#include "torrentpersistentdata.h"
+#include "core/torrentpersistentdata.h"
 #include "qbtsession.h"
-#include "fs_utils.h"
+#include "core/fs_utils.h"
 
 #include <libtorrent/session.hpp>
 

src/gui/transferlistdelegate.cpp

@@ -34,7 +34,7 @@
 #include <QStyleOptionViewItemV2>
 #include <QApplication>
 #include <QPainter>
-#include "misc.h"
+#include "core/misc.h"
 #include "torrentmodel.h"
 #include "qbtsession.h"
 

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)

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)

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"
 

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)