Merge pull request #12779 from glassez/cleanup

Clean up source files layout

src/base/CMakeLists.txt

@@ -2,30 +2,35 @@ find_package(ZLIB 1.2.5.2 REQUIRED)
 
 add_library(qbt_base STATIC
     # headers
+    algorithm.h
+    asyncfilestorage.h
     bittorrent/addtorrentparams.h
+    bittorrent/bandwidthscheduler.h
     bittorrent/cachestatus.h
     bittorrent/downloadpriority.h
+    bittorrent/filterparserthread.h
     bittorrent/infohash.h
+    bittorrent/ltunderlyingtype.h
     bittorrent/magneturi.h
+    bittorrent/nativesessionextension.h
+    bittorrent/nativetorrentextension.h
     bittorrent/peeraddress.h
     bittorrent/peerinfo.h
-    bittorrent/private/bandwidthscheduler.h
+    bittorrent/portforwarderimpl.h
-    bittorrent/private/filterparserthread.h
+    bittorrent/resumedatasavingmanager.h
-    bittorrent/private/ltunderlyingtype.h
-    bittorrent/private/nativesessionextension.h
-    bittorrent/private/nativetorrentextension.h
-    bittorrent/private/portforwarderimpl.h
-    bittorrent/private/resumedatasavingmanager.h
-    bittorrent/private/speedmonitor.h
-    bittorrent/private/statistics.h
     bittorrent/session.h
     bittorrent/sessionstatus.h
+    bittorrent/speedmonitor.h
+    bittorrent/statistics.h
     bittorrent/torrentcreatorthread.h
     bittorrent/torrenthandle.h
     bittorrent/torrenthandleimpl.h
     bittorrent/torrentinfo.h
     bittorrent/tracker.h
     bittorrent/trackerentry.h
+    exceptions.h
+    filesystemwatcher.h
+    global.h
     http/connection.h
     http/httperror.h
     http/irequesthandler.h
@@ -34,27 +39,39 @@ add_library(qbt_base STATIC
     http/responsegenerator.h
     http/server.h
     http/types.h
+    iconprovider.h
+    indexrange.h
+    logger.h
     net/dnsupdater.h
+    net/downloadhandlerimpl.h
     net/downloadmanager.h
+    net/geoipdatabase.h
     net/geoipmanager.h
     net/portforwarder.h
-    net/private/downloadhandlerimpl.h
-    net/private/geoipdatabase.h
     net/proxyconfigurationmanager.h
     net/reverseresolution.h
     net/smtp.h
-    private/profile_p.h
+    preferences.h
-    rss/private/rss_parser.h
+    profile.h
+    profile_p.h
     rss/rss_article.h
     rss/rss_autodownloader.h
     rss/rss_autodownloadrule.h
     rss/rss_feed.h
     rss/rss_folder.h
     rss/rss_item.h
+    rss/rss_parser.h
     rss/rss_session.h
+    scanfoldersmodel.h
     search/searchdownloadhandler.h
     search/searchhandler.h
     search/searchpluginmanager.h
+    settingsstorage.h
+    torrentfileguard.h
+    torrentfilter.h
+    tristatebool.h
+    types.h
+    unicodestrings.h
     utils/bytearray.h
     utils/foreignapps.h
     utils/fs.h
@@ -66,72 +83,67 @@ add_library(qbt_base STATIC
     utils/random.h
     utils/string.h
     utils/version.h
-    algorithm.h
-    asyncfilestorage.h
-    exceptions.h
-    filesystemwatcher.h
-    global.h
-    iconprovider.h
-    indexrange.h
-    logger.h
-    preferences.h
-    profile.h
-    scanfoldersmodel.h
-    settingsstorage.h
-    torrentfileguard.h
-    torrentfilter.h
-    tristatebool.h
-    types.h
-    unicodestrings.h
 
     # sources
+    asyncfilestorage.cpp
+    bittorrent/bandwidthscheduler.cpp
     bittorrent/downloadpriority.cpp
+    bittorrent/filterparserthread.cpp
     bittorrent/infohash.cpp
     bittorrent/magneturi.cpp
+    bittorrent/nativesessionextension.cpp
+    bittorrent/nativetorrentextension.cpp
     bittorrent/peeraddress.cpp
     bittorrent/peerinfo.cpp
-    bittorrent/private/bandwidthscheduler.cpp
+    bittorrent/portforwarderimpl.cpp
-    bittorrent/private/filterparserthread.cpp
+    bittorrent/resumedatasavingmanager.cpp
-    bittorrent/private/nativesessionextension.cpp
-    bittorrent/private/nativetorrentextension.cpp
-    bittorrent/private/portforwarderimpl.cpp
-    bittorrent/private/resumedatasavingmanager.cpp
-    bittorrent/private/speedmonitor.cpp
-    bittorrent/private/statistics.cpp
     bittorrent/session.cpp
+    bittorrent/speedmonitor.cpp
+    bittorrent/statistics.cpp
     bittorrent/torrentcreatorthread.cpp
     bittorrent/torrenthandle.cpp
     bittorrent/torrenthandleimpl.cpp
     bittorrent/torrentinfo.cpp
     bittorrent/tracker.cpp
     bittorrent/trackerentry.cpp
+    exceptions.cpp
+    filesystemwatcher.cpp
     http/connection.cpp
     http/httperror.cpp
     http/requestparser.cpp
     http/responsebuilder.cpp
     http/responsegenerator.cpp
     http/server.cpp
+    iconprovider.cpp
+    logger.cpp
     net/dnsupdater.cpp
+    net/downloadhandlerimpl.cpp
     net/downloadmanager.cpp
+    net/geoipdatabase.cpp
     net/geoipmanager.cpp
     net/portforwarder.cpp
-    net/private/downloadhandlerimpl.cpp
-    net/private/geoipdatabase.cpp
     net/proxyconfigurationmanager.cpp
     net/reverseresolution.cpp
     net/smtp.cpp
-    private/profile_p.cpp
+    preferences.cpp
-    rss/private/rss_parser.cpp
+    profile.cpp
+    profile_p.cpp
     rss/rss_article.cpp
     rss/rss_autodownloader.cpp
     rss/rss_autodownloadrule.cpp
     rss/rss_feed.cpp
     rss/rss_folder.cpp
     rss/rss_item.cpp
+    rss/rss_parser.cpp
     rss/rss_session.cpp
+    scanfoldersmodel.cpp
     search/searchdownloadhandler.cpp
     search/searchhandler.cpp
     search/searchpluginmanager.cpp
+    settingsstorage.cpp
+    torrentfileguard.cpp
+    torrentfilter.cpp
+    tristatebool.cpp
     utils/bytearray.cpp
     utils/foreignapps.cpp
     utils/fs.cpp
@@ -142,18 +154,6 @@ add_library(qbt_base STATIC
     utils/password.cpp
     utils/random.cpp
     utils/string.cpp
-    asyncfilestorage.cpp
-    exceptions.cpp
-    filesystemwatcher.cpp
-    iconprovider.cpp
-    logger.cpp
-    preferences.cpp
-    profile.cpp
-    scanfoldersmodel.cpp
-    settingsstorage.cpp
-    torrentfileguard.cpp
-    torrentfilter.cpp
-    tristatebool.cpp
 )
 
 target_link_libraries(qbt_base

src/base/base.pri

@@ -2,23 +2,23 @@ HEADERS += \
     $$PWD/algorithm.h \
     $$PWD/asyncfilestorage.h \
     $$PWD/bittorrent/addtorrentparams.h  \
+    $$PWD/bittorrent/bandwidthscheduler.h \
     $$PWD/bittorrent/cachestatus.h \
     $$PWD/bittorrent/downloadpriority.h \
+    $$PWD/bittorrent/filterparserthread.h \
     $$PWD/bittorrent/infohash.h \
+    $$PWD/bittorrent/ltunderlyingtype.h \
     $$PWD/bittorrent/magneturi.h \
+    $$PWD/bittorrent/nativesessionextension.h \
+    $$PWD/bittorrent/nativetorrentextension.h \
     $$PWD/bittorrent/peeraddress.h \
     $$PWD/bittorrent/peerinfo.h \
-    $$PWD/bittorrent/private/bandwidthscheduler.h \
+    $$PWD/bittorrent/portforwarderimpl.h \
-    $$PWD/bittorrent/private/filterparserthread.h \
+    $$PWD/bittorrent/resumedatasavingmanager.h \
-    $$PWD/bittorrent/private/ltunderlyingtype.h \
-    $$PWD/bittorrent/private/nativesessionextension.h \
-    $$PWD/bittorrent/private/nativetorrentextension.h \
-    $$PWD/bittorrent/private/portforwarderimpl.h \
-    $$PWD/bittorrent/private/resumedatasavingmanager.h \
-    $$PWD/bittorrent/private/speedmonitor.h \
-    $$PWD/bittorrent/private/statistics.h \
     $$PWD/bittorrent/session.h \
     $$PWD/bittorrent/sessionstatus.h \
+    $$PWD/bittorrent/speedmonitor.h \
+    $$PWD/bittorrent/statistics.h \
     $$PWD/bittorrent/torrentcreatorthread.h \
     $$PWD/bittorrent/torrenthandle.h \
     $$PWD/bittorrent/torrenthandleimpl.h \
@@ -40,28 +40,28 @@ HEADERS += \
     $$PWD/indexrange.h \
     $$PWD/logger.h \
     $$PWD/net/dnsupdater.h \
+    $$PWD/net/downloadhandlerimpl.h \
     $$PWD/net/downloadmanager.h \
+    $$PWD/net/geoipdatabase.h \
     $$PWD/net/geoipmanager.h \
     $$PWD/net/portforwarder.h \
-    $$PWD/net/private/downloadhandlerimpl.h \
-    $$PWD/net/private/geoipdatabase.h \
     $$PWD/net/proxyconfigurationmanager.h \
     $$PWD/net/reverseresolution.h \
     $$PWD/net/smtp.h \
     $$PWD/preferences.h \
-    $$PWD/private/profile_p.h \
     $$PWD/profile.h \
-    $$PWD/rss/private/rss_parser.h \
+    $$PWD/profile_p.h \
     $$PWD/rss/rss_article.h \
     $$PWD/rss/rss_autodownloader.h \
     $$PWD/rss/rss_autodownloadrule.h \
     $$PWD/rss/rss_feed.h \
     $$PWD/rss/rss_folder.h \
     $$PWD/rss/rss_item.h \
+    $$PWD/rss/rss_parser.h \
     $$PWD/rss/rss_session.h \
     $$PWD/scanfoldersmodel.h \
-    $$PWD/search/searchhandler.h \
     $$PWD/search/searchdownloadhandler.h \
+    $$PWD/search/searchhandler.h \
     $$PWD/search/searchpluginmanager.h \
     $$PWD/settingsstorage.h \
     $$PWD/settingvalue.h \
@@ -84,20 +84,20 @@ HEADERS += \
 
 SOURCES += \
     $$PWD/asyncfilestorage.cpp \
+    $$PWD/bittorrent/bandwidthscheduler.cpp \
     $$PWD/bittorrent/downloadpriority.cpp \
+    $$PWD/bittorrent/filterparserthread.cpp \
     $$PWD/bittorrent/infohash.cpp \
     $$PWD/bittorrent/magneturi.cpp \
+    $$PWD/bittorrent/nativesessionextension.cpp \
+    $$PWD/bittorrent/nativetorrentextension.cpp \
     $$PWD/bittorrent/peeraddress.cpp \
     $$PWD/bittorrent/peerinfo.cpp \
-    $$PWD/bittorrent/private/bandwidthscheduler.cpp \
+    $$PWD/bittorrent/portforwarderimpl.cpp \
-    $$PWD/bittorrent/private/filterparserthread.cpp \
+    $$PWD/bittorrent/resumedatasavingmanager.cpp \
-    $$PWD/bittorrent/private/nativesessionextension.cpp \
-    $$PWD/bittorrent/private/nativetorrentextension.cpp \
-    $$PWD/bittorrent/private/portforwarderimpl.cpp \
-    $$PWD/bittorrent/private/resumedatasavingmanager.cpp \
-    $$PWD/bittorrent/private/speedmonitor.cpp \
-    $$PWD/bittorrent/private/statistics.cpp \
     $$PWD/bittorrent/session.cpp \
+    $$PWD/bittorrent/speedmonitor.cpp \
+    $$PWD/bittorrent/statistics.cpp \
     $$PWD/bittorrent/torrentcreatorthread.cpp \
     $$PWD/bittorrent/torrenthandle.cpp \
     $$PWD/bittorrent/torrenthandleimpl.cpp \
@@ -115,24 +115,24 @@ SOURCES += \
     $$PWD/iconprovider.cpp \
     $$PWD/logger.cpp \
     $$PWD/net/dnsupdater.cpp \
+    $$PWD/net/downloadhandlerimpl.cpp \
     $$PWD/net/downloadmanager.cpp \
+    $$PWD/net/geoipdatabase.cpp \
     $$PWD/net/geoipmanager.cpp \
     $$PWD/net/portforwarder.cpp \
-    $$PWD/net/private/downloadhandlerimpl.cpp \
-    $$PWD/net/private/geoipdatabase.cpp \
     $$PWD/net/proxyconfigurationmanager.cpp \
     $$PWD/net/reverseresolution.cpp \
     $$PWD/net/smtp.cpp \
     $$PWD/preferences.cpp \
-    $$PWD/private/profile_p.cpp \
     $$PWD/profile.cpp \
-    $$PWD/rss/private/rss_parser.cpp \
+    $$PWD/profile_p.cpp \
     $$PWD/rss/rss_article.cpp \
     $$PWD/rss/rss_autodownloader.cpp \
     $$PWD/rss/rss_autodownloadrule.cpp \
     $$PWD/rss/rss_feed.cpp \
     $$PWD/rss/rss_folder.cpp \
     $$PWD/rss/rss_item.cpp \
+    $$PWD/rss/rss_parser.cpp \
     $$PWD/rss/rss_session.cpp \
     $$PWD/scanfoldersmodel.cpp \
     $$PWD/search/searchdownloadhandler.cpp \

src/base/bittorrent/session.cpp

@@ -93,14 +93,14 @@
 #include "base/utils/misc.h"
 #include "base/utils/net.h"
 #include "base/utils/random.h"
+#include "bandwidthscheduler.h"
+#include "filterparserthread.h"
+#include "ltunderlyingtype.h"
 #include "magneturi.h"
-#include "private/bandwidthscheduler.h"
+#include "nativesessionextension.h"
-#include "private/filterparserthread.h"
+#include "portforwarderimpl.h"
-#include "private/ltunderlyingtype.h"
+#include "resumedatasavingmanager.h"
-#include "private/nativesessionextension.h"
+#include "statistics.h"
-#include "private/portforwarderimpl.h"
-#include "private/resumedatasavingmanager.h"
-#include "private/statistics.h"
 #include "torrenthandleimpl.h"
 #include "tracker.h"
 #include "trackerentry.h"

src/base/bittorrent/torrentcreatorthread.cpp

@@ -46,7 +46,7 @@
 #include "base/utils/fs.h"
 #include "base/utils/io.h"
 #include "base/utils/string.h"
-#include "private/ltunderlyingtype.h"
+#include "ltunderlyingtype.h"
 
 namespace
 {

src/base/bittorrent/torrenthandleimpl.cpp

@@ -66,9 +66,9 @@
 #include "base/utils/fs.h"
 #include "base/utils/string.h"
 #include "downloadpriority.h"
+#include "ltunderlyingtype.h"
 #include "peeraddress.h"
 #include "peerinfo.h"
-#include "private/ltunderlyingtype.h"
 #include "session.h"
 #include "trackerentry.h"
 

src/base/bittorrent/torrenthandleimpl.h

@@ -43,8 +43,8 @@
 #include <QString>
 #include <QVector>
 
-#include "private/speedmonitor.h"
 #include "infohash.h"
+#include "speedmonitor.h"
 #include "torrenthandle.h"
 #include "torrentinfo.h"
 

src/base/net/downloadmanager.cpp

@@ -44,7 +44,7 @@
 #include "base/global.h"
 #include "base/logger.h"
 #include "base/preferences.h"
-#include "private/downloadhandlerimpl.h"
+#include "downloadhandlerimpl.h"
 #include "proxyconfigurationmanager.h"
 
 namespace

src/base/net/geoipmanager.cpp

@@ -40,7 +40,7 @@
 #include "base/utils/fs.h"
 #include "base/utils/gzip.h"
 #include "downloadmanager.h"
-#include "private/geoipdatabase.h"
+#include "geoipdatabase.h"
 
 static const QString DATABASE_URL = QStringLiteral("https://download.db-ip.com/free/dbip-country-lite-%1.mmdb.gz");
 static const char GEODB_FOLDER[] = "GeoDB";

src/base/profile.cpp

@@ -29,7 +29,7 @@
 
 #include "profile.h"
 
-#include "private/profile_p.h"
+#include "profile_p.h"
 
 Profile *Profile::m_instance = nullptr;
 

src/base/rss/rss_feed.cpp

@@ -40,14 +40,14 @@
 #include <QJsonValue>
 #include <QUrl>
 
-#include "../asyncfilestorage.h"
+#include "base/asyncfilestorage.h"
-#include "../global.h"
+#include "base/global.h"
-#include "../logger.h"
+#include "base/logger.h"
-#include "../net/downloadmanager.h"
+#include "base/net/downloadmanager.h"
-#include "../profile.h"
+#include "base/profile.h"
-#include "../utils/fs.h"
+#include "base/utils/fs.h"
-#include "private/rss_parser.h"
 #include "rss_article.h"
+#include "rss_parser.h"
 #include "rss_session.h"
 
 const QString KEY_UID(QStringLiteral("uid"));

src/base/rss/rss_parser.cpp

@@ -40,7 +40,7 @@
 #include <QXmlStreamEntityResolver>
 #include <QXmlStreamReader>
 
-#include "../rss_article.h"
+#include "rss_article.h"
 
 namespace
 {

src/gui/CMakeLists.txt

@@ -17,6 +17,7 @@ add_library(qbt_gui STATIC
     downloadfromurldialog.h
     executionlogwidget.h
     fspathedit.h
+    fspathedit_p.h
     hidabletabwidget.h
     ipsubnetwhitelistoptionsdialog.h
     lineedit.h
@@ -28,8 +29,6 @@ add_library(qbt_gui STATIC
     powermanagement/powermanagement.h
     previewlistdelegate.h
     previewselectdialog.h
-    private/fspathedit_p.h
-    private/tristatewidget.h
     properties/downloadedpiecesbar.h
     properties/peerlistdelegate.h
     properties/peerlistsortmodel.h
@@ -79,10 +78,11 @@ add_library(qbt_gui STATIC
     transferlistsortmodel.h
     transferlistwidget.h
     tristateaction.h
+    tristatewidget.h
     uithememanager.h
     updownratiodialog.h
     utils.h
-
+    
     # sources
     aboutdialog.cpp
     addnewtorrentdialog.cpp
@@ -98,6 +98,7 @@ add_library(qbt_gui STATIC
     downloadfromurldialog.cpp
     executionlogwidget.cpp
     fspathedit.cpp
+    fspathedit_p.cpp
     hidabletabwidget.cpp
     ipsubnetwhitelistoptionsdialog.cpp
     lineedit.cpp
@@ -109,8 +110,6 @@ add_library(qbt_gui STATIC
     powermanagement/powermanagement.cpp
     previewlistdelegate.cpp
     previewselectdialog.cpp
-    private/fspathedit_p.cpp
-    private/tristatewidget.cpp
     properties/downloadedpiecesbar.cpp
     properties/peerlistdelegate.cpp
     properties/peerlistsortmodel.cpp
@@ -160,6 +159,7 @@ add_library(qbt_gui STATIC
     transferlistsortmodel.cpp
     transferlistwidget.cpp
     tristateaction.cpp
+    tristatewidget.cpp
     uithememanager.cpp
     updownratiodialog.cpp
     utils.cpp

src/gui/fspathedit.cpp

@@ -39,7 +39,7 @@
 #include <QToolButton>
 
 #include "base/utils/fs.h"
-#include "private/fspathedit_p.h"
+#include "fspathedit_p.h"
 
 namespace
 {

src/gui/gui.pri

@@ -15,6 +15,7 @@ HEADERS += \
     $$PWD/downloadfromurldialog.h \
     $$PWD/executionlogwidget.h \
     $$PWD/fspathedit.h \
+    $$PWD/fspathedit_p.h \
     $$PWD/hidabletabwidget.h \
     $$PWD/ipsubnetwhitelistoptionsdialog.h \
     $$PWD/lineedit.h \
@@ -26,8 +27,6 @@ HEADERS += \
     $$PWD/powermanagement/powermanagement.h \
     $$PWD/previewlistdelegate.h \
     $$PWD/previewselectdialog.h \
-    $$PWD/private/fspathedit_p.h \
-    $$PWD/private/tristatewidget.h \
     $$PWD/properties/downloadedpiecesbar.h \
     $$PWD/properties/peerlistdelegate.h \
     $$PWD/properties/peerlistsortmodel.h \
@@ -77,6 +76,7 @@ HEADERS += \
     $$PWD/transferlistsortmodel.h \
     $$PWD/transferlistwidget.h \
     $$PWD/tristateaction.h \
+    $$PWD/tristatewidget.h \
     $$PWD/uithememanager.h \
     $$PWD/updownratiodialog.h \
     $$PWD/utils.h
@@ -96,6 +96,7 @@ SOURCES += \
     $$PWD/downloadfromurldialog.cpp \
     $$PWD/executionlogwidget.cpp \
     $$PWD/fspathedit.cpp \
+    $$PWD/fspathedit_p.cpp \
     $$PWD/hidabletabwidget.cpp \
     $$PWD/ipsubnetwhitelistoptionsdialog.cpp \
     $$PWD/lineedit.cpp \
@@ -107,8 +108,6 @@ SOURCES += \
     $$PWD/powermanagement/powermanagement.cpp \
     $$PWD/previewlistdelegate.cpp \
     $$PWD/previewselectdialog.cpp \
-    $$PWD/private/fspathedit_p.cpp \
-    $$PWD/private/tristatewidget.cpp \
     $$PWD/properties/downloadedpiecesbar.cpp \
     $$PWD/properties/peerlistdelegate.cpp \
     $$PWD/properties/peerlistsortmodel.cpp \
@@ -158,6 +157,7 @@ SOURCES += \
     $$PWD/transferlistsortmodel.cpp \
     $$PWD/transferlistwidget.cpp \
     $$PWD/tristateaction.cpp \
+    $$PWD/tristatewidget.cpp \
     $$PWD/uithememanager.cpp \
     $$PWD/updownratiodialog.cpp \
     $$PWD/utils.cpp

src/gui/tristateaction.cpp

@@ -31,7 +31,7 @@
 #include <QString>
 #include <QWidget>
 
-#include "private/tristatewidget.h"
+#include "tristatewidget.h"
 
 TriStateAction::TriStateAction(const QString &text, QWidget *parent)
     : QWidgetAction {parent}