From a8c333ff25425f7369bf8060375ecd99e0215595 Mon Sep 17 00:00:00 2001 From: "Vladimir Golovnev (Glassez)" Date: Thu, 7 May 2020 20:15:33 +0300 Subject: [PATCH] Drop "private" subfolders "private" subfolders violate the structure of the project, since the existence of all other subfolders is based on a different principle. In addition, there is no clear line between "private" and "non private". --- src/base/CMakeLists.txt | 108 +++++++++--------- src/base/base.pri | 52 ++++----- .../{private => }/bandwidthscheduler.cpp | 0 .../{private => }/bandwidthscheduler.h | 0 .../{private => }/filterparserthread.cpp | 0 .../{private => }/filterparserthread.h | 0 .../{private => }/ltunderlyingtype.h | 0 .../{private => }/nativesessionextension.cpp | 0 .../{private => }/nativesessionextension.h | 0 .../{private => }/nativetorrentextension.cpp | 0 .../{private => }/nativetorrentextension.h | 0 .../{private => }/portforwarderimpl.cpp | 0 .../{private => }/portforwarderimpl.h | 0 .../{private => }/resumedatasavingmanager.cpp | 0 .../{private => }/resumedatasavingmanager.h | 0 src/base/bittorrent/session.cpp | 14 +-- .../bittorrent/{private => }/speedmonitor.cpp | 0 .../bittorrent/{private => }/speedmonitor.h | 0 .../bittorrent/{private => }/statistics.cpp | 0 .../bittorrent/{private => }/statistics.h | 0 src/base/bittorrent/torrentcreatorthread.cpp | 2 +- src/base/bittorrent/torrenthandleimpl.cpp | 2 +- src/base/bittorrent/torrenthandleimpl.h | 2 +- .../net/{private => }/downloadhandlerimpl.cpp | 0 .../net/{private => }/downloadhandlerimpl.h | 0 src/base/net/downloadmanager.cpp | 2 +- src/base/net/{private => }/geoipdatabase.cpp | 0 src/base/net/{private => }/geoipdatabase.h | 0 src/base/net/geoipmanager.cpp | 2 +- src/base/profile.cpp | 2 +- src/base/{private => }/profile_p.cpp | 0 src/base/{private => }/profile_p.h | 0 src/base/rss/rss_feed.cpp | 14 +-- src/base/rss/{private => }/rss_parser.cpp | 2 +- src/base/rss/{private => }/rss_parser.h | 0 src/gui/CMakeLists.txt | 10 +- src/gui/fspathedit.cpp | 2 +- src/gui/{private => }/fspathedit_p.cpp | 0 src/gui/{private => }/fspathedit_p.h | 0 src/gui/gui.pri | 8 +- src/gui/tristateaction.cpp | 2 +- src/gui/{private => }/tristatewidget.cpp | 0 src/gui/{private => }/tristatewidget.h | 0 43 files changed, 112 insertions(+), 112 deletions(-) rename src/base/bittorrent/{private => }/bandwidthscheduler.cpp (100%) rename src/base/bittorrent/{private => }/bandwidthscheduler.h (100%) rename src/base/bittorrent/{private => }/filterparserthread.cpp (100%) rename src/base/bittorrent/{private => }/filterparserthread.h (100%) rename src/base/bittorrent/{private => }/ltunderlyingtype.h (100%) rename src/base/bittorrent/{private => }/nativesessionextension.cpp (100%) rename src/base/bittorrent/{private => }/nativesessionextension.h (100%) rename src/base/bittorrent/{private => }/nativetorrentextension.cpp (100%) rename src/base/bittorrent/{private => }/nativetorrentextension.h (100%) rename src/base/bittorrent/{private => }/portforwarderimpl.cpp (100%) rename src/base/bittorrent/{private => }/portforwarderimpl.h (100%) rename src/base/bittorrent/{private => }/resumedatasavingmanager.cpp (100%) rename src/base/bittorrent/{private => }/resumedatasavingmanager.h (100%) rename src/base/bittorrent/{private => }/speedmonitor.cpp (100%) rename src/base/bittorrent/{private => }/speedmonitor.h (100%) rename src/base/bittorrent/{private => }/statistics.cpp (100%) rename src/base/bittorrent/{private => }/statistics.h (100%) rename src/base/net/{private => }/downloadhandlerimpl.cpp (100%) rename src/base/net/{private => }/downloadhandlerimpl.h (100%) rename src/base/net/{private => }/geoipdatabase.cpp (100%) rename src/base/net/{private => }/geoipdatabase.h (100%) rename src/base/{private => }/profile_p.cpp (100%) rename src/base/{private => }/profile_p.h (100%) rename src/base/rss/{private => }/rss_parser.cpp (99%) rename src/base/rss/{private => }/rss_parser.h (100%) rename src/gui/{private => }/fspathedit_p.cpp (100%) rename src/gui/{private => }/fspathedit_p.h (100%) rename src/gui/{private => }/tristatewidget.cpp (100%) rename src/gui/{private => }/tristatewidget.h (100%) diff --git a/src/base/CMakeLists.txt b/src/base/CMakeLists.txt index 2f8d8e232..ee304d4de 100644 --- a/src/base/CMakeLists.txt +++ b/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/private/filterparserthread.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/portforwarderimpl.h + bittorrent/resumedatasavingmanager.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 - rss/private/rss_parser.h + preferences.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/private/filterparserthread.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/portforwarderimpl.cpp + bittorrent/resumedatasavingmanager.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 - rss/private/rss_parser.cpp + preferences.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 diff --git a/src/base/base.pri b/src/base/base.pri index 749c3fade..65667a70a 100644 --- a/src/base/base.pri +++ b/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/private/filterparserthread.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/portforwarderimpl.h \ + $$PWD/bittorrent/resumedatasavingmanager.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/private/filterparserthread.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/portforwarderimpl.cpp \ + $$PWD/bittorrent/resumedatasavingmanager.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 \ diff --git a/src/base/bittorrent/private/bandwidthscheduler.cpp b/src/base/bittorrent/bandwidthscheduler.cpp similarity index 100% rename from src/base/bittorrent/private/bandwidthscheduler.cpp rename to src/base/bittorrent/bandwidthscheduler.cpp diff --git a/src/base/bittorrent/private/bandwidthscheduler.h b/src/base/bittorrent/bandwidthscheduler.h similarity index 100% rename from src/base/bittorrent/private/bandwidthscheduler.h rename to src/base/bittorrent/bandwidthscheduler.h diff --git a/src/base/bittorrent/private/filterparserthread.cpp b/src/base/bittorrent/filterparserthread.cpp similarity index 100% rename from src/base/bittorrent/private/filterparserthread.cpp rename to src/base/bittorrent/filterparserthread.cpp diff --git a/src/base/bittorrent/private/filterparserthread.h b/src/base/bittorrent/filterparserthread.h similarity index 100% rename from src/base/bittorrent/private/filterparserthread.h rename to src/base/bittorrent/filterparserthread.h diff --git a/src/base/bittorrent/private/ltunderlyingtype.h b/src/base/bittorrent/ltunderlyingtype.h similarity index 100% rename from src/base/bittorrent/private/ltunderlyingtype.h rename to src/base/bittorrent/ltunderlyingtype.h diff --git a/src/base/bittorrent/private/nativesessionextension.cpp b/src/base/bittorrent/nativesessionextension.cpp similarity index 100% rename from src/base/bittorrent/private/nativesessionextension.cpp rename to src/base/bittorrent/nativesessionextension.cpp diff --git a/src/base/bittorrent/private/nativesessionextension.h b/src/base/bittorrent/nativesessionextension.h similarity index 100% rename from src/base/bittorrent/private/nativesessionextension.h rename to src/base/bittorrent/nativesessionextension.h diff --git a/src/base/bittorrent/private/nativetorrentextension.cpp b/src/base/bittorrent/nativetorrentextension.cpp similarity index 100% rename from src/base/bittorrent/private/nativetorrentextension.cpp rename to src/base/bittorrent/nativetorrentextension.cpp diff --git a/src/base/bittorrent/private/nativetorrentextension.h b/src/base/bittorrent/nativetorrentextension.h similarity index 100% rename from src/base/bittorrent/private/nativetorrentextension.h rename to src/base/bittorrent/nativetorrentextension.h diff --git a/src/base/bittorrent/private/portforwarderimpl.cpp b/src/base/bittorrent/portforwarderimpl.cpp similarity index 100% rename from src/base/bittorrent/private/portforwarderimpl.cpp rename to src/base/bittorrent/portforwarderimpl.cpp diff --git a/src/base/bittorrent/private/portforwarderimpl.h b/src/base/bittorrent/portforwarderimpl.h similarity index 100% rename from src/base/bittorrent/private/portforwarderimpl.h rename to src/base/bittorrent/portforwarderimpl.h diff --git a/src/base/bittorrent/private/resumedatasavingmanager.cpp b/src/base/bittorrent/resumedatasavingmanager.cpp similarity index 100% rename from src/base/bittorrent/private/resumedatasavingmanager.cpp rename to src/base/bittorrent/resumedatasavingmanager.cpp diff --git a/src/base/bittorrent/private/resumedatasavingmanager.h b/src/base/bittorrent/resumedatasavingmanager.h similarity index 100% rename from src/base/bittorrent/private/resumedatasavingmanager.h rename to src/base/bittorrent/resumedatasavingmanager.h diff --git a/src/base/bittorrent/session.cpp b/src/base/bittorrent/session.cpp index 2efb3fe01..7fffb8a28 100644 --- a/src/base/bittorrent/session.cpp +++ b/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 "private/filterparserthread.h" -#include "private/ltunderlyingtype.h" -#include "private/nativesessionextension.h" -#include "private/portforwarderimpl.h" -#include "private/resumedatasavingmanager.h" -#include "private/statistics.h" +#include "nativesessionextension.h" +#include "portforwarderimpl.h" +#include "resumedatasavingmanager.h" +#include "statistics.h" #include "torrenthandleimpl.h" #include "tracker.h" #include "trackerentry.h" diff --git a/src/base/bittorrent/private/speedmonitor.cpp b/src/base/bittorrent/speedmonitor.cpp similarity index 100% rename from src/base/bittorrent/private/speedmonitor.cpp rename to src/base/bittorrent/speedmonitor.cpp diff --git a/src/base/bittorrent/private/speedmonitor.h b/src/base/bittorrent/speedmonitor.h similarity index 100% rename from src/base/bittorrent/private/speedmonitor.h rename to src/base/bittorrent/speedmonitor.h diff --git a/src/base/bittorrent/private/statistics.cpp b/src/base/bittorrent/statistics.cpp similarity index 100% rename from src/base/bittorrent/private/statistics.cpp rename to src/base/bittorrent/statistics.cpp diff --git a/src/base/bittorrent/private/statistics.h b/src/base/bittorrent/statistics.h similarity index 100% rename from src/base/bittorrent/private/statistics.h rename to src/base/bittorrent/statistics.h diff --git a/src/base/bittorrent/torrentcreatorthread.cpp b/src/base/bittorrent/torrentcreatorthread.cpp index 01489e18b..ba84afa2d 100644 --- a/src/base/bittorrent/torrentcreatorthread.cpp +++ b/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 { diff --git a/src/base/bittorrent/torrenthandleimpl.cpp b/src/base/bittorrent/torrenthandleimpl.cpp index 9be7f7f60..2508e9a9f 100644 --- a/src/base/bittorrent/torrenthandleimpl.cpp +++ b/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" diff --git a/src/base/bittorrent/torrenthandleimpl.h b/src/base/bittorrent/torrenthandleimpl.h index 8b1adfbc8..fa879e281 100644 --- a/src/base/bittorrent/torrenthandleimpl.h +++ b/src/base/bittorrent/torrenthandleimpl.h @@ -43,8 +43,8 @@ #include #include -#include "private/speedmonitor.h" #include "infohash.h" +#include "speedmonitor.h" #include "torrenthandle.h" #include "torrentinfo.h" diff --git a/src/base/net/private/downloadhandlerimpl.cpp b/src/base/net/downloadhandlerimpl.cpp similarity index 100% rename from src/base/net/private/downloadhandlerimpl.cpp rename to src/base/net/downloadhandlerimpl.cpp diff --git a/src/base/net/private/downloadhandlerimpl.h b/src/base/net/downloadhandlerimpl.h similarity index 100% rename from src/base/net/private/downloadhandlerimpl.h rename to src/base/net/downloadhandlerimpl.h diff --git a/src/base/net/downloadmanager.cpp b/src/base/net/downloadmanager.cpp index f25e71a15..a14540530 100644 --- a/src/base/net/downloadmanager.cpp +++ b/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 diff --git a/src/base/net/private/geoipdatabase.cpp b/src/base/net/geoipdatabase.cpp similarity index 100% rename from src/base/net/private/geoipdatabase.cpp rename to src/base/net/geoipdatabase.cpp diff --git a/src/base/net/private/geoipdatabase.h b/src/base/net/geoipdatabase.h similarity index 100% rename from src/base/net/private/geoipdatabase.h rename to src/base/net/geoipdatabase.h diff --git a/src/base/net/geoipmanager.cpp b/src/base/net/geoipmanager.cpp index 4e9ad7cbc..0a38fb20e 100644 --- a/src/base/net/geoipmanager.cpp +++ b/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"; diff --git a/src/base/profile.cpp b/src/base/profile.cpp index 24d168e42..5ffb80022 100644 --- a/src/base/profile.cpp +++ b/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; diff --git a/src/base/private/profile_p.cpp b/src/base/profile_p.cpp similarity index 100% rename from src/base/private/profile_p.cpp rename to src/base/profile_p.cpp diff --git a/src/base/private/profile_p.h b/src/base/profile_p.h similarity index 100% rename from src/base/private/profile_p.h rename to src/base/profile_p.h diff --git a/src/base/rss/rss_feed.cpp b/src/base/rss/rss_feed.cpp index e6d815626..49f4c197d 100644 --- a/src/base/rss/rss_feed.cpp +++ b/src/base/rss/rss_feed.cpp @@ -40,14 +40,14 @@ #include #include -#include "../asyncfilestorage.h" -#include "../global.h" -#include "../logger.h" -#include "../net/downloadmanager.h" -#include "../profile.h" -#include "../utils/fs.h" -#include "private/rss_parser.h" +#include "base/asyncfilestorage.h" +#include "base/global.h" +#include "base/logger.h" +#include "base/net/downloadmanager.h" +#include "base/profile.h" +#include "base/utils/fs.h" #include "rss_article.h" +#include "rss_parser.h" #include "rss_session.h" const QString KEY_UID(QStringLiteral("uid")); diff --git a/src/base/rss/private/rss_parser.cpp b/src/base/rss/rss_parser.cpp similarity index 99% rename from src/base/rss/private/rss_parser.cpp rename to src/base/rss/rss_parser.cpp index c4ca757c1..55d0194a0 100644 --- a/src/base/rss/private/rss_parser.cpp +++ b/src/base/rss/rss_parser.cpp @@ -40,7 +40,7 @@ #include #include -#include "../rss_article.h" +#include "rss_article.h" namespace { diff --git a/src/base/rss/private/rss_parser.h b/src/base/rss/rss_parser.h similarity index 100% rename from src/base/rss/private/rss_parser.h rename to src/base/rss/rss_parser.h diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 3d6eda992..5650aecbe 100644 --- a/src/gui/CMakeLists.txt +++ b/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 diff --git a/src/gui/fspathedit.cpp b/src/gui/fspathedit.cpp index 9d6dfcce4..fd4467183 100644 --- a/src/gui/fspathedit.cpp +++ b/src/gui/fspathedit.cpp @@ -39,7 +39,7 @@ #include #include "base/utils/fs.h" -#include "private/fspathedit_p.h" +#include "fspathedit_p.h" namespace { diff --git a/src/gui/private/fspathedit_p.cpp b/src/gui/fspathedit_p.cpp similarity index 100% rename from src/gui/private/fspathedit_p.cpp rename to src/gui/fspathedit_p.cpp diff --git a/src/gui/private/fspathedit_p.h b/src/gui/fspathedit_p.h similarity index 100% rename from src/gui/private/fspathedit_p.h rename to src/gui/fspathedit_p.h diff --git a/src/gui/gui.pri b/src/gui/gui.pri index 81d117dff..b5a7839e8 100644 --- a/src/gui/gui.pri +++ b/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 diff --git a/src/gui/tristateaction.cpp b/src/gui/tristateaction.cpp index 8371d5755..46e9abd6a 100644 --- a/src/gui/tristateaction.cpp +++ b/src/gui/tristateaction.cpp @@ -31,7 +31,7 @@ #include #include -#include "private/tristatewidget.h" +#include "tristatewidget.h" TriStateAction::TriStateAction(const QString &text, QWidget *parent) : QWidgetAction {parent} diff --git a/src/gui/private/tristatewidget.cpp b/src/gui/tristatewidget.cpp similarity index 100% rename from src/gui/private/tristatewidget.cpp rename to src/gui/tristatewidget.cpp diff --git a/src/gui/private/tristatewidget.h b/src/gui/tristatewidget.h similarity index 100% rename from src/gui/private/tristatewidget.h rename to src/gui/tristatewidget.h