Rename Core to Base (Closes #3733).

src/gui/about_imp.h

@@ -36,7 +36,7 @@
 #include <QtGlobal>
 #include <libtorrent/version.hpp>
 #include <boost/version.hpp>
-#include "core/unicodestrings.h"
+#include "base/unicodestrings.h"
 
 class about : public QDialog, private Ui::AboutDlg{
   Q_OBJECT

src/gui/addnewtorrentdialog.cpp

@@ -35,16 +35,16 @@
 #include <QMenu>
 #include <QFileDialog>
 
-#include "core/preferences.h"
-#include "core/net/downloadmanager.h"
-#include "core/net/downloadhandler.h"
-#include "core/bittorrent/session.h"
-#include "core/bittorrent/magneturi.h"
-#include "core/bittorrent/torrentinfo.h"
-#include "core/bittorrent/torrenthandle.h"
-#include "core/utils/fs.h"
-#include "core/utils/misc.h"
-#include "core/unicodestrings.h"
+#include "base/preferences.h"
+#include "base/net/downloadmanager.h"
+#include "base/net/downloadhandler.h"
+#include "base/bittorrent/session.h"
+#include "base/bittorrent/magneturi.h"
+#include "base/bittorrent/torrentinfo.h"
+#include "base/bittorrent/torrenthandle.h"
+#include "base/utils/fs.h"
+#include "base/utils/misc.h"
+#include "base/unicodestrings.h"
 #include "guiiconprovider.h"
 #include "autoexpandabledialog.h"
 #include "messageboxraised.h"

src/gui/addnewtorrentdialog.h

@@ -35,8 +35,8 @@
 #include <QDialog>
 #include <QUrl>
 
-#include "core/bittorrent/infohash.h"
-#include "core/bittorrent/torrentinfo.h"
+#include "base/bittorrent/infohash.h"
+#include "base/bittorrent/torrentinfo.h"
 
 QT_BEGIN_NAMESPACE
 namespace Ui {

src/gui/advancedsettings.h

@@ -10,7 +10,7 @@
 #include <QComboBox>
 #include <QNetworkInterface>
 
-#include "core/preferences.h"
+#include "base/preferences.h"
 
 enum AdvSettingsCols
 {

src/gui/deletionconfirmationdlg.h

@@ -34,9 +34,9 @@
 #include <QDialog>
 #include <QPushButton>
 #include "ui_confirmdeletiondlg.h"
-#include "core/preferences.h"
+#include "base/preferences.h"
 #include "guiiconprovider.h"
-#include "core/utils/misc.h"
+#include "base/utils/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 "core/logger.h"
+#include "base/logger.h"
 #include "guiiconprovider.h"
 #include "loglistwidget.h"
 

src/gui/guiiconprovider.cpp

@@ -28,7 +28,7 @@
  */
 
 #include "guiiconprovider.h"
-#include "core/preferences.h"
+#include "base/preferences.h"
 
 #include <QIcon>
 #if (defined(Q_OS_UNIX) && !defined(Q_OS_MAC))

src/gui/guiiconprovider.h

@@ -30,7 +30,7 @@
 #ifndef GUIICONPROVIDER_H
 #define GUIICONPROVIDER_H
 
-#include "core/iconprovider.h"
+#include "base/iconprovider.h"
 
 class QIcon;
 

src/gui/mainwindow.cpp

@@ -49,20 +49,20 @@
 
 #include "mainwindow.h"
 #include "transferlistwidget.h"
-#include "core/utils/misc.h"
+#include "base/utils/misc.h"
 #include "torrentcreatordlg.h"
 #include "downloadfromurldlg.h"
 #include "addnewtorrentdialog.h"
 #include "searchengine.h"
 #include "rss_imp.h"
-#include "core/bittorrent/session.h"
-#include "core/bittorrent/sessionstatus.h"
-#include "core/bittorrent/torrenthandle.h"
+#include "base/bittorrent/session.h"
+#include "base/bittorrent/sessionstatus.h"
+#include "base/bittorrent/torrenthandle.h"
 #include "about_imp.h"
 #include "trackerlogin.h"
 #include "options_imp.h"
 #include "speedlimitdlg.h"
-#include "core/preferences.h"
+#include "base/preferences.h"
 #include "trackerlist.h"
 #include "peerlistwidget.h"
 #include "transferlistfilterswidget.h"
@@ -73,7 +73,7 @@
 #include "torrentmodel.h"
 #include "executionlog.h"
 #include "guiiconprovider.h"
-#include "core/logger.h"
+#include "base/logger.h"
 #include "autoexpandabledialog.h"
 #ifdef Q_OS_MAC
 void qt_mac_set_dock_menu(QMenu *menu);
@@ -85,8 +85,8 @@ void qt_mac_set_dock_menu(QMenu *menu);
 #endif
 #include "powermanagement.h"
 #ifdef Q_OS_WIN
-#include "core/net/downloadmanager.h"
-#include "core/net/downloadhandler.h"
+#include "base/net/downloadmanager.h"
+#include "base/net/downloadhandler.h"
 #endif
 
 #define TIME_TRAY_BALLOON 5000

src/gui/options_imp.cpp

@@ -42,14 +42,14 @@
 
 #include <cstdlib>
 #include "options_imp.h"
-#include "core/preferences.h"
-#include "core/utils/fs.h"
+#include "base/preferences.h"
+#include "base/utils/fs.h"
 #include "advancedsettings.h"
-#include "core/scanfoldersmodel.h"
-#include "core/bittorrent/session.h"
+#include "base/scanfoldersmodel.h"
+#include "base/bittorrent/session.h"
 #include "guiiconprovider.h"
-#include "core/net/dnsupdater.h"
-#include "core/unicodestrings.h"
+#include "base/net/dnsupdater.h"
+#include "base/unicodestrings.h"
 
 #ifndef QT_NO_OPENSSL
 #include <QSslKey>

src/gui/previewlistdelegate.h

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

src/gui/previewselect.cpp

@@ -36,11 +36,11 @@
 #include <QTableView>
 #endif
 
-#include "core/utils/misc.h"
+#include "base/utils/misc.h"
 #include "previewlistdelegate.h"
 #include "previewselect.h"
-#include "core/utils/fs.h"
-#include "core/preferences.h"
+#include "base/utils/fs.h"
+#include "base/preferences.h"
 
 PreviewSelect::PreviewSelect(QWidget* parent, BitTorrent::TorrentHandle *const torrent)
     : QDialog(parent)

src/gui/previewselect.h

@@ -34,7 +34,7 @@
 #include <QDialog>
 #include <QList>
 #include "ui_preview.h"
-#include "core/bittorrent/torrenthandle.h"
+#include "base/bittorrent/torrenthandle.h"
 
 class PreviewListDelegate;
 

src/gui/programupdater.cpp

@@ -39,8 +39,8 @@
 #include <QStringList>
 
 #include "programupdater.h"
-#include "core/utils/fs.h"
-#include "core/preferences.h"
+#include "base/utils/fs.h"
+#include "base/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,8 +33,8 @@
 
 #include <QItemDelegate>
 #include <QPainter>
-#include "core/utils/misc.h"
-#include "core/utils/string.h"
+#include "base/utils/misc.h"
+#include "base/utils/string.h"
 
 class PeerListDelegate: public QItemDelegate {
   Q_OBJECT

src/gui/properties/peerlistwidget.cpp

@@ -36,14 +36,14 @@
 #include <QClipboard>
 #include <QMessageBox>
 
-#include "core/net/reverseresolution.h"
-#include "core/bittorrent/torrenthandle.h"
-#include "core/bittorrent/peerinfo.h"
-#include "core/preferences.h"
-#include "core/logger.h"
-#include "core/unicodestrings.h"
+#include "base/net/reverseresolution.h"
+#include "base/bittorrent/torrenthandle.h"
+#include "base/bittorrent/peerinfo.h"
+#include "base/preferences.h"
+#include "base/logger.h"
+#include "base/unicodestrings.h"
 #include "propertieswidget.h"
-#include "core/net/geoipmanager.h"
+#include "base/net/geoipmanager.h"
 #include "peersadditiondlg.h"
 #include "speedlimitdlg.h"
 #include "guiiconprovider.h"

src/gui/properties/peersadditiondlg.h

@@ -33,7 +33,7 @@
 
 #include <QDialog>
 
-#include "core/bittorrent/peerinfo.h"
+#include "base/bittorrent/peerinfo.h"
 #include "ui_peersadditiondlg.h"
 
 class PeersAdditionDlg: public QDialog, private Ui::addPeersDialog

src/gui/properties/propertieswidget.cpp

@@ -41,12 +41,12 @@
 #include <QFileDialog>
 #include <QBitArray>
 
-#include "core/bittorrent/session.h"
-#include "core/preferences.h"
-#include "core/utils/fs.h"
-#include "core/utils/misc.h"
-#include "core/utils/string.h"
-#include "core/unicodestrings.h"
+#include "base/bittorrent/session.h"
+#include "base/preferences.h"
+#include "base/utils/fs.h"
+#include "base/utils/misc.h"
+#include "base/utils/string.h"
+#include "base/unicodestrings.h"
 #include "proplistdelegate.h"
 #include "torrentcontentfiltermodel.h"
 #include "torrentcontentmodel.h"

src/gui/properties/propertieswidget.h

@@ -34,7 +34,7 @@
 #include <QShortcut>
 #include <QWidget>
 #include "ui_propertieswidget.h"
-#include "core/bittorrent/torrenthandle.h"
+#include "base/bittorrent/torrenthandle.h"
 
 
 class TransferListWidget;

src/gui/properties/proplistdelegate.cpp

@@ -45,8 +45,8 @@
 #endif
 #endif
 
-#include "core/utils/misc.h"
-#include "core/utils/string.h"
+#include "base/utils/misc.h"
+#include "base/utils/string.h"
 #include "propertieswidget.h"
 #include "proplistdelegate.h"
 #include "torrentcontentmodelitem.h"

src/gui/properties/speedplotview.cpp

@@ -30,7 +30,7 @@
 
 #include <QPainter>
 #include <QPen>
-#include "core/utils/misc.h"
+#include "base/utils/misc.h"
 
 SpeedPlotView::SpeedPlotView(QWidget *parent)
     : QGraphicsView(parent)

src/gui/properties/speedwidget.cpp

@@ -37,10 +37,10 @@
 #include <libtorrent/session_status.hpp>
 
 #include "propertieswidget.h"
-#include "core/bittorrent/session.h"
-#include "core/bittorrent/sessionstatus.h"
-#include "core/preferences.h"
-#include "core/utils/misc.h"
+#include "base/bittorrent/session.h"
+#include "base/bittorrent/sessionstatus.h"
+#include "base/preferences.h"
+#include "base/utils/misc.h"
 
 ComboBoxMenuButton::ComboBoxMenuButton(QWidget *parent, QMenu *menu)
     : QComboBox(parent)

src/gui/properties/trackerlist.cpp

@@ -42,12 +42,12 @@
 #include <QHeaderView>
 #endif
 
-#include "core/bittorrent/session.h"
-#include "core/bittorrent/torrenthandle.h"
-#include "core/bittorrent/peerinfo.h"
-#include "core/bittorrent/trackerentry.h"
-#include "core/preferences.h"
-#include "core/utils/misc.h"
+#include "base/bittorrent/session.h"
+#include "base/bittorrent/torrenthandle.h"
+#include "base/bittorrent/peerinfo.h"
+#include "base/bittorrent/trackerentry.h"
+#include "base/preferences.h"
+#include "base/utils/misc.h"
 #include "propertieswidget.h"
 #include "trackersadditiondlg.h"
 #include "guiiconprovider.h"

src/gui/properties/trackersadditiondlg.cpp

@@ -33,12 +33,12 @@
 #include <QFile>
 #include <QUrl>
 
-#include "core/utils/misc.h"
-#include "core/utils/fs.h"
-#include "core/net/downloadmanager.h"
-#include "core/net/downloadhandler.h"
-#include "core/bittorrent/trackerentry.h"
-#include "core/bittorrent/torrenthandle.h"
+#include "base/utils/misc.h"
+#include "base/utils/fs.h"
+#include "base/net/downloadmanager.h"
+#include "base/net/downloadhandler.h"
+#include "base/bittorrent/trackerentry.h"
+#include "base/bittorrent/torrenthandle.h"
 #include "guiiconprovider.h"
 #include "trackersadditiondlg.h"
 

src/gui/rss/automatedrssdownloader.cpp

@@ -37,13 +37,13 @@
 #include "automatedrssdownloader.h"
 #include "ui_automatedrssdownloader.h"
 #include "rssdownloadrulelist.h"
-#include "core/preferences.h"
+#include "base/preferences.h"
 #include "rssmanager.h"
 #include "rssfeed.h"
 #include "guiiconprovider.h"
 #include "autoexpandabledialog.h"
-#include "core/utils/fs.h"
-#include "core/utils/string.h"
+#include "base/utils/fs.h"
+#include "base/utils/string.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 "core/utils/fs.h"
+#include "base/utils/fs.h"
 
 HtmlBrowser::HtmlBrowser(QWidget* parent)
     : QTextBrowser(parent)

src/gui/rss/rss_imp.cpp

@@ -39,10 +39,10 @@
 
 #include "rss_imp.h"
 #include "feedlistwidget.h"
-#include "core/bittorrent/session.h"
-#include "core/net/downloadmanager.h"
+#include "base/bittorrent/session.h"
+#include "base/net/downloadmanager.h"
 #include "cookiesdlg.h"
-#include "core/preferences.h"
+#include "base/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 "core/preferences.h"
+#include "base/preferences.h"
 #include "rssfeed.h"
 #include "rssarticle.h"
-#include "core/utils/fs.h"
+#include "base/utils/fs.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 "core/preferences.h"
-#include "core/qinisettings.h"
+#include "base/preferences.h"
+#include "base/qinisettings.h"
 
 RssDownloadRuleList::RssDownloadRuleList()
 {

src/gui/rss/rssfeed.cpp

@@ -31,19 +31,19 @@
 #include <QDebug>
 #include "rssfeed.h"
 #include "rssmanager.h"
-#include "core/bittorrent/session.h"
-#include "core/bittorrent/magneturi.h"
+#include "base/bittorrent/session.h"
+#include "base/bittorrent/magneturi.h"
 #include "rssfolder.h"
-#include "core/preferences.h"
-#include "core/qinisettings.h"
+#include "base/preferences.h"
+#include "base/qinisettings.h"
 #include "rssarticle.h"
 #include "rssparser.h"
-#include "core/utils/misc.h"
+#include "base/utils/misc.h"
 #include "rssdownloadrulelist.h"
-#include "core/net/downloadmanager.h"
-#include "core/net/downloadhandler.h"
-#include "core/utils/fs.h"
-#include "core/logger.h"
+#include "base/net/downloadmanager.h"
+#include "base/net/downloadhandler.h"
+#include "base/utils/fs.h"
+#include "base/logger.h"
 
 bool rssArticleDateRecentThan(const RssArticlePtr& left, const RssArticlePtr& right)
 {

src/gui/rss/rssfolder.cpp

@@ -33,7 +33,7 @@
 #include "guiiconprovider.h"
 #include "rssfolder.h"
 #include "rssarticle.h"
-#include "core/bittorrent/session.h"
+#include "base/bittorrent/session.h"
 #include "rssmanager.h"
 #include "rssfeed.h"
 

src/gui/rss/rssmanager.cpp

@@ -30,8 +30,8 @@
 
 #include <QDebug>
 #include "rssmanager.h"
-#include "core/preferences.h"
-#include "core/bittorrent/session.h"
+#include "base/preferences.h"
+#include "base/bittorrent/session.h"
 #include "rssfeed.h"
 #include "rssarticle.h"
 #include "rssdownloadrulelist.h"

src/gui/rss/rssparser.cpp

@@ -29,7 +29,7 @@
  */
 
 #include "rssparser.h"
-#include "core/utils/fs.h"
+#include "base/utils/fs.h"
 
 #include <QDebug>
 #include <QFile>

src/gui/rss/rsssettingsdlg.cpp

@@ -30,7 +30,7 @@
 
 #include "rsssettingsdlg.h"
 #include "ui_rsssettingsdlg.h"
-#include "core/preferences.h"
+#include "base/preferences.h"
 
 RssSettingsDlg::RssSettingsDlg(QWidget *parent) :
   QDialog(parent),

src/gui/shutdownconfirm.cpp

@@ -30,7 +30,7 @@
  * Contact : hammered999@gmail.com
  */
 
-#include "core/types.h"
+#include "base/types.h"
 #include "shutdownconfirm.h"
 
 #include <QPushButton>

src/gui/shutdownconfirm.h

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

src/gui/speedlimitdlg.cpp

@@ -29,7 +29,7 @@
  */
 
 #include "speedlimitdlg.h"
-#include "core/unicodestrings.h"
+#include "base/unicodestrings.h"
 
 SpeedLimitDialog::SpeedLimitDialog(QWidget *parent): QDialog(parent)
 {

src/gui/speedlimitdlg.h

@@ -34,8 +34,8 @@
 #include <QDialog>
 #include <QList>
 #include "ui_bandwidth_limit.h"
-#include "core/utils/misc.h"
-#include "core/bittorrent/session.h"
+#include "base/utils/misc.h"
+#include "base/bittorrent/session.h"
 
 class SpeedLimitDialog : public QDialog, private Ui_bandwidth_dlg {
     Q_OBJECT

src/gui/statsdialog.cpp

@@ -31,12 +31,12 @@
 #include "statsdialog.h"
 #include "ui_statsdialog.h"
 
-#include "core/utils/misc.h"
-#include "core/utils/string.h"
-#include "core/bittorrent/session.h"
-#include "core/bittorrent/sessionstatus.h"
-#include "core/bittorrent/cachestatus.h"
-#include "core/bittorrent/torrenthandle.h"
+#include "base/utils/misc.h"
+#include "base/utils/string.h"
+#include "base/bittorrent/session.h"
+#include "base/bittorrent/sessionstatus.h"
+#include "base/bittorrent/cachestatus.h"
+#include "base/bittorrent/torrenthandle.h"
 
 StatsDialog::StatsDialog(QWidget *parent)
     : QDialog(parent)

src/gui/statusbar.cpp

@@ -33,13 +33,13 @@
 #include <QFontMetrics>
 #include <QDebug>
 
-#include "core/bittorrent/session.h"
-#include "core/bittorrent/sessionstatus.h"
+#include "base/bittorrent/session.h"
+#include "base/bittorrent/sessionstatus.h"
 #include "speedlimitdlg.h"
 #include "guiiconprovider.h"
-#include "core/preferences.h"
-#include "core/utils/misc.h"
-#include "core/logger.h"
+#include "base/preferences.h"
+#include "base/utils/misc.h"
+#include "base/logger.h"
 
 StatusBar::StatusBar(QStatusBar *bar)
   : m_bar(bar)

src/gui/torrentcontentfiltermodel.cpp

@@ -28,7 +28,7 @@
  * Contact : chris@qbittorrent.org
  */
 
-#include "core/utils/string.h"
+#include "base/utils/string.h"
 #include "torrentcontentfiltermodel.h"
 #include "torrentcontentmodel.h"
 

src/gui/torrentcontentmodel.cpp

@@ -32,8 +32,8 @@
 #include <QIcon>
 
 #include "guiiconprovider.h"
-#include "core/utils/misc.h"
-#include "core/utils/fs.h"
+#include "base/utils/misc.h"
+#include "base/utils/fs.h"
 #include "torrentcontentmodel.h"
 #include "torrentcontentmodelitem.h"
 #include "torrentcontentmodelfolder.h"

src/gui/torrentcontentmodel.h

@@ -36,7 +36,7 @@
 #include <QVector>
 #include <QVariant>
 
-#include "core/bittorrent/torrentinfo.h"
+#include "base/bittorrent/torrentinfo.h"
 #include "torrentcontentmodelitem.h"
 
 class TorrentContentModelFile;

src/gui/torrentcontentmodelitem.cpp

@@ -28,8 +28,8 @@
  * Contact : chris@qbittorrent.org
  */
 
-#include "core/utils/misc.h"
-#include "core/utils/fs.h"
+#include "base/utils/misc.h"
+#include "base/utils/fs.h"
 #include "torrentcontentmodelitem.h"
 #include "torrentcontentmodelfolder.h"
 #include <QDebug>

src/gui/torrentcreatordlg.cpp

@@ -33,13 +33,13 @@
 #include <QMessageBox>
 
 #include "torrentcreatordlg.h"
-#include "core/utils/fs.h"
-#include "core/utils/misc.h"
-#include "core/preferences.h"
+#include "base/utils/fs.h"
+#include "base/utils/misc.h"
+#include "base/preferences.h"
 #include "guiiconprovider.h"
-#include "core/bittorrent/session.h"
-#include "core/bittorrent/torrentinfo.h"
-#include "core/bittorrent/torrentcreatorthread.h"
+#include "base/bittorrent/session.h"
+#include "base/bittorrent/torrentinfo.h"
+#include "base/bittorrent/torrentcreatorthread.h"
 
 const uint NB_PIECES_MIN = 1200;
 const uint NB_PIECES_MAX = 2200;

src/gui/torrentimportdlg.cpp

@@ -34,11 +34,11 @@
 
 #include "torrentimportdlg.h"
 #include "ui_torrentimportdlg.h"
-#include "core/preferences.h"
-#include "core/bittorrent/infohash.h"
-#include "core/bittorrent/session.h"
+#include "base/preferences.h"
+#include "base/bittorrent/infohash.h"
+#include "base/bittorrent/session.h"
 #include "guiiconprovider.h"
-#include "core/utils/fs.h"
+#include "base/utils/fs.h"
 
 TorrentImportDlg::TorrentImportDlg(QWidget *parent):
     QDialog(parent),

src/gui/torrentimportdlg.h

@@ -34,7 +34,7 @@
 #include <QDialog>
 #include <QStringList>
 
-#include "core/bittorrent/torrentinfo.h"
+#include "base/bittorrent/torrentinfo.h"
 
 namespace Ui
 {

src/gui/torrentmodel.cpp

@@ -34,10 +34,10 @@
 #include <QPalette>
 #include <QIcon>
 
-#include "core/bittorrent/session.h"
-#include "core/bittorrent/torrenthandle.h"
-#include "core/torrentfilter.h"
-#include "core/utils/fs.h"
+#include "base/bittorrent/session.h"
+#include "base/bittorrent/torrenthandle.h"
+#include "base/torrentfilter.h"
+#include "base/utils/fs.h"
 #include "torrentmodel.h"
 
 static QIcon getIconByState(BitTorrent::TorrentState state);

src/gui/trackerlogin.cpp

@@ -28,7 +28,7 @@
  * Contact : chris@qbittorrent.org
  */
 
-#include "core/bittorrent/torrenthandle.h"
+#include "base/bittorrent/torrenthandle.h"
 #include "trackerlogin.h"
 
 trackerLogin::trackerLogin(QWidget *parent, BitTorrent::TorrentHandle *const torrent)

src/gui/transferlistdelegate.cpp

@@ -34,12 +34,12 @@
 #include <QStyleOptionViewItemV2>
 #include <QApplication>
 #include <QPainter>
-#include "core/utils/misc.h"
-#include "core/utils/string.h"
+#include "base/utils/misc.h"
+#include "base/utils/string.h"
 #include "torrentmodel.h"
-#include "core/bittorrent/session.h"
-#include "core/bittorrent/torrenthandle.h"
-#include "core/unicodestrings.h"
+#include "base/bittorrent/session.h"
+#include "base/bittorrent/torrenthandle.h"
+#include "base/unicodestrings.h"
 
 #ifdef Q_OS_WIN
 #ifndef QBT_USES_QT5

src/gui/transferlistfilterswidget.cpp

@@ -41,20 +41,20 @@
 
 #include "transferlistdelegate.h"
 #include "transferlistwidget.h"
-#include "core/preferences.h"
+#include "base/preferences.h"
 #include "torrentmodel.h"
 #include "guiiconprovider.h"
-#include "core/utils/fs.h"
-#include "core/utils/string.h"
+#include "base/utils/fs.h"
+#include "base/utils/string.h"
 #include "autoexpandabledialog.h"
-#include "core/torrentfilter.h"
-#include "core/bittorrent/trackerentry.h"
-#include "core/bittorrent/session.h"
-#include "core/bittorrent/torrenthandle.h"
-#include "core/net/downloadmanager.h"
-#include "core/net/downloadhandler.h"
-#include "core/utils/misc.h"
-#include "core/logger.h"
+#include "base/torrentfilter.h"
+#include "base/bittorrent/trackerentry.h"
+#include "base/bittorrent/session.h"
+#include "base/bittorrent/torrenthandle.h"
+#include "base/net/downloadmanager.h"
+#include "base/net/downloadhandler.h"
+#include "base/utils/misc.h"
+#include "base/logger.h"
 
 FiltersBase::FiltersBase(QWidget *parent, TransferListWidget *transferList)
     : QListWidget(parent)

src/gui/transferlistsortmodel.cpp

@@ -30,9 +30,9 @@
 
 #include <QStringList>
 
-#include "core/types.h"
-#include "core/utils/string.h"
-#include "core/bittorrent/torrenthandle.h"
+#include "base/types.h"
+#include "base/utils/string.h"
+#include "base/bittorrent/torrenthandle.h"
 #include "torrentmodel.h"
 #include "transferlistsortmodel.h"
 

src/gui/transferlistsortmodel.h

@@ -32,7 +32,7 @@
 #define TRANSFERLISTSORTMODEL_H
 
 #include <QSortFilterProxyModel>
-#include "core/torrentfilter.h"
+#include "base/torrentfilter.h"
 
 class QStringList;
 

src/gui/transferlistwidget.cpp

@@ -45,21 +45,21 @@
 #endif
 
 #include "transferlistwidget.h"
-#include "core/bittorrent/session.h"
-#include "core/bittorrent/torrenthandle.h"
-#include "core/torrentfilter.h"
+#include "base/bittorrent/session.h"
+#include "base/bittorrent/torrenthandle.h"
+#include "base/torrentfilter.h"
 #include "transferlistdelegate.h"
 #include "previewselect.h"
 #include "speedlimitdlg.h"
 #include "updownratiodlg.h"
 #include "options_imp.h"
 #include "mainwindow.h"
-#include "core/preferences.h"
+#include "base/preferences.h"
 #include "torrentmodel.h"
 #include "deletionconfirmationdlg.h"
 #include "propertieswidget.h"
 #include "guiiconprovider.h"
-#include "core/utils/fs.h"
+#include "base/utils/fs.h"
 #include "autoexpandabledialog.h"
 #include "transferlistsortmodel.h"
 

src/gui/updownratiodlg.cpp

@@ -31,7 +31,7 @@
 #include "updownratiodlg.h"
 #include "ui_updownratiodlg.h"
 
-#include "core/preferences.h"
+#include "base/preferences.h"
 
 UpDownRatioDlg::UpDownRatioDlg(bool useDefault, qreal initialValue,
     qreal maxValue, QWidget *parent)