From 9db93e5d8f17d378728f7d1f0d9081b4571e4032 Mon Sep 17 00:00:00 2001 From: "Vladimir Golovnev (Glassez)" Date: Fri, 25 Sep 2015 11:10:05 +0300 Subject: [PATCH] Rename Core to Base (Closes #3733). --- src/app/application.cpp | 22 ++++++++--------- src/app/application.h | 2 +- src/app/main.cpp | 4 ++-- src/app/upgrade.h | 10 ++++---- src/{core/core.pri => base/base.pri} | 0 src/{core => base}/bittorrent/cachestatus.cpp | 0 src/{core => base}/bittorrent/cachestatus.h | 0 src/{core => base}/bittorrent/infohash.cpp | 0 src/{core => base}/bittorrent/infohash.h | 0 src/{core => base}/bittorrent/magneturi.cpp | 2 +- src/{core => base}/bittorrent/magneturi.h | 0 src/{core => base}/bittorrent/peerinfo.cpp | 6 ++--- src/{core => base}/bittorrent/peerinfo.h | 0 .../bittorrent/private/bandwidthscheduler.cpp | 2 +- .../bittorrent/private/bandwidthscheduler.h | 0 .../bittorrent/private/filterparserthread.cpp | 2 +- .../bittorrent/private/filterparserthread.h | 0 .../bittorrent/private/speedmonitor.cpp | 0 .../bittorrent/private/speedmonitor.h | 0 .../bittorrent/private/statistics.cpp | 10 ++++---- .../bittorrent/private/statistics.h | 0 src/{core => base}/bittorrent/session.cpp | 24 +++++++++---------- src/{core => base}/bittorrent/session.h | 4 ++-- .../bittorrent/sessionstatus.cpp | 0 src/{core => base}/bittorrent/sessionstatus.h | 0 .../bittorrent/torrentcreatorthread.cpp | 6 ++--- .../bittorrent/torrentcreatorthread.h | 0 .../bittorrent/torrenthandle.cpp | 10 ++++---- src/{core => base}/bittorrent/torrenthandle.h | 2 +- src/{core => base}/bittorrent/torrentinfo.cpp | 6 ++--- src/{core => base}/bittorrent/torrentinfo.h | 0 src/{core => base}/bittorrent/tracker.cpp | 6 ++--- src/{core => base}/bittorrent/tracker.h | 6 ++--- .../bittorrent/trackerentry.cpp | 4 ++-- src/{core => base}/bittorrent/trackerentry.h | 0 src/{core => base}/filesystemwatcher.cpp | 6 ++--- src/{core => base}/filesystemwatcher.h | 0 src/{core => base}/http/connection.cpp | 0 src/{core => base}/http/connection.h | 0 src/{core => base}/http/irequesthandler.h | 0 src/{core => base}/http/requestparser.cpp | 0 src/{core => base}/http/requestparser.h | 0 src/{core => base}/http/responsebuilder.cpp | 0 src/{core => base}/http/responsebuilder.h | 0 src/{core => base}/http/responsegenerator.cpp | 2 +- src/{core => base}/http/responsegenerator.h | 0 src/{core => base}/http/server.cpp | 0 src/{core => base}/http/server.h | 0 src/{core => base}/http/types.h | 0 src/{core => base}/iconprovider.cpp | 0 src/{core => base}/iconprovider.h | 0 src/{core => base}/logger.cpp | 0 src/{core => base}/logger.h | 0 src/{core => base}/net/dnsupdater.cpp | 2 +- src/{core => base}/net/dnsupdater.h | 2 +- src/{core => base}/net/downloadhandler.cpp | 6 ++--- src/{core => base}/net/downloadhandler.h | 0 src/{core => base}/net/downloadmanager.cpp | 2 +- src/{core => base}/net/downloadmanager.h | 0 src/{core => base}/net/geoipmanager.cpp | 8 +++---- src/{core => base}/net/geoipmanager.h | 0 src/{core => base}/net/portforwarder.cpp | 4 ++-- src/{core => base}/net/portforwarder.h | 0 .../net/private/geoipdatabase.cpp | 2 +- .../net/private/geoipdatabase.h | 0 src/{core => base}/net/reverseresolution.cpp | 0 src/{core => base}/net/reverseresolution.h | 0 src/{core => base}/net/smtp.cpp | 4 ++-- src/{core => base}/net/smtp.h | 0 src/{core => base}/preferences.cpp | 4 ++-- src/{core => base}/preferences.h | 2 +- src/{core => base}/qinisettings.h | 0 src/{core => base}/scanfoldersmodel.cpp | 0 src/{core => base}/scanfoldersmodel.h | 0 src/{core => base}/torrentfilter.cpp | 0 src/{core => base}/torrentfilter.h | 0 src/{core => base}/tristatebool.cpp | 0 src/{core => base}/tristatebool.h | 0 src/{core => base}/types.h | 0 src/{core => base}/unicodestrings.h | 0 src/{core => base}/utils/fs.cpp | 0 src/{core => base}/utils/fs.h | 0 src/{core => base}/utils/gzip.cpp | 0 src/{core => base}/utils/gzip.h | 0 src/{core => base}/utils/misc.cpp | 6 ++--- src/{core => base}/utils/misc.h | 2 +- src/{core => base}/utils/string.cpp | 0 src/{core => base}/utils/string.h | 0 src/gui/about_imp.h | 2 +- src/gui/addnewtorrentdialog.cpp | 20 ++++++++-------- src/gui/addnewtorrentdialog.h | 4 ++-- src/gui/advancedsettings.h | 2 +- src/gui/deletionconfirmationdlg.h | 4 ++-- src/gui/executionlog.cpp | 2 +- src/gui/guiiconprovider.cpp | 2 +- src/gui/guiiconprovider.h | 2 +- src/gui/mainwindow.cpp | 16 ++++++------- src/gui/options_imp.cpp | 12 +++++----- src/gui/previewlistdelegate.h | 4 ++-- src/gui/previewselect.cpp | 6 ++--- src/gui/previewselect.h | 2 +- src/gui/programupdater.cpp | 4 ++-- src/gui/properties/peerlistdelegate.h | 4 ++-- src/gui/properties/peerlistwidget.cpp | 14 +++++------ src/gui/properties/peersadditiondlg.h | 2 +- src/gui/properties/propertieswidget.cpp | 12 +++++----- src/gui/properties/propertieswidget.h | 2 +- src/gui/properties/proplistdelegate.cpp | 4 ++-- src/gui/properties/speedplotview.cpp | 2 +- src/gui/properties/speedwidget.cpp | 8 +++---- src/gui/properties/trackerlist.cpp | 12 +++++----- src/gui/properties/trackersadditiondlg.cpp | 12 +++++----- src/gui/rss/automatedrssdownloader.cpp | 6 ++--- src/gui/rss/htmlbrowser.cpp | 2 +- src/gui/rss/rss_imp.cpp | 6 ++--- src/gui/rss/rssdownloadrule.cpp | 4 ++-- src/gui/rss/rssdownloadrulelist.cpp | 4 ++-- src/gui/rss/rssfeed.cpp | 18 +++++++------- src/gui/rss/rssfolder.cpp | 2 +- src/gui/rss/rssmanager.cpp | 4 ++-- src/gui/rss/rssparser.cpp | 2 +- src/gui/rss/rsssettingsdlg.cpp | 2 +- src/gui/shutdownconfirm.cpp | 2 +- src/gui/shutdownconfirm.h | 2 +- src/gui/speedlimitdlg.cpp | 2 +- src/gui/speedlimitdlg.h | 4 ++-- src/gui/statsdialog.cpp | 12 +++++----- src/gui/statusbar.cpp | 10 ++++---- src/gui/torrentcontentfiltermodel.cpp | 2 +- src/gui/torrentcontentmodel.cpp | 4 ++-- src/gui/torrentcontentmodel.h | 2 +- src/gui/torrentcontentmodelitem.cpp | 4 ++-- src/gui/torrentcreatordlg.cpp | 12 +++++----- src/gui/torrentimportdlg.cpp | 8 +++---- src/gui/torrentimportdlg.h | 2 +- src/gui/torrentmodel.cpp | 8 +++---- src/gui/trackerlogin.cpp | 2 +- src/gui/transferlistdelegate.cpp | 10 ++++---- src/gui/transferlistfilterswidget.cpp | 22 ++++++++--------- src/gui/transferlistsortmodel.cpp | 6 ++--- src/gui/transferlistsortmodel.h | 2 +- src/gui/transferlistwidget.cpp | 10 ++++---- src/gui/updownratiodlg.cpp | 2 +- src/searchengine/engineselectdlg.cpp | 8 +++---- src/searchengine/searchengine.cpp | 8 +++---- src/searchengine/searchlistdelegate.h | 2 +- src/searchengine/searchsortmodel.h | 2 +- src/searchengine/searchtab.cpp | 4 ++-- src/searchengine/supportedengines.h | 6 ++--- src/src.pro | 2 +- src/webui/abstractwebapplication.cpp | 2 +- src/webui/abstractwebapplication.h | 6 ++--- src/webui/btjson.cpp | 16 ++++++------- src/webui/prefjson.cpp | 6 ++--- src/webui/webapplication.cpp | 21 ++++++++-------- src/webui/webui.cpp | 10 ++++---- 156 files changed, 303 insertions(+), 302 deletions(-) rename src/{core/core.pri => base/base.pri} (100%) rename src/{core => base}/bittorrent/cachestatus.cpp (100%) rename src/{core => base}/bittorrent/cachestatus.h (100%) rename src/{core => base}/bittorrent/infohash.cpp (100%) rename src/{core => base}/bittorrent/infohash.h (100%) rename src/{core => base}/bittorrent/magneturi.cpp (98%) rename src/{core => base}/bittorrent/magneturi.h (100%) rename src/{core => base}/bittorrent/peerinfo.cpp (98%) rename src/{core => base}/bittorrent/peerinfo.h (100%) rename src/{core => base}/bittorrent/private/bandwidthscheduler.cpp (99%) rename src/{core => base}/bittorrent/private/bandwidthscheduler.h (100%) rename src/{core => base}/bittorrent/private/filterparserthread.cpp (99%) rename src/{core => base}/bittorrent/private/filterparserthread.h (100%) rename src/{core => base}/bittorrent/private/speedmonitor.cpp (100%) rename src/{core => base}/bittorrent/private/speedmonitor.h (100%) rename src/{core => base}/bittorrent/private/statistics.cpp (94%) rename src/{core => base}/bittorrent/private/statistics.h (100%) rename src/{core => base}/bittorrent/session.cpp (99%) rename src/{core => base}/bittorrent/session.h (99%) rename src/{core => base}/bittorrent/sessionstatus.cpp (100%) rename src/{core => base}/bittorrent/sessionstatus.h (100%) rename src/{core => base}/bittorrent/torrentcreatorthread.cpp (98%) rename src/{core => base}/bittorrent/torrentcreatorthread.h (100%) rename src/{core => base}/bittorrent/torrenthandle.cpp (99%) rename src/{core => base}/bittorrent/torrenthandle.h (99%) rename src/{core => base}/bittorrent/torrentinfo.cpp (98%) rename src/{core => base}/bittorrent/torrentinfo.h (100%) rename src/{core => base}/bittorrent/tracker.cpp (98%) rename src/{core => base}/bittorrent/tracker.h (96%) rename src/{core => base}/bittorrent/trackerentry.cpp (97%) rename src/{core => base}/bittorrent/trackerentry.h (100%) rename src/{core => base}/filesystemwatcher.cpp (98%) rename src/{core => base}/filesystemwatcher.h (100%) rename src/{core => base}/http/connection.cpp (100%) rename src/{core => base}/http/connection.h (100%) rename src/{core => base}/http/irequesthandler.h (100%) rename src/{core => base}/http/requestparser.cpp (100%) rename src/{core => base}/http/requestparser.h (100%) rename src/{core => base}/http/responsebuilder.cpp (100%) rename src/{core => base}/http/responsebuilder.h (100%) rename src/{core => base}/http/responsegenerator.cpp (98%) rename src/{core => base}/http/responsegenerator.h (100%) rename src/{core => base}/http/server.cpp (100%) rename src/{core => base}/http/server.h (100%) rename src/{core => base}/http/types.h (100%) rename src/{core => base}/iconprovider.cpp (100%) rename src/{core => base}/iconprovider.h (100%) rename src/{core => base}/logger.cpp (100%) rename src/{core => base}/logger.h (100%) rename src/{core => base}/net/dnsupdater.cpp (99%) rename src/{core => base}/net/dnsupdater.h (98%) rename src/{core => base}/net/downloadhandler.cpp (99%) rename src/{core => base}/net/downloadhandler.h (100%) rename src/{core => base}/net/downloadmanager.cpp (99%) rename src/{core => base}/net/downloadmanager.h (100%) rename src/{core => base}/net/geoipmanager.cpp (99%) rename src/{core => base}/net/geoipmanager.h (100%) rename src/{core => base}/net/portforwarder.cpp (98%) rename src/{core => base}/net/portforwarder.h (100%) rename src/{core => base}/net/private/geoipdatabase.cpp (99%) rename src/{core => base}/net/private/geoipdatabase.h (100%) rename src/{core => base}/net/reverseresolution.cpp (100%) rename src/{core => base}/net/reverseresolution.h (100%) rename src/{core => base}/net/smtp.cpp (99%) rename src/{core => base}/net/smtp.h (100%) rename src/{core => base}/preferences.cpp (99%) rename src/{core => base}/preferences.h (99%) rename src/{core => base}/qinisettings.h (100%) rename src/{core => base}/scanfoldersmodel.cpp (100%) rename src/{core => base}/scanfoldersmodel.h (100%) rename src/{core => base}/torrentfilter.cpp (100%) rename src/{core => base}/torrentfilter.h (100%) rename src/{core => base}/tristatebool.cpp (100%) rename src/{core => base}/tristatebool.h (100%) rename src/{core => base}/types.h (100%) rename src/{core => base}/unicodestrings.h (100%) rename src/{core => base}/utils/fs.cpp (100%) rename src/{core => base}/utils/fs.h (100%) rename src/{core => base}/utils/gzip.cpp (100%) rename src/{core => base}/utils/gzip.h (100%) rename src/{core => base}/utils/misc.cpp (99%) rename src/{core => base}/utils/misc.h (99%) rename src/{core => base}/utils/string.cpp (100%) rename src/{core => base}/utils/string.h (100%) diff --git a/src/app/application.cpp b/src/app/application.cpp index c87a430e2..9bdb62713 100644 --- a/src/app/application.cpp +++ b/src/app/application.cpp @@ -58,17 +58,17 @@ #endif #include "application.h" -#include "core/logger.h" -#include "core/preferences.h" -#include "core/utils/fs.h" -#include "core/utils/misc.h" -#include "core/iconprovider.h" -#include "core/scanfoldersmodel.h" -#include "core/net/smtp.h" -#include "core/net/downloadmanager.h" -#include "core/net/geoipmanager.h" -#include "core/bittorrent/session.h" -#include "core/bittorrent/torrenthandle.h" +#include "base/logger.h" +#include "base/preferences.h" +#include "base/utils/fs.h" +#include "base/utils/misc.h" +#include "base/iconprovider.h" +#include "base/scanfoldersmodel.h" +#include "base/net/smtp.h" +#include "base/net/downloadmanager.h" +#include "base/net/geoipmanager.h" +#include "base/bittorrent/session.h" +#include "base/bittorrent/torrenthandle.h" static const char PARAMS_SEPARATOR[] = "|"; diff --git a/src/app/application.h b/src/app/application.h index 9ed308e20..0f094e535 100644 --- a/src/app/application.h +++ b/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; diff --git a/src/app/main.cpp b/src/app/main.cpp index 9bfe0d6ee..94e16bcc7 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -72,8 +72,8 @@ Q_IMPORT_PLUGIN(qico) #include #include #include "application.h" -#include "core/utils/misc.h" -#include "core/preferences.h" +#include "base/utils/misc.h" +#include "base/preferences.h" #include "upgrade.h" diff --git a/src/app/upgrade.h b/src/app/upgrade.h index b361ca711..0a9ff75c8 100644 --- a/src/app/upgrade.h +++ b/src/app/upgrade.h @@ -40,11 +40,11 @@ #include #endif -#include "core/logger.h" -#include "core/utils/fs.h" -#include "core/utils/misc.h" -#include "core/utils/string.h" -#include "core/qinisettings.h" +#include "base/logger.h" +#include "base/utils/fs.h" +#include "base/utils/misc.h" +#include "base/utils/string.h" +#include "base/qinisettings.h" bool userAcceptsUpgrade() { diff --git a/src/core/core.pri b/src/base/base.pri similarity index 100% rename from src/core/core.pri rename to src/base/base.pri diff --git a/src/core/bittorrent/cachestatus.cpp b/src/base/bittorrent/cachestatus.cpp similarity index 100% rename from src/core/bittorrent/cachestatus.cpp rename to src/base/bittorrent/cachestatus.cpp diff --git a/src/core/bittorrent/cachestatus.h b/src/base/bittorrent/cachestatus.h similarity index 100% rename from src/core/bittorrent/cachestatus.h rename to src/base/bittorrent/cachestatus.h diff --git a/src/core/bittorrent/infohash.cpp b/src/base/bittorrent/infohash.cpp similarity index 100% rename from src/core/bittorrent/infohash.cpp rename to src/base/bittorrent/infohash.cpp diff --git a/src/core/bittorrent/infohash.h b/src/base/bittorrent/infohash.h similarity index 100% rename from src/core/bittorrent/infohash.h rename to src/base/bittorrent/infohash.h diff --git a/src/core/bittorrent/magneturi.cpp b/src/base/bittorrent/magneturi.cpp similarity index 98% rename from src/core/bittorrent/magneturi.cpp rename to src/base/bittorrent/magneturi.cpp index c71e38aef..84673fffc 100644 --- a/src/core/bittorrent/magneturi.cpp +++ b/src/base/bittorrent/magneturi.cpp @@ -30,7 +30,7 @@ #include #include -#include "core/utils/string.h" +#include "base/utils/string.h" #include "magneturi.h" namespace libt = libtorrent; diff --git a/src/core/bittorrent/magneturi.h b/src/base/bittorrent/magneturi.h similarity index 100% rename from src/core/bittorrent/magneturi.h rename to src/base/bittorrent/magneturi.h diff --git a/src/core/bittorrent/peerinfo.cpp b/src/base/bittorrent/peerinfo.cpp similarity index 98% rename from src/core/bittorrent/peerinfo.cpp rename to src/base/bittorrent/peerinfo.cpp index c7e9816ee..abbe45df5 100644 --- a/src/core/bittorrent/peerinfo.cpp +++ b/src/base/bittorrent/peerinfo.cpp @@ -26,9 +26,9 @@ * exception statement from your version. */ -#include "core/net/geoipmanager.h" -#include "core/utils/string.h" -#include "core/unicodestrings.h" +#include "base/net/geoipmanager.h" +#include "base/utils/string.h" +#include "base/unicodestrings.h" #include "peerinfo.h" namespace libt = libtorrent; diff --git a/src/core/bittorrent/peerinfo.h b/src/base/bittorrent/peerinfo.h similarity index 100% rename from src/core/bittorrent/peerinfo.h rename to src/base/bittorrent/peerinfo.h diff --git a/src/core/bittorrent/private/bandwidthscheduler.cpp b/src/base/bittorrent/private/bandwidthscheduler.cpp similarity index 99% rename from src/core/bittorrent/private/bandwidthscheduler.cpp rename to src/base/bittorrent/private/bandwidthscheduler.cpp index e191b56f6..dcb0097d1 100644 --- a/src/core/bittorrent/private/bandwidthscheduler.cpp +++ b/src/base/bittorrent/private/bandwidthscheduler.cpp @@ -31,7 +31,7 @@ #include #include -#include "core/preferences.h" +#include "base/preferences.h" #include "bandwidthscheduler.h" BandwidthScheduler::BandwidthScheduler(QObject *parent) diff --git a/src/core/bittorrent/private/bandwidthscheduler.h b/src/base/bittorrent/private/bandwidthscheduler.h similarity index 100% rename from src/core/bittorrent/private/bandwidthscheduler.h rename to src/base/bittorrent/private/bandwidthscheduler.h diff --git a/src/core/bittorrent/private/filterparserthread.cpp b/src/base/bittorrent/private/filterparserthread.cpp similarity index 99% rename from src/core/bittorrent/private/filterparserthread.cpp rename to src/base/bittorrent/private/filterparserthread.cpp index 18de2fae6..e2c1564e9 100644 --- a/src/core/bittorrent/private/filterparserthread.cpp +++ b/src/base/bittorrent/private/filterparserthread.cpp @@ -36,7 +36,7 @@ #include #include -#include "core/logger.h" +#include "base/logger.h" #include "filterparserthread.h" namespace libt = libtorrent; diff --git a/src/core/bittorrent/private/filterparserthread.h b/src/base/bittorrent/private/filterparserthread.h similarity index 100% rename from src/core/bittorrent/private/filterparserthread.h rename to src/base/bittorrent/private/filterparserthread.h diff --git a/src/core/bittorrent/private/speedmonitor.cpp b/src/base/bittorrent/private/speedmonitor.cpp similarity index 100% rename from src/core/bittorrent/private/speedmonitor.cpp rename to src/base/bittorrent/private/speedmonitor.cpp diff --git a/src/core/bittorrent/private/speedmonitor.h b/src/base/bittorrent/private/speedmonitor.h similarity index 100% rename from src/core/bittorrent/private/speedmonitor.h rename to src/base/bittorrent/private/speedmonitor.h diff --git a/src/core/bittorrent/private/statistics.cpp b/src/base/bittorrent/private/statistics.cpp similarity index 94% rename from src/core/bittorrent/private/statistics.cpp rename to src/base/bittorrent/private/statistics.cpp index f57a9a7c0..a3b41ca13 100644 --- a/src/core/bittorrent/private/statistics.cpp +++ b/src/base/bittorrent/private/statistics.cpp @@ -2,10 +2,10 @@ #include -#include "core/qinisettings.h" -#include "core/preferences.h" -#include "core/bittorrent/sessionstatus.h" -#include "core/bittorrent/session.h" +#include "base/qinisettings.h" +#include "base/preferences.h" +#include "base/bittorrent/sessionstatus.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(); diff --git a/src/core/bittorrent/private/statistics.h b/src/base/bittorrent/private/statistics.h similarity index 100% rename from src/core/bittorrent/private/statistics.h rename to src/base/bittorrent/private/statistics.h diff --git a/src/core/bittorrent/session.cpp b/src/base/bittorrent/session.cpp similarity index 99% rename from src/core/bittorrent/session.cpp rename to src/base/bittorrent/session.cpp index ea71a8cec..71fd9fe62 100644 --- a/src/core/bittorrent/session.cpp +++ b/src/base/bittorrent/session.cpp @@ -63,20 +63,20 @@ using namespace BitTorrent; //#include #ifndef DISABLE_COUNTRIES_RESOLUTION -#include "core/net/geoipmanager.h" +#include "base/net/geoipmanager.h" #endif -#include "core/utils/misc.h" -#include "core/utils/fs.h" -#include "core/utils/string.h" -#include "core/unicodestrings.h" -#include "core/logger.h" -#include "core/preferences.h" -#include "core/torrentfilter.h" -#include "core/net/downloadmanager.h" -#include "core/net/downloadhandler.h" -#include "core/net/portforwarder.h" -#include "core/utils/string.h" +#include "base/utils/misc.h" +#include "base/utils/fs.h" +#include "base/utils/string.h" +#include "base/unicodestrings.h" +#include "base/logger.h" +#include "base/preferences.h" +#include "base/torrentfilter.h" +#include "base/net/downloadmanager.h" +#include "base/net/downloadhandler.h" +#include "base/net/portforwarder.h" +#include "base/utils/string.h" #include "private/filterparserthread.h" #include "private/statistics.h" #include "private/bandwidthscheduler.h" diff --git a/src/core/bittorrent/session.h b/src/base/bittorrent/session.h similarity index 99% rename from src/core/bittorrent/session.h rename to src/base/bittorrent/session.h index 156f3a0e9..ee945512b 100644 --- a/src/core/bittorrent/session.h +++ b/src/base/bittorrent/session.h @@ -38,8 +38,8 @@ #include #include -#include "core/tristatebool.h" -#include "core/types.h" +#include "base/tristatebool.h" +#include "base/types.h" #include "torrentinfo.h" namespace libtorrent diff --git a/src/core/bittorrent/sessionstatus.cpp b/src/base/bittorrent/sessionstatus.cpp similarity index 100% rename from src/core/bittorrent/sessionstatus.cpp rename to src/base/bittorrent/sessionstatus.cpp diff --git a/src/core/bittorrent/sessionstatus.h b/src/base/bittorrent/sessionstatus.h similarity index 100% rename from src/core/bittorrent/sessionstatus.h rename to src/base/bittorrent/sessionstatus.h diff --git a/src/core/bittorrent/torrentcreatorthread.cpp b/src/base/bittorrent/torrentcreatorthread.cpp similarity index 98% rename from src/core/bittorrent/torrentcreatorthread.cpp rename to src/base/bittorrent/torrentcreatorthread.cpp index 03ce5bd33..548836500 100644 --- a/src/core/bittorrent/torrentcreatorthread.cpp +++ b/src/base/bittorrent/torrentcreatorthread.cpp @@ -43,9 +43,9 @@ #include #include -#include "core/utils/fs.h" -#include "core/utils/misc.h" -#include "core/utils/string.h" +#include "base/utils/fs.h" +#include "base/utils/misc.h" +#include "base/utils/string.h" #include "torrentcreatorthread.h" namespace libt = libtorrent; diff --git a/src/core/bittorrent/torrentcreatorthread.h b/src/base/bittorrent/torrentcreatorthread.h similarity index 100% rename from src/core/bittorrent/torrentcreatorthread.h rename to src/base/bittorrent/torrentcreatorthread.h diff --git a/src/core/bittorrent/torrenthandle.cpp b/src/base/bittorrent/torrenthandle.cpp similarity index 99% rename from src/core/bittorrent/torrenthandle.cpp rename to src/base/bittorrent/torrenthandle.cpp index 9e704a26b..b6e6f4e0e 100644 --- a/src/core/bittorrent/torrenthandle.cpp +++ b/src/base/bittorrent/torrenthandle.cpp @@ -46,11 +46,11 @@ #include #endif -#include "core/logger.h" -#include "core/preferences.h" -#include "core/utils/string.h" -#include "core/utils/fs.h" -#include "core/utils/misc.h" +#include "base/logger.h" +#include "base/preferences.h" +#include "base/utils/string.h" +#include "base/utils/fs.h" +#include "base/utils/misc.h" #include "session.h" #include "peerinfo.h" #include "trackerentry.h" diff --git a/src/core/bittorrent/torrenthandle.h b/src/base/bittorrent/torrenthandle.h similarity index 99% rename from src/core/bittorrent/torrenthandle.h rename to src/base/bittorrent/torrenthandle.h index e46951def..d6679cbe8 100644 --- a/src/core/bittorrent/torrenthandle.h +++ b/src/base/bittorrent/torrenthandle.h @@ -40,7 +40,7 @@ #include #include -#include "core/tristatebool.h" +#include "base/tristatebool.h" #include "private/speedmonitor.h" #include "infohash.h" #include "torrentinfo.h" diff --git a/src/core/bittorrent/torrentinfo.cpp b/src/base/bittorrent/torrentinfo.cpp similarity index 98% rename from src/core/bittorrent/torrentinfo.cpp rename to src/base/bittorrent/torrentinfo.cpp index 2d454e2e2..d7da2f517 100644 --- a/src/core/bittorrent/torrentinfo.cpp +++ b/src/base/bittorrent/torrentinfo.cpp @@ -33,9 +33,9 @@ #include -#include "core/utils/misc.h" -#include "core/utils/fs.h" -#include "core/utils/string.h" +#include "base/utils/misc.h" +#include "base/utils/fs.h" +#include "base/utils/string.h" #include "infohash.h" #include "trackerentry.h" #include "torrentinfo.h" diff --git a/src/core/bittorrent/torrentinfo.h b/src/base/bittorrent/torrentinfo.h similarity index 100% rename from src/core/bittorrent/torrentinfo.h rename to src/base/bittorrent/torrentinfo.h diff --git a/src/core/bittorrent/tracker.cpp b/src/base/bittorrent/tracker.cpp similarity index 98% rename from src/core/bittorrent/tracker.cpp rename to src/base/bittorrent/tracker.cpp index fca7fbf40..7044d65e5 100644 --- a/src/core/bittorrent/tracker.cpp +++ b/src/base/bittorrent/tracker.cpp @@ -33,9 +33,9 @@ #include #include -#include "core/preferences.h" -#include "core/http/server.h" -#include "core/utils/string.h" +#include "base/preferences.h" +#include "base/http/server.h" +#include "base/utils/string.h" #include "tracker.h" // static limits diff --git a/src/core/bittorrent/tracker.h b/src/base/bittorrent/tracker.h similarity index 96% rename from src/core/bittorrent/tracker.h rename to src/base/bittorrent/tracker.h index be96b4b1e..7e8f9f318 100644 --- a/src/core/bittorrent/tracker.h +++ b/src/base/bittorrent/tracker.h @@ -33,9 +33,9 @@ #define BITTORRENT_TRACKER_H #include -#include "core/http/types.h" -#include "core/http/responsebuilder.h" -#include "core/http/irequesthandler.h" +#include "base/http/types.h" +#include "base/http/responsebuilder.h" +#include "base/http/irequesthandler.h" namespace libtorrent { diff --git a/src/core/bittorrent/trackerentry.cpp b/src/base/bittorrent/trackerentry.cpp similarity index 97% rename from src/core/bittorrent/trackerentry.cpp rename to src/base/bittorrent/trackerentry.cpp index 506c565e8..e944963a8 100644 --- a/src/core/bittorrent/trackerentry.cpp +++ b/src/base/bittorrent/trackerentry.cpp @@ -28,8 +28,8 @@ #include -#include "core/utils/misc.h" -#include "core/utils/string.h" +#include "base/utils/misc.h" +#include "base/utils/string.h" #include "trackerentry.h" using namespace BitTorrent; diff --git a/src/core/bittorrent/trackerentry.h b/src/base/bittorrent/trackerentry.h similarity index 100% rename from src/core/bittorrent/trackerentry.h rename to src/base/bittorrent/trackerentry.h diff --git a/src/core/filesystemwatcher.cpp b/src/base/filesystemwatcher.cpp similarity index 98% rename from src/core/filesystemwatcher.cpp rename to src/base/filesystemwatcher.cpp index 0debaa06f..df6bf38c6 100644 --- a/src/core/filesystemwatcher.cpp +++ b/src/base/filesystemwatcher.cpp @@ -12,9 +12,9 @@ #endif #endif -#include "core/preferences.h" -#include "core/bittorrent/torrentinfo.h" -#include "core/bittorrent/magneturi.h" +#include "base/preferences.h" +#include "base/bittorrent/torrentinfo.h" +#include "base/bittorrent/magneturi.h" #include "filesystemwatcher.h" #ifndef CIFS_MAGIC_NUMBER diff --git a/src/core/filesystemwatcher.h b/src/base/filesystemwatcher.h similarity index 100% rename from src/core/filesystemwatcher.h rename to src/base/filesystemwatcher.h diff --git a/src/core/http/connection.cpp b/src/base/http/connection.cpp similarity index 100% rename from src/core/http/connection.cpp rename to src/base/http/connection.cpp diff --git a/src/core/http/connection.h b/src/base/http/connection.h similarity index 100% rename from src/core/http/connection.h rename to src/base/http/connection.h diff --git a/src/core/http/irequesthandler.h b/src/base/http/irequesthandler.h similarity index 100% rename from src/core/http/irequesthandler.h rename to src/base/http/irequesthandler.h diff --git a/src/core/http/requestparser.cpp b/src/base/http/requestparser.cpp similarity index 100% rename from src/core/http/requestparser.cpp rename to src/base/http/requestparser.cpp diff --git a/src/core/http/requestparser.h b/src/base/http/requestparser.h similarity index 100% rename from src/core/http/requestparser.h rename to src/base/http/requestparser.h diff --git a/src/core/http/responsebuilder.cpp b/src/base/http/responsebuilder.cpp similarity index 100% rename from src/core/http/responsebuilder.cpp rename to src/base/http/responsebuilder.cpp diff --git a/src/core/http/responsebuilder.h b/src/base/http/responsebuilder.h similarity index 100% rename from src/core/http/responsebuilder.h rename to src/base/http/responsebuilder.h diff --git a/src/core/http/responsegenerator.cpp b/src/base/http/responsegenerator.cpp similarity index 98% rename from src/core/http/responsegenerator.cpp rename to src/base/http/responsegenerator.cpp index 4ec7f0178..2e070ee86 100644 --- a/src/core/http/responsegenerator.cpp +++ b/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; diff --git a/src/core/http/responsegenerator.h b/src/base/http/responsegenerator.h similarity index 100% rename from src/core/http/responsegenerator.h rename to src/base/http/responsegenerator.h diff --git a/src/core/http/server.cpp b/src/base/http/server.cpp similarity index 100% rename from src/core/http/server.cpp rename to src/base/http/server.cpp diff --git a/src/core/http/server.h b/src/base/http/server.h similarity index 100% rename from src/core/http/server.h rename to src/base/http/server.h diff --git a/src/core/http/types.h b/src/base/http/types.h similarity index 100% rename from src/core/http/types.h rename to src/base/http/types.h diff --git a/src/core/iconprovider.cpp b/src/base/iconprovider.cpp similarity index 100% rename from src/core/iconprovider.cpp rename to src/base/iconprovider.cpp diff --git a/src/core/iconprovider.h b/src/base/iconprovider.h similarity index 100% rename from src/core/iconprovider.h rename to src/base/iconprovider.h diff --git a/src/core/logger.cpp b/src/base/logger.cpp similarity index 100% rename from src/core/logger.cpp rename to src/base/logger.cpp diff --git a/src/core/logger.h b/src/base/logger.h similarity index 100% rename from src/core/logger.h rename to src/base/logger.h diff --git a/src/core/net/dnsupdater.cpp b/src/base/net/dnsupdater.cpp similarity index 99% rename from src/core/net/dnsupdater.cpp rename to src/base/net/dnsupdater.cpp index 97dde9f30..c9aa6c2ca 100644 --- a/src/core/net/dnsupdater.cpp +++ b/src/base/net/dnsupdater.cpp @@ -36,7 +36,7 @@ #include #endif -#include "core/logger.h" +#include "base/logger.h" #include "dnsupdater.h" using namespace Net; diff --git a/src/core/net/dnsupdater.h b/src/base/net/dnsupdater.h similarity index 98% rename from src/core/net/dnsupdater.h rename to src/base/net/dnsupdater.h index 0cc809360..49afc4623 100644 --- a/src/core/net/dnsupdater.h +++ b/src/base/net/dnsupdater.h @@ -36,7 +36,7 @@ #include #include #include -#include "core/preferences.h" +#include "base/preferences.h" namespace Net { diff --git a/src/core/net/downloadhandler.cpp b/src/base/net/downloadhandler.cpp similarity index 99% rename from src/core/net/downloadhandler.cpp rename to src/base/net/downloadhandler.cpp index b9a557348..b77c59d1e 100644 --- a/src/core/net/downloadhandler.cpp +++ b/src/base/net/downloadhandler.cpp @@ -36,9 +36,9 @@ #include #include -#include "core/utils/fs.h" -#include "core/utils/gzip.h" -#include "core/utils/misc.h" +#include "base/utils/fs.h" +#include "base/utils/gzip.h" +#include "base/utils/misc.h" #include "downloadmanager.h" #include "downloadhandler.h" diff --git a/src/core/net/downloadhandler.h b/src/base/net/downloadhandler.h similarity index 100% rename from src/core/net/downloadhandler.h rename to src/base/net/downloadhandler.h diff --git a/src/core/net/downloadmanager.cpp b/src/base/net/downloadmanager.cpp similarity index 99% rename from src/core/net/downloadmanager.cpp rename to src/base/net/downloadmanager.cpp index b048877b5..c21fb813a 100644 --- a/src/core/net/downloadmanager.cpp +++ b/src/base/net/downloadmanager.cpp @@ -36,7 +36,7 @@ #include #include -#include "core/preferences.h" +#include "base/preferences.h" #include "downloadhandler.h" #include "downloadmanager.h" diff --git a/src/core/net/downloadmanager.h b/src/base/net/downloadmanager.h similarity index 100% rename from src/core/net/downloadmanager.h rename to src/base/net/downloadmanager.h diff --git a/src/core/net/geoipmanager.cpp b/src/base/net/geoipmanager.cpp similarity index 99% rename from src/core/net/geoipmanager.cpp rename to src/base/net/geoipmanager.cpp index cd0ed797a..b8c25b4d3 100644 --- a/src/core/net/geoipmanager.cpp +++ b/src/base/net/geoipmanager.cpp @@ -33,10 +33,10 @@ #include #include -#include "core/logger.h" -#include "core/preferences.h" -#include "core/utils/fs.h" -#include "core/utils/gzip.h" +#include "base/logger.h" +#include "base/preferences.h" +#include "base/utils/fs.h" +#include "base/utils/gzip.h" #include "downloadmanager.h" #include "downloadhandler.h" #include "private/geoipdatabase.h" diff --git a/src/core/net/geoipmanager.h b/src/base/net/geoipmanager.h similarity index 100% rename from src/core/net/geoipmanager.h rename to src/base/net/geoipmanager.h diff --git a/src/core/net/portforwarder.cpp b/src/base/net/portforwarder.cpp similarity index 98% rename from src/core/net/portforwarder.cpp rename to src/base/net/portforwarder.cpp index 53b258c0e..456b794b1 100644 --- a/src/core/net/portforwarder.cpp +++ b/src/base/net/portforwarder.cpp @@ -30,8 +30,8 @@ #include -#include "core/logger.h" -#include "core/preferences.h" +#include "base/logger.h" +#include "base/preferences.h" #include "portforwarder.h" namespace libt = libtorrent; diff --git a/src/core/net/portforwarder.h b/src/base/net/portforwarder.h similarity index 100% rename from src/core/net/portforwarder.h rename to src/base/net/portforwarder.h diff --git a/src/core/net/private/geoipdatabase.cpp b/src/base/net/private/geoipdatabase.cpp similarity index 99% rename from src/core/net/private/geoipdatabase.cpp rename to src/base/net/private/geoipdatabase.cpp index 6eaa5728e..52a147b24 100644 --- a/src/core/net/private/geoipdatabase.cpp +++ b/src/base/net/private/geoipdatabase.cpp @@ -33,7 +33,7 @@ #include #include -#include "core/types.h" +#include "base/types.h" #include "geoipdatabase.h" namespace diff --git a/src/core/net/private/geoipdatabase.h b/src/base/net/private/geoipdatabase.h similarity index 100% rename from src/core/net/private/geoipdatabase.h rename to src/base/net/private/geoipdatabase.h diff --git a/src/core/net/reverseresolution.cpp b/src/base/net/reverseresolution.cpp similarity index 100% rename from src/core/net/reverseresolution.cpp rename to src/base/net/reverseresolution.cpp diff --git a/src/core/net/reverseresolution.h b/src/base/net/reverseresolution.h similarity index 100% rename from src/core/net/reverseresolution.h rename to src/base/net/reverseresolution.h diff --git a/src/core/net/smtp.cpp b/src/base/net/smtp.cpp similarity index 99% rename from src/core/net/smtp.cpp rename to src/base/net/smtp.cpp index a510941ce..e232beeb4 100644 --- a/src/core/net/smtp.cpp +++ b/src/base/net/smtp.cpp @@ -33,8 +33,8 @@ */ #include "smtp.h" -#include "core/preferences.h" -#include "core/logger.h" +#include "base/preferences.h" +#include "base/logger.h" #include #ifndef QT_NO_OPENSSL diff --git a/src/core/net/smtp.h b/src/base/net/smtp.h similarity index 100% rename from src/core/net/smtp.h rename to src/base/net/smtp.h diff --git a/src/core/preferences.cpp b/src/base/preferences.cpp similarity index 99% rename from src/core/preferences.cpp rename to src/base/preferences.cpp index 08c6e5c36..590039380 100644 --- a/src/core/preferences.cpp +++ b/src/base/preferences.cpp @@ -52,8 +52,8 @@ #endif #include -#include "core/utils/fs.h" -#include "core/utils/misc.h" +#include "base/utils/fs.h" +#include "base/utils/misc.h" Preferences* Preferences::m_instance = 0; diff --git a/src/core/preferences.h b/src/base/preferences.h similarity index 99% rename from src/core/preferences.h rename to src/base/preferences.h index 41d99781c..4767a1d59 100644 --- a/src/core/preferences.h +++ b/src/base/preferences.h @@ -41,7 +41,7 @@ #include #include -#include "core/types.h" +#include "base/types.h" enum scheduler_days { diff --git a/src/core/qinisettings.h b/src/base/qinisettings.h similarity index 100% rename from src/core/qinisettings.h rename to src/base/qinisettings.h diff --git a/src/core/scanfoldersmodel.cpp b/src/base/scanfoldersmodel.cpp similarity index 100% rename from src/core/scanfoldersmodel.cpp rename to src/base/scanfoldersmodel.cpp diff --git a/src/core/scanfoldersmodel.h b/src/base/scanfoldersmodel.h similarity index 100% rename from src/core/scanfoldersmodel.h rename to src/base/scanfoldersmodel.h diff --git a/src/core/torrentfilter.cpp b/src/base/torrentfilter.cpp similarity index 100% rename from src/core/torrentfilter.cpp rename to src/base/torrentfilter.cpp diff --git a/src/core/torrentfilter.h b/src/base/torrentfilter.h similarity index 100% rename from src/core/torrentfilter.h rename to src/base/torrentfilter.h diff --git a/src/core/tristatebool.cpp b/src/base/tristatebool.cpp similarity index 100% rename from src/core/tristatebool.cpp rename to src/base/tristatebool.cpp diff --git a/src/core/tristatebool.h b/src/base/tristatebool.h similarity index 100% rename from src/core/tristatebool.h rename to src/base/tristatebool.h diff --git a/src/core/types.h b/src/base/types.h similarity index 100% rename from src/core/types.h rename to src/base/types.h diff --git a/src/core/unicodestrings.h b/src/base/unicodestrings.h similarity index 100% rename from src/core/unicodestrings.h rename to src/base/unicodestrings.h diff --git a/src/core/utils/fs.cpp b/src/base/utils/fs.cpp similarity index 100% rename from src/core/utils/fs.cpp rename to src/base/utils/fs.cpp diff --git a/src/core/utils/fs.h b/src/base/utils/fs.h similarity index 100% rename from src/core/utils/fs.h rename to src/base/utils/fs.h diff --git a/src/core/utils/gzip.cpp b/src/base/utils/gzip.cpp similarity index 100% rename from src/core/utils/gzip.cpp rename to src/base/utils/gzip.cpp diff --git a/src/core/utils/gzip.h b/src/base/utils/gzip.h similarity index 100% rename from src/core/utils/gzip.h rename to src/base/utils/gzip.h diff --git a/src/core/utils/misc.cpp b/src/base/utils/misc.cpp similarity index 99% rename from src/core/utils/misc.cpp rename to src/base/utils/misc.cpp index 24efe5281..3a637b827 100644 --- a/src/core/utils/misc.cpp +++ b/src/base/utils/misc.cpp @@ -72,9 +72,9 @@ const int UNLEN = 256; #include #endif -#include "core/utils/string.h" -#include "core/unicodestrings.h" -#include "core/logger.h" +#include "base/utils/string.h" +#include "base/unicodestrings.h" +#include "base/logger.h" #include "misc.h" #include "fs.h" diff --git a/src/core/utils/misc.h b/src/base/utils/misc.h similarity index 99% rename from src/core/utils/misc.h rename to src/base/utils/misc.h index e2d3e9964..fd62a637b 100644 --- a/src/core/utils/misc.h +++ b/src/base/utils/misc.h @@ -39,7 +39,7 @@ #include #include #include -#include "core/types.h" +#include "base/types.h" /* Miscellaneous functions that can be useful */ diff --git a/src/core/utils/string.cpp b/src/base/utils/string.cpp similarity index 100% rename from src/core/utils/string.cpp rename to src/base/utils/string.cpp diff --git a/src/core/utils/string.h b/src/base/utils/string.h similarity index 100% rename from src/core/utils/string.h rename to src/base/utils/string.h diff --git a/src/gui/about_imp.h b/src/gui/about_imp.h index f3b3e7584..762af37fc 100644 --- a/src/gui/about_imp.h +++ b/src/gui/about_imp.h @@ -36,7 +36,7 @@ #include #include #include -#include "core/unicodestrings.h" +#include "base/unicodestrings.h" class about : public QDialog, private Ui::AboutDlg{ Q_OBJECT diff --git a/src/gui/addnewtorrentdialog.cpp b/src/gui/addnewtorrentdialog.cpp index 4712e4581..7bee8afa5 100644 --- a/src/gui/addnewtorrentdialog.cpp +++ b/src/gui/addnewtorrentdialog.cpp @@ -35,16 +35,16 @@ #include #include -#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" diff --git a/src/gui/addnewtorrentdialog.h b/src/gui/addnewtorrentdialog.h index e12f8758b..ae54f208a 100644 --- a/src/gui/addnewtorrentdialog.h +++ b/src/gui/addnewtorrentdialog.h @@ -35,8 +35,8 @@ #include #include -#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 { diff --git a/src/gui/advancedsettings.h b/src/gui/advancedsettings.h index 28f2c9115..f73192d3c 100644 --- a/src/gui/advancedsettings.h +++ b/src/gui/advancedsettings.h @@ -10,7 +10,7 @@ #include #include -#include "core/preferences.h" +#include "base/preferences.h" enum AdvSettingsCols { diff --git a/src/gui/deletionconfirmationdlg.h b/src/gui/deletionconfirmationdlg.h index 6356dfc2d..056fb526e 100644 --- a/src/gui/deletionconfirmationdlg.h +++ b/src/gui/deletionconfirmationdlg.h @@ -34,9 +34,9 @@ #include #include #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 diff --git a/src/gui/executionlog.cpp b/src/gui/executionlog.cpp index 57ec1d20f..f55946850 100644 --- a/src/gui/executionlog.cpp +++ b/src/gui/executionlog.cpp @@ -35,7 +35,7 @@ #include #include "executionlog.h" #include "ui_executionlog.h" -#include "core/logger.h" +#include "base/logger.h" #include "guiiconprovider.h" #include "loglistwidget.h" diff --git a/src/gui/guiiconprovider.cpp b/src/gui/guiiconprovider.cpp index 8fdd65a80..ae968115f 100644 --- a/src/gui/guiiconprovider.cpp +++ b/src/gui/guiiconprovider.cpp @@ -28,7 +28,7 @@ */ #include "guiiconprovider.h" -#include "core/preferences.h" +#include "base/preferences.h" #include #if (defined(Q_OS_UNIX) && !defined(Q_OS_MAC)) diff --git a/src/gui/guiiconprovider.h b/src/gui/guiiconprovider.h index 80d672ae2..2b6ad07d5 100644 --- a/src/gui/guiiconprovider.h +++ b/src/gui/guiiconprovider.h @@ -30,7 +30,7 @@ #ifndef GUIICONPROVIDER_H #define GUIICONPROVIDER_H -#include "core/iconprovider.h" +#include "base/iconprovider.h" class QIcon; diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index 8343b4c3f..ac9bbd729 100644 --- a/src/gui/mainwindow.cpp +++ b/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 diff --git a/src/gui/options_imp.cpp b/src/gui/options_imp.cpp index c1b6b1e03..64b0a6cfa 100644 --- a/src/gui/options_imp.cpp +++ b/src/gui/options_imp.cpp @@ -42,14 +42,14 @@ #include #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 diff --git a/src/gui/previewlistdelegate.h b/src/gui/previewlistdelegate.h index 0330c045a..9a7cb3601 100644 --- a/src/gui/previewlistdelegate.h +++ b/src/gui/previewlistdelegate.h @@ -37,8 +37,8 @@ #include #include #include -#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 diff --git a/src/gui/previewselect.cpp b/src/gui/previewselect.cpp index f37fe3654..0ae6b5232 100644 --- a/src/gui/previewselect.cpp +++ b/src/gui/previewselect.cpp @@ -36,11 +36,11 @@ #include #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) diff --git a/src/gui/previewselect.h b/src/gui/previewselect.h index 023eef08e..16f509bcb 100644 --- a/src/gui/previewselect.h +++ b/src/gui/previewselect.h @@ -34,7 +34,7 @@ #include #include #include "ui_preview.h" -#include "core/bittorrent/torrenthandle.h" +#include "base/bittorrent/torrenthandle.h" class PreviewListDelegate; diff --git a/src/gui/programupdater.cpp b/src/gui/programupdater.cpp index b71958b42..7a0a93900 100644 --- a/src/gui/programupdater.cpp +++ b/src/gui/programupdater.cpp @@ -39,8 +39,8 @@ #include #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"); diff --git a/src/gui/properties/peerlistdelegate.h b/src/gui/properties/peerlistdelegate.h index 21a0d3b57..1c5be0cb5 100644 --- a/src/gui/properties/peerlistdelegate.h +++ b/src/gui/properties/peerlistdelegate.h @@ -33,8 +33,8 @@ #include #include -#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 diff --git a/src/gui/properties/peerlistwidget.cpp b/src/gui/properties/peerlistwidget.cpp index 32efd2436..c6a8360c8 100644 --- a/src/gui/properties/peerlistwidget.cpp +++ b/src/gui/properties/peerlistwidget.cpp @@ -36,14 +36,14 @@ #include #include -#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" diff --git a/src/gui/properties/peersadditiondlg.h b/src/gui/properties/peersadditiondlg.h index d92a6c39e..5618ddf05 100644 --- a/src/gui/properties/peersadditiondlg.h +++ b/src/gui/properties/peersadditiondlg.h @@ -33,7 +33,7 @@ #include -#include "core/bittorrent/peerinfo.h" +#include "base/bittorrent/peerinfo.h" #include "ui_peersadditiondlg.h" class PeersAdditionDlg: public QDialog, private Ui::addPeersDialog diff --git a/src/gui/properties/propertieswidget.cpp b/src/gui/properties/propertieswidget.cpp index b3f2cefb5..bab2c717a 100644 --- a/src/gui/properties/propertieswidget.cpp +++ b/src/gui/properties/propertieswidget.cpp @@ -41,12 +41,12 @@ #include #include -#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" diff --git a/src/gui/properties/propertieswidget.h b/src/gui/properties/propertieswidget.h index 3c845e0dc..854a99483 100644 --- a/src/gui/properties/propertieswidget.h +++ b/src/gui/properties/propertieswidget.h @@ -34,7 +34,7 @@ #include #include #include "ui_propertieswidget.h" -#include "core/bittorrent/torrenthandle.h" +#include "base/bittorrent/torrenthandle.h" class TransferListWidget; diff --git a/src/gui/properties/proplistdelegate.cpp b/src/gui/properties/proplistdelegate.cpp index 5afd028a7..d75fb97e0 100644 --- a/src/gui/properties/proplistdelegate.cpp +++ b/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" diff --git a/src/gui/properties/speedplotview.cpp b/src/gui/properties/speedplotview.cpp index d4cab2611..67ea81922 100644 --- a/src/gui/properties/speedplotview.cpp +++ b/src/gui/properties/speedplotview.cpp @@ -30,7 +30,7 @@ #include #include -#include "core/utils/misc.h" +#include "base/utils/misc.h" SpeedPlotView::SpeedPlotView(QWidget *parent) : QGraphicsView(parent) diff --git a/src/gui/properties/speedwidget.cpp b/src/gui/properties/speedwidget.cpp index 92ce17bf1..6a321c2f8 100644 --- a/src/gui/properties/speedwidget.cpp +++ b/src/gui/properties/speedwidget.cpp @@ -37,10 +37,10 @@ #include #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) diff --git a/src/gui/properties/trackerlist.cpp b/src/gui/properties/trackerlist.cpp index fb9bf8d91..9772c38cf 100644 --- a/src/gui/properties/trackerlist.cpp +++ b/src/gui/properties/trackerlist.cpp @@ -42,12 +42,12 @@ #include #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" diff --git a/src/gui/properties/trackersadditiondlg.cpp b/src/gui/properties/trackersadditiondlg.cpp index f170639ae..366824ee4 100644 --- a/src/gui/properties/trackersadditiondlg.cpp +++ b/src/gui/properties/trackersadditiondlg.cpp @@ -33,12 +33,12 @@ #include #include -#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" diff --git a/src/gui/rss/automatedrssdownloader.cpp b/src/gui/rss/automatedrssdownloader.cpp index b51c7bec1..bf5684a57 100644 --- a/src/gui/rss/automatedrssdownloader.cpp +++ b/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& manager, QWidget *parent) : QDialog(parent), diff --git a/src/gui/rss/htmlbrowser.cpp b/src/gui/rss/htmlbrowser.cpp index dbcec40ba..82ea75821 100644 --- a/src/gui/rss/htmlbrowser.cpp +++ b/src/gui/rss/htmlbrowser.cpp @@ -10,7 +10,7 @@ #include #include -#include "core/utils/fs.h" +#include "base/utils/fs.h" HtmlBrowser::HtmlBrowser(QWidget* parent) : QTextBrowser(parent) diff --git a/src/gui/rss/rss_imp.cpp b/src/gui/rss/rss_imp.cpp index 409a0a83c..2cda0096c 100644 --- a/src/gui/rss/rss_imp.cpp +++ b/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" diff --git a/src/gui/rss/rssdownloadrule.cpp b/src/gui/rss/rssdownloadrule.cpp index 5c420f9db..cd37a3a56 100644 --- a/src/gui/rss/rssdownloadrule.cpp +++ b/src/gui/rss/rssdownloadrule.cpp @@ -33,10 +33,10 @@ #include #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) { diff --git a/src/gui/rss/rssdownloadrulelist.cpp b/src/gui/rss/rssdownloadrulelist.cpp index 33ae84ea4..12f6a9710 100644 --- a/src/gui/rss/rssdownloadrulelist.cpp +++ b/src/gui/rss/rssdownloadrulelist.cpp @@ -33,8 +33,8 @@ #include #include "rssdownloadrulelist.h" -#include "core/preferences.h" -#include "core/qinisettings.h" +#include "base/preferences.h" +#include "base/qinisettings.h" RssDownloadRuleList::RssDownloadRuleList() { diff --git a/src/gui/rss/rssfeed.cpp b/src/gui/rss/rssfeed.cpp index 865606960..7659ecae1 100644 --- a/src/gui/rss/rssfeed.cpp +++ b/src/gui/rss/rssfeed.cpp @@ -31,19 +31,19 @@ #include #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) { diff --git a/src/gui/rss/rssfolder.cpp b/src/gui/rss/rssfolder.cpp index cb5c9cae0..12b16e6df 100644 --- a/src/gui/rss/rssfolder.cpp +++ b/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" diff --git a/src/gui/rss/rssmanager.cpp b/src/gui/rss/rssmanager.cpp index 5ec47edbe..338c82d17 100644 --- a/src/gui/rss/rssmanager.cpp +++ b/src/gui/rss/rssmanager.cpp @@ -30,8 +30,8 @@ #include #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" diff --git a/src/gui/rss/rssparser.cpp b/src/gui/rss/rssparser.cpp index b3a1cac37..e09023cea 100644 --- a/src/gui/rss/rssparser.cpp +++ b/src/gui/rss/rssparser.cpp @@ -29,7 +29,7 @@ */ #include "rssparser.h" -#include "core/utils/fs.h" +#include "base/utils/fs.h" #include #include diff --git a/src/gui/rss/rsssettingsdlg.cpp b/src/gui/rss/rsssettingsdlg.cpp index 627a30a89..08acc1d96 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 "core/preferences.h" +#include "base/preferences.h" RssSettingsDlg::RssSettingsDlg(QWidget *parent) : QDialog(parent), diff --git a/src/gui/shutdownconfirm.cpp b/src/gui/shutdownconfirm.cpp index 50932ff58..8fc204320 100644 --- a/src/gui/shutdownconfirm.cpp +++ b/src/gui/shutdownconfirm.cpp @@ -30,7 +30,7 @@ * Contact : hammered999@gmail.com */ -#include "core/types.h" +#include "base/types.h" #include "shutdownconfirm.h" #include diff --git a/src/gui/shutdownconfirm.h b/src/gui/shutdownconfirm.h index 26a3f8d05..b28792945 100644 --- a/src/gui/shutdownconfirm.h +++ b/src/gui/shutdownconfirm.h @@ -33,7 +33,7 @@ #include #include -#include "core/utils/misc.h" +#include "base/utils/misc.h" class ShutdownConfirmDlg : public QMessageBox { diff --git a/src/gui/speedlimitdlg.cpp b/src/gui/speedlimitdlg.cpp index 65094b529..c9ba9cb1b 100644 --- a/src/gui/speedlimitdlg.cpp +++ b/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) { diff --git a/src/gui/speedlimitdlg.h b/src/gui/speedlimitdlg.h index 7e26da027..e62f07da7 100644 --- a/src/gui/speedlimitdlg.h +++ b/src/gui/speedlimitdlg.h @@ -34,8 +34,8 @@ #include #include #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 diff --git a/src/gui/statsdialog.cpp b/src/gui/statsdialog.cpp index dba0b9fa0..8b1321171 100644 --- a/src/gui/statsdialog.cpp +++ b/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) diff --git a/src/gui/statusbar.cpp b/src/gui/statusbar.cpp index 47cab07cd..211ec7811 100644 --- a/src/gui/statusbar.cpp +++ b/src/gui/statusbar.cpp @@ -33,13 +33,13 @@ #include #include -#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) diff --git a/src/gui/torrentcontentfiltermodel.cpp b/src/gui/torrentcontentfiltermodel.cpp index 48c9e2e6b..ac0a0edf5 100644 --- a/src/gui/torrentcontentfiltermodel.cpp +++ b/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" diff --git a/src/gui/torrentcontentmodel.cpp b/src/gui/torrentcontentmodel.cpp index 018bcd2f8..2a351fbc9 100644 --- a/src/gui/torrentcontentmodel.cpp +++ b/src/gui/torrentcontentmodel.cpp @@ -32,8 +32,8 @@ #include #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" diff --git a/src/gui/torrentcontentmodel.h b/src/gui/torrentcontentmodel.h index 25448190a..547c85cfb 100644 --- a/src/gui/torrentcontentmodel.h +++ b/src/gui/torrentcontentmodel.h @@ -36,7 +36,7 @@ #include #include -#include "core/bittorrent/torrentinfo.h" +#include "base/bittorrent/torrentinfo.h" #include "torrentcontentmodelitem.h" class TorrentContentModelFile; diff --git a/src/gui/torrentcontentmodelitem.cpp b/src/gui/torrentcontentmodelitem.cpp index 0f31dc296..65522b5d2 100644 --- a/src/gui/torrentcontentmodelitem.cpp +++ b/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 diff --git a/src/gui/torrentcreatordlg.cpp b/src/gui/torrentcreatordlg.cpp index a8b522316..1dec48678 100644 --- a/src/gui/torrentcreatordlg.cpp +++ b/src/gui/torrentcreatordlg.cpp @@ -33,13 +33,13 @@ #include #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; diff --git a/src/gui/torrentimportdlg.cpp b/src/gui/torrentimportdlg.cpp index a28a6145b..8fa90a1e1 100644 --- a/src/gui/torrentimportdlg.cpp +++ b/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), diff --git a/src/gui/torrentimportdlg.h b/src/gui/torrentimportdlg.h index 568bb2811..780d38bf1 100644 --- a/src/gui/torrentimportdlg.h +++ b/src/gui/torrentimportdlg.h @@ -34,7 +34,7 @@ #include #include -#include "core/bittorrent/torrentinfo.h" +#include "base/bittorrent/torrentinfo.h" namespace Ui { diff --git a/src/gui/torrentmodel.cpp b/src/gui/torrentmodel.cpp index 7c6c84759..67f0bad0d 100644 --- a/src/gui/torrentmodel.cpp +++ b/src/gui/torrentmodel.cpp @@ -34,10 +34,10 @@ #include #include -#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); diff --git a/src/gui/trackerlogin.cpp b/src/gui/trackerlogin.cpp index 01acc782d..c13efcd1a 100644 --- a/src/gui/trackerlogin.cpp +++ b/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) diff --git a/src/gui/transferlistdelegate.cpp b/src/gui/transferlistdelegate.cpp index 099cc3170..6aeadda44 100644 --- a/src/gui/transferlistdelegate.cpp +++ b/src/gui/transferlistdelegate.cpp @@ -34,12 +34,12 @@ #include #include #include -#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 diff --git a/src/gui/transferlistfilterswidget.cpp b/src/gui/transferlistfilterswidget.cpp index f70c9d84f..b695d0565 100644 --- a/src/gui/transferlistfilterswidget.cpp +++ b/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) diff --git a/src/gui/transferlistsortmodel.cpp b/src/gui/transferlistsortmodel.cpp index e54d45a7d..658563f37 100644 --- a/src/gui/transferlistsortmodel.cpp +++ b/src/gui/transferlistsortmodel.cpp @@ -30,9 +30,9 @@ #include -#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" diff --git a/src/gui/transferlistsortmodel.h b/src/gui/transferlistsortmodel.h index 793d630cc..ded73a7ab 100644 --- a/src/gui/transferlistsortmodel.h +++ b/src/gui/transferlistsortmodel.h @@ -32,7 +32,7 @@ #define TRANSFERLISTSORTMODEL_H #include -#include "core/torrentfilter.h" +#include "base/torrentfilter.h" class QStringList; diff --git a/src/gui/transferlistwidget.cpp b/src/gui/transferlistwidget.cpp index 1a6524467..87508d747 100644 --- a/src/gui/transferlistwidget.cpp +++ b/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" diff --git a/src/gui/updownratiodlg.cpp b/src/gui/updownratiodlg.cpp index f5705fc39..d6c753e01 100644 --- a/src/gui/updownratiodlg.cpp +++ b/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) diff --git a/src/searchengine/engineselectdlg.cpp b/src/searchengine/engineselectdlg.cpp index 4e16e81e8..0d78a81ef 100644 --- a/src/searchengine/engineselectdlg.cpp +++ b/src/searchengine/engineselectdlg.cpp @@ -29,10 +29,10 @@ */ #include "engineselectdlg.h" -#include "core/net/downloadmanager.h" -#include "core/net/downloadhandler.h" -#include "core/utils/fs.h" -#include "core/utils/misc.h" +#include "base/net/downloadmanager.h" +#include "base/net/downloadhandler.h" +#include "base/utils/fs.h" +#include "base/utils/misc.h" #include "ico.h" #include "searchengine.h" #include "pluginsource.h" diff --git a/src/searchengine/searchengine.cpp b/src/searchengine/searchengine.cpp index 54e50c035..dd3f143a3 100644 --- a/src/searchengine/searchengine.cpp +++ b/src/searchengine/searchengine.cpp @@ -49,10 +49,10 @@ #endif #include "searchengine.h" -#include "core/bittorrent/session.h" -#include "core/utils/fs.h" -#include "core/utils/misc.h" -#include "core/preferences.h" +#include "base/bittorrent/session.h" +#include "base/utils/fs.h" +#include "base/utils/misc.h" +#include "base/preferences.h" #include "searchlistdelegate.h" #include "mainwindow.h" #include "addnewtorrentdialog.h" diff --git a/src/searchengine/searchlistdelegate.h b/src/searchengine/searchlistdelegate.h index d2c3a538b..78ba36ac5 100644 --- a/src/searchengine/searchlistdelegate.h +++ b/src/searchengine/searchlistdelegate.h @@ -36,7 +36,7 @@ #include #include #include -#include "core/utils/misc.h" +#include "base/utils/misc.h" #include "searchengine.h" class SearchListDelegate: public QItemDelegate { diff --git a/src/searchengine/searchsortmodel.h b/src/searchengine/searchsortmodel.h index c0cf7ec52..9b58e9964 100644 --- a/src/searchengine/searchsortmodel.h +++ b/src/searchengine/searchsortmodel.h @@ -2,7 +2,7 @@ #define SEARCHSORTMODEL_H #include -#include "core/utils/string.h" +#include "base/utils/string.h" class SearchSortModel : public QSortFilterProxyModel { Q_OBJECT diff --git a/src/searchengine/searchtab.cpp b/src/searchengine/searchtab.cpp index 3d1ce051c..e4b4e414f 100644 --- a/src/searchengine/searchtab.cpp +++ b/src/searchengine/searchtab.cpp @@ -39,9 +39,9 @@ #include "searchtab.h" #include "searchlistdelegate.h" -#include "core/utils/misc.h" +#include "base/utils/misc.h" #include "searchengine.h" -#include "core/preferences.h" +#include "base/preferences.h" SearchTab::SearchTab(SearchEngine *parent) : QWidget(), parent(parent) { diff --git a/src/searchengine/supportedengines.h b/src/searchengine/supportedengines.h index defe3531b..7835aefdb 100644 --- a/src/searchengine/supportedengines.h +++ b/src/searchengine/supportedengines.h @@ -41,9 +41,9 @@ #include #include -#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" class SearchCategories: public QObject, public QHash { Q_OBJECT diff --git a/src/src.pro b/src/src.pro index 95d19914c..7d87e9f64 100644 --- a/src/src.pro +++ b/src/src.pro @@ -61,7 +61,7 @@ win32: DEFINES += NOMINMAX INCLUDEPATH += $$PWD include(app/app.pri) -include(core/core.pri) +include(base/base.pri) !nowebui: include(webui/webui.pri) !nogui { include(gui/gui.pri) diff --git a/src/webui/abstractwebapplication.cpp b/src/webui/abstractwebapplication.cpp index 2824780a5..9e09010e4 100644 --- a/src/webui/abstractwebapplication.cpp +++ b/src/webui/abstractwebapplication.cpp @@ -35,7 +35,7 @@ #include #include -#include "core/preferences.h" +#include "base/preferences.h" #include "websessiondata.h" #include "abstractwebapplication.h" diff --git a/src/webui/abstractwebapplication.h b/src/webui/abstractwebapplication.h index 152a39f8a..ab8ad378f 100644 --- a/src/webui/abstractwebapplication.h +++ b/src/webui/abstractwebapplication.h @@ -32,9 +32,9 @@ #include #include #include -#include "core/http/types.h" -#include "core/http/responsebuilder.h" -#include "core/http/irequesthandler.h" +#include "base/http/types.h" +#include "base/http/responsebuilder.h" +#include "base/http/irequesthandler.h" struct WebSession; struct WebSessionData; diff --git a/src/webui/btjson.cpp b/src/webui/btjson.cpp index 342683709..51e779f37 100644 --- a/src/webui/btjson.cpp +++ b/src/webui/btjson.cpp @@ -29,14 +29,14 @@ */ #include "btjson.h" -#include "core/utils/misc.h" -#include "core/utils/fs.h" -#include "core/preferences.h" -#include "core/bittorrent/session.h" -#include "core/bittorrent/sessionstatus.h" -#include "core/bittorrent/torrenthandle.h" -#include "core/bittorrent/trackerentry.h" -#include "core/torrentfilter.h" +#include "base/utils/misc.h" +#include "base/utils/fs.h" +#include "base/preferences.h" +#include "base/bittorrent/session.h" +#include "base/bittorrent/sessionstatus.h" +#include "base/bittorrent/torrenthandle.h" +#include "base/bittorrent/trackerentry.h" +#include "base/torrentfilter.h" #include "jsonutils.h" #include diff --git a/src/webui/prefjson.cpp b/src/webui/prefjson.cpp index 6d74b6e1a..86517d326 100644 --- a/src/webui/prefjson.cpp +++ b/src/webui/prefjson.cpp @@ -29,9 +29,9 @@ */ #include "prefjson.h" -#include "core/preferences.h" -#include "core/scanfoldersmodel.h" -#include "core/utils/fs.h" +#include "base/preferences.h" +#include "base/scanfoldersmodel.h" +#include "base/utils/fs.h" #ifndef QT_NO_OPENSSL #include diff --git a/src/webui/webapplication.cpp b/src/webui/webapplication.cpp index c0712fd4a..d5a37a086 100644 --- a/src/webui/webapplication.cpp +++ b/src/webui/webapplication.cpp @@ -32,19 +32,20 @@ #include #include #include -#include "core/iconprovider.h" -#include "core/utils/misc.h" -#include "core/utils/fs.h" -#include "core/utils/string.h" -#include "core/preferences.h" + +#include "base/iconprovider.h" +#include "base/utils/misc.h" +#include "base/utils/fs.h" +#include "base/utils/string.h" +#include "base/preferences.h" +#include "base/bittorrent/session.h" +#include "base/bittorrent/trackerentry.h" +#include "base/bittorrent/torrentinfo.h" +#include "base/bittorrent/torrenthandle.h" +#include "base/net/downloadmanager.h" #include "btjson.h" #include "prefjson.h" #include "jsonutils.h" -#include "core/bittorrent/session.h" -#include "core/bittorrent/trackerentry.h" -#include "core/bittorrent/torrentinfo.h" -#include "core/bittorrent/torrenthandle.h" -#include "core/net/downloadmanager.h" #include "websessiondata.h" #include "webapplication.h" diff --git a/src/webui/webui.cpp b/src/webui/webui.cpp index f384c57ce..93add39c7 100644 --- a/src/webui/webui.cpp +++ b/src/webui/webui.cpp @@ -26,11 +26,11 @@ * exception statement from your version. */ -#include "core/preferences.h" -#include "core/logger.h" -#include "core/http/server.h" -#include "core/net/dnsupdater.h" -#include "core/net/portforwarder.h" +#include "base/preferences.h" +#include "base/logger.h" +#include "base/http/server.h" +#include "base/net/dnsupdater.h" +#include "base/net/portforwarder.h" #include "webapplication.h" #include "webui.h"