Merge pull request #3860 from glassez/base

Rename Core to Base (Closes #3733).

src/app/application.cpp

@@ -58,17 +58,17 @@
 #endif
 
 #include "application.h"
-#include "core/logger.h"
+#include "base/logger.h"
-#include "core/preferences.h"
+#include "base/preferences.h"
-#include "core/utils/fs.h"
+#include "base/utils/fs.h"
-#include "core/utils/misc.h"
+#include "base/utils/misc.h"
-#include "core/iconprovider.h"
+#include "base/iconprovider.h"
-#include "core/scanfoldersmodel.h"
+#include "base/scanfoldersmodel.h"
-#include "core/net/smtp.h"
+#include "base/net/smtp.h"
-#include "core/net/downloadmanager.h"
+#include "base/net/downloadmanager.h"
-#include "core/net/geoipmanager.h"
+#include "base/net/geoipmanager.h"
-#include "core/bittorrent/session.h"
+#include "base/bittorrent/session.h"
-#include "core/bittorrent/torrenthandle.h"
+#include "base/bittorrent/torrenthandle.h"
 
 static const char PARAMS_SEPARATOR[] = "|";
 

src/app/application.h

@@ -50,7 +50,7 @@ QT_END_NAMESPACE
 typedef QtSingleCoreApplication BaseApplication;
 #endif
 
-#include "core/utils/misc.h"
+#include "base/utils/misc.h"
 
 #ifndef DISABLE_WEBUI
 class WebUI;

src/app/main.cpp

@@ -72,8 +72,8 @@ Q_IMPORT_PLUGIN(qico)
 #include <cstdlib>
 #include <iostream>
 #include "application.h"
-#include "core/utils/misc.h"
+#include "base/utils/misc.h"
-#include "core/preferences.h"
+#include "base/preferences.h"
 
 #include "upgrade.h"
 

src/app/upgrade.h

@@ -40,11 +40,11 @@
 #include <QMessageBox>
 #endif
 
-#include "core/logger.h"
+#include "base/logger.h"
-#include "core/utils/fs.h"
+#include "base/utils/fs.h"
-#include "core/utils/misc.h"
+#include "base/utils/misc.h"
-#include "core/utils/string.h"
+#include "base/utils/string.h"
-#include "core/qinisettings.h"
+#include "base/qinisettings.h"
 
 bool userAcceptsUpgrade()
 {

src/base/bittorrent/magneturi.cpp

@@ -30,7 +30,7 @@
 #include <libtorrent/error_code.hpp>
 #include <libtorrent/magnet_uri.hpp>
 
-#include "core/utils/string.h"
+#include "base/utils/string.h"
 #include "magneturi.h"
 
 namespace libt = libtorrent;

src/base/bittorrent/peerinfo.cpp

@@ -26,9 +26,9 @@
  * exception statement from your version.
  */
 
-#include "core/net/geoipmanager.h"
+#include "base/net/geoipmanager.h"
-#include "core/utils/string.h"
+#include "base/utils/string.h"
-#include "core/unicodestrings.h"
+#include "base/unicodestrings.h"
 #include "peerinfo.h"
 
 namespace libt = libtorrent;

src/base/bittorrent/private/bandwidthscheduler.cpp

@@ -31,7 +31,7 @@
 #include <QTime>
 #include <QDateTime>
 
-#include "core/preferences.h"
+#include "base/preferences.h"
 #include "bandwidthscheduler.h"
 
 BandwidthScheduler::BandwidthScheduler(QObject *parent)

src/base/bittorrent/private/filterparserthread.cpp

@@ -36,7 +36,7 @@
 #include <libtorrent/session.hpp>
 #include <libtorrent/ip_filter.hpp>
 
-#include "core/logger.h"
+#include "base/logger.h"
 #include "filterparserthread.h"
 
 namespace libt = libtorrent;

src/base/bittorrent/private/statistics.cpp

@@ -2,10 +2,10 @@
 
 #include <libtorrent/session.hpp>
 
-#include "core/qinisettings.h"
+#include "base/qinisettings.h"
-#include "core/preferences.h"
+#include "base/preferences.h"
-#include "core/bittorrent/sessionstatus.h"
+#include "base/bittorrent/sessionstatus.h"
-#include "core/bittorrent/session.h"
+#include "base/bittorrent/session.h"
 #include "statistics.h"
 
 static const qint64 SAVE_INTERVAL = 15 * 60 * 1000;
@@ -83,7 +83,7 @@ void Statistics::load()
     // Don't forget to remove:
     // 1. Preferences::getStats()
     // 2. Preferences::removeStats()
-    // 3. #include "core/preferences.h"
+    // 3. #include "base/preferences.h"
     Preferences* const pref = Preferences::instance();
     QIniSettings s("qBittorrent", "qBittorrent-data");
     QVariantHash v = pref->getStats();

src/base/bittorrent/session.cpp

@@ -63,20 +63,20 @@ using namespace BitTorrent;
 //#include <libtorrent/extensions/metadata_transfer.hpp>
 
 #ifndef DISABLE_COUNTRIES_RESOLUTION
-#include "core/net/geoipmanager.h"
+#include "base/net/geoipmanager.h"
 #endif
 
-#include "core/utils/misc.h"
+#include "base/utils/misc.h"
-#include "core/utils/fs.h"
+#include "base/utils/fs.h"
-#include "core/utils/string.h"
+#include "base/utils/string.h"
-#include "core/unicodestrings.h"
+#include "base/unicodestrings.h"
-#include "core/logger.h"
+#include "base/logger.h"
-#include "core/preferences.h"
+#include "base/preferences.h"
-#include "core/torrentfilter.h"
+#include "base/torrentfilter.h"
-#include "core/net/downloadmanager.h"
+#include "base/net/downloadmanager.h"
-#include "core/net/downloadhandler.h"
+#include "base/net/downloadhandler.h"
-#include "core/net/portforwarder.h"
+#include "base/net/portforwarder.h"
-#include "core/utils/string.h"
+#include "base/utils/string.h"
 #include "private/filterparserthread.h"
 #include "private/statistics.h"
 #include "private/bandwidthscheduler.h"

src/base/bittorrent/session.h

@@ -38,8 +38,8 @@
 #include <QWaitCondition>
 #include <QNetworkConfigurationManager>
 
-#include "core/tristatebool.h"
+#include "base/tristatebool.h"
-#include "core/types.h"
+#include "base/types.h"
 #include "torrentinfo.h"
 
 namespace libtorrent

src/base/bittorrent/torrentcreatorthread.cpp

@@ -43,9 +43,9 @@
 #include <iostream>
 #include <fstream>
 
-#include "core/utils/fs.h"
+#include "base/utils/fs.h"
-#include "core/utils/misc.h"
+#include "base/utils/misc.h"
-#include "core/utils/string.h"
+#include "base/utils/string.h"
 #include "torrentcreatorthread.h"
 
 namespace libt = libtorrent;

src/base/bittorrent/torrenthandle.cpp

@@ -46,11 +46,11 @@
 #include <Windows.h>
 #endif
 
-#include "core/logger.h"
+#include "base/logger.h"
-#include "core/preferences.h"
+#include "base/preferences.h"
-#include "core/utils/string.h"
+#include "base/utils/string.h"
-#include "core/utils/fs.h"
+#include "base/utils/fs.h"
-#include "core/utils/misc.h"
+#include "base/utils/misc.h"
 #include "session.h"
 #include "peerinfo.h"
 #include "trackerentry.h"

src/base/bittorrent/torrenthandle.h

@@ -40,7 +40,7 @@
 #include <libtorrent/torrent_handle.hpp>
 #include <boost/function.hpp>
 
-#include "core/tristatebool.h"
+#include "base/tristatebool.h"
 #include "private/speedmonitor.h"
 #include "infohash.h"
 #include "torrentinfo.h"

src/base/bittorrent/torrentinfo.cpp

@@ -33,9 +33,9 @@
 
 #include <libtorrent/error_code.hpp>
 
-#include "core/utils/misc.h"
+#include "base/utils/misc.h"
-#include "core/utils/fs.h"
+#include "base/utils/fs.h"
-#include "core/utils/string.h"
+#include "base/utils/string.h"
 #include "infohash.h"
 #include "trackerentry.h"
 #include "torrentinfo.h"

src/base/bittorrent/tracker.cpp

@@ -33,9 +33,9 @@
 #include <libtorrent/bencode.hpp>
 #include <libtorrent/entry.hpp>
 
-#include "core/preferences.h"
+#include "base/preferences.h"
-#include "core/http/server.h"
+#include "base/http/server.h"
-#include "core/utils/string.h"
+#include "base/utils/string.h"
 #include "tracker.h"
 
 // static limits

src/base/bittorrent/tracker.h

@@ -33,9 +33,9 @@
 #define BITTORRENT_TRACKER_H
 
 #include <QHash>
-#include "core/http/types.h"
+#include "base/http/types.h"
-#include "core/http/responsebuilder.h"
+#include "base/http/responsebuilder.h"
-#include "core/http/irequesthandler.h"
+#include "base/http/irequesthandler.h"
 
 namespace libtorrent
 {

src/base/bittorrent/trackerentry.cpp

@@ -28,8 +28,8 @@
 
 #include <QString>
 
-#include "core/utils/misc.h"
+#include "base/utils/misc.h"
-#include "core/utils/string.h"
+#include "base/utils/string.h"
 #include "trackerentry.h"
 
 using namespace BitTorrent;

src/base/filesystemwatcher.cpp

@@ -12,9 +12,9 @@
 #endif
 #endif
 
-#include "core/preferences.h"
+#include "base/preferences.h"
-#include "core/bittorrent/torrentinfo.h"
+#include "base/bittorrent/torrentinfo.h"
-#include "core/bittorrent/magneturi.h"
+#include "base/bittorrent/magneturi.h"
 #include "filesystemwatcher.h"
 
 #ifndef CIFS_MAGIC_NUMBER

src/base/http/responsegenerator.cpp

@@ -29,7 +29,7 @@
  * Contact : chris@qbittorrent.org
  */
 
-#include "core/utils/gzip.h"
+#include "base/utils/gzip.h"
 #include "responsegenerator.h"
 
 using namespace Http;

src/base/net/dnsupdater.cpp

@@ -36,7 +36,7 @@
 #include <QUrlQuery>
 #endif
 
-#include "core/logger.h"
+#include "base/logger.h"
 #include "dnsupdater.h"
 
 using namespace Net;

src/base/net/dnsupdater.h

@@ -36,7 +36,7 @@
 #include <QNetworkReply>
 #include <QDateTime>
 #include <QTimer>
-#include "core/preferences.h"
+#include "base/preferences.h"
 
 namespace Net
 { 

src/base/net/downloadhandler.cpp

@@ -36,9 +36,9 @@
 #include <QUrl>
 #include <QDebug>
 
-#include "core/utils/fs.h"
+#include "base/utils/fs.h"
-#include "core/utils/gzip.h"
+#include "base/utils/gzip.h"
-#include "core/utils/misc.h"
+#include "base/utils/misc.h"
 #include "downloadmanager.h"
 #include "downloadhandler.h"
 

src/base/net/downloadmanager.cpp

@@ -36,7 +36,7 @@
 #include <QUrl>
 #include <QDebug>
 
-#include "core/preferences.h"
+#include "base/preferences.h"
 #include "downloadhandler.h"
 #include "downloadmanager.h"
 

src/base/net/geoipmanager.cpp

@@ -33,10 +33,10 @@
 #include <QHostAddress>
 #include <QDateTime>
 
-#include "core/logger.h"
+#include "base/logger.h"
-#include "core/preferences.h"
+#include "base/preferences.h"
-#include "core/utils/fs.h"
+#include "base/utils/fs.h"
-#include "core/utils/gzip.h"
+#include "base/utils/gzip.h"
 #include "downloadmanager.h"
 #include "downloadhandler.h"
 #include "private/geoipdatabase.h"

src/base/net/portforwarder.cpp

@@ -30,8 +30,8 @@
 
 #include <libtorrent/session.hpp>
 
-#include "core/logger.h"
+#include "base/logger.h"
-#include "core/preferences.h"
+#include "base/preferences.h"
 #include "portforwarder.h"
 
 namespace libt = libtorrent;

src/base/net/private/geoipdatabase.cpp

@@ -33,7 +33,7 @@
 #include <QDateTime>
 #include <QFile>
 
-#include "core/types.h"
+#include "base/types.h"
 #include "geoipdatabase.h"
 
 namespace

src/base/net/smtp.cpp

@@ -33,8 +33,8 @@
  */
 
 #include "smtp.h"
-#include "core/preferences.h"
+#include "base/preferences.h"
-#include "core/logger.h"
+#include "base/logger.h"
 
 #include <QTextStream>
 #ifndef QT_NO_OPENSSL

src/base/preferences.cpp

@@ -52,8 +52,8 @@
 #endif
 
 #include <cstdlib>
-#include "core/utils/fs.h"
+#include "base/utils/fs.h"
-#include "core/utils/misc.h"
+#include "base/utils/misc.h"
 
 
 Preferences* Preferences::m_instance = 0;

src/base/preferences.h

@@ -41,7 +41,7 @@
 #include <QNetworkCookie>
 #include <QVariant>
 
-#include "core/types.h"
+#include "base/types.h"
 
 enum scheduler_days
 {

src/base/utils/misc.cpp

@@ -72,9 +72,9 @@ const int UNLEN = 256;
 #include <QProcess>
 #endif
 
-#include "core/utils/string.h"
+#include "base/utils/string.h"
-#include "core/unicodestrings.h"
+#include "base/unicodestrings.h"
-#include "core/logger.h"
+#include "base/logger.h"
 #include "misc.h"
 #include "fs.h"
 

src/base/utils/misc.h

@@ -39,7 +39,7 @@
 #include <QFile>
 #include <QDir>
 #include <QUrl>
-#include "core/types.h"
+#include "base/types.h"
 
 /*  Miscellaneous functions that can be useful */
 

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 "base/preferences.h"
-#include "core/net/downloadmanager.h"
+#include "base/net/downloadmanager.h"
-#include "core/net/downloadhandler.h"
+#include "base/net/downloadhandler.h"
-#include "core/bittorrent/session.h"
+#include "base/bittorrent/session.h"
-#include "core/bittorrent/magneturi.h"
+#include "base/bittorrent/magneturi.h"
-#include "core/bittorrent/torrentinfo.h"
+#include "base/bittorrent/torrentinfo.h"
-#include "core/bittorrent/torrenthandle.h"
+#include "base/bittorrent/torrenthandle.h"
-#include "core/utils/fs.h"
+#include "base/utils/fs.h"
-#include "core/utils/misc.h"
+#include "base/utils/misc.h"
-#include "core/unicodestrings.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 "base/bittorrent/infohash.h"
-#include "core/bittorrent/torrentinfo.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 "base/bittorrent/session.h"
-#include "core/bittorrent/sessionstatus.h"
+#include "base/bittorrent/sessionstatus.h"
-#include "core/bittorrent/torrenthandle.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 "base/net/downloadmanager.h"
-#include "core/net/downloadhandler.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 "base/preferences.h"
-#include "core/utils/fs.h"
+#include "base/utils/fs.h"
 #include "advancedsettings.h"
-#include "core/scanfoldersmodel.h"
+#include "base/scanfoldersmodel.h"
-#include "core/bittorrent/session.h"
+#include "base/bittorrent/session.h"
 #include "guiiconprovider.h"
-#include "core/net/dnsupdater.h"
+#include "base/net/dnsupdater.h"
-#include "core/unicodestrings.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 "base/utils/misc.h"
-#include "core/utils/string.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 "base/utils/fs.h"
-#include "core/preferences.h"
+#include "base/preferences.h"
 
 PreviewSelect::PreviewSelect(QWidget* parent, BitTorrent::TorrentHandle *const torrent)
     : QDialog(parent)