From 5ce99411e198766a222c2551a1d3b32975525f9b Mon Sep 17 00:00:00 2001 From: emeric Date: Thu, 5 Dec 2024 21:05:12 +0100 Subject: [PATCH] Various minor header cleanup --- src/lms/ui/Auth.cpp | 1 - src/lms/ui/LmsApplication.cpp | 2 -- src/lms/ui/LmsApplication.hpp | 1 - src/lms/ui/LmsApplicationException.hpp | 3 ++- src/lms/ui/MediaPlayer.cpp | 2 ++ src/lms/ui/MediaPlayer.hpp | 2 +- src/lms/ui/ModalManager.cpp | 1 + src/lms/ui/PlayQueue.cpp | 1 - src/lms/ui/SettingsView.cpp | 1 - src/lms/ui/common/PasswordValidator.cpp | 8 +++++++- src/lms/ui/explore/ArtistListHelpers.cpp | 3 ++- src/lms/ui/explore/ArtistView.cpp | 1 - src/lms/ui/explore/ArtistView.hpp | 2 -- src/lms/ui/explore/ArtistsView.cpp | 2 +- src/lms/ui/explore/ArtistsView.hpp | 1 - src/lms/ui/explore/DatabaseCollectorBase.hpp | 1 - src/lms/ui/explore/Filters.hpp | 2 -- src/lms/ui/explore/PlayQueueController.cpp | 1 - src/lms/ui/explore/ReleaseCollector.hpp | 1 - src/lms/ui/explore/ReleaseHelpers.hpp | 2 -- src/lms/ui/explore/ReleaseTypes.cpp | 3 ++- src/lms/ui/explore/ReleaseTypes.hpp | 1 - src/lms/ui/explore/ReleaseView.cpp | 1 - src/lms/ui/explore/ReleasesView.hpp | 2 -- src/lms/ui/explore/TrackCollector.cpp | 2 -- src/lms/ui/explore/TrackCollector.hpp | 1 - src/lms/ui/explore/TrackListHelpers.cpp | 1 - src/lms/ui/explore/TrackListView.cpp | 1 - src/lms/ui/explore/TrackListView.hpp | 1 - src/lms/ui/explore/TrackListsView.hpp | 1 - src/lms/ui/explore/TracksView.cpp | 1 - src/lms/ui/explore/TracksView.hpp | 2 -- src/lms/ui/resource/ArtworkResource.cpp | 1 - src/lms/ui/resource/AudioFileResource.cpp | 3 --- src/lms/ui/resource/AudioFileResource.hpp | 2 +- src/lms/ui/resource/DownloadResource.cpp | 1 - src/lms/ui/resource/DownloadResource.hpp | 3 +-- src/tools/cover/LmsCover.cpp | 1 - src/tools/db-generator/LmsDbGenerator.cpp | 1 - src/tools/metadata/LmsMetadata.cpp | 1 - src/tools/recommendation/LmsRecommendation.cpp | 1 - 41 files changed, 20 insertions(+), 49 deletions(-) diff --git a/src/lms/ui/Auth.cpp b/src/lms/ui/Auth.cpp index eb021da3..850f66d4 100644 --- a/src/lms/ui/Auth.cpp +++ b/src/lms/ui/Auth.cpp @@ -28,7 +28,6 @@ #include #include -#include "core/ILogger.hpp" #include "core/Service.hpp" #include "database/Session.hpp" #include "database/User.hpp" diff --git a/src/lms/ui/LmsApplication.cpp b/src/lms/ui/LmsApplication.cpp index b5aa9e9d..b5932496 100644 --- a/src/lms/ui/LmsApplication.cpp +++ b/src/lms/ui/LmsApplication.cpp @@ -29,7 +29,6 @@ #include "core/ILogger.hpp" #include "core/ITraceLogger.hpp" #include "core/Service.hpp" -#include "core/String.hpp" #include "database/Artist.hpp" #include "database/Cluster.hpp" #include "database/Db.hpp" @@ -63,7 +62,6 @@ #include "explore/Explore.hpp" #include "explore/Filters.hpp" #include "resource/ArtworkResource.hpp" -#include "resource/AudioFileResource.hpp" #include "resource/AudioTranscodingResource.hpp" namespace lms::ui diff --git a/src/lms/ui/LmsApplication.hpp b/src/lms/ui/LmsApplication.hpp index 5e59a677..8f943561 100644 --- a/src/lms/ui/LmsApplication.hpp +++ b/src/lms/ui/LmsApplication.hpp @@ -32,7 +32,6 @@ #include "Auth.hpp" #include "Notification.hpp" -#include "admin/ScannerController.hpp" namespace lms::db { diff --git a/src/lms/ui/LmsApplicationException.hpp b/src/lms/ui/LmsApplicationException.hpp index 1b986aee..8027ecd2 100644 --- a/src/lms/ui/LmsApplicationException.hpp +++ b/src/lms/ui/LmsApplicationException.hpp @@ -19,8 +19,9 @@ #pragma once +#include + #include "core/Exception.hpp" -#include "database/Types.hpp" namespace lms::ui { diff --git a/src/lms/ui/MediaPlayer.cpp b/src/lms/ui/MediaPlayer.cpp index 313f7bb5..a165aa15 100644 --- a/src/lms/ui/MediaPlayer.cpp +++ b/src/lms/ui/MediaPlayer.cpp @@ -227,6 +227,8 @@ namespace lms::ui } } + MediaPlayer::~MediaPlayer() = default; + void MediaPlayer::loadTrack(db::TrackId trackId, bool play, float replayGain) { LMS_LOG(UI, DEBUG, "Playing track ID = " << trackId.toString()); diff --git a/src/lms/ui/MediaPlayer.hpp b/src/lms/ui/MediaPlayer.hpp index 5d627c45..0bdc41e7 100644 --- a/src/lms/ui/MediaPlayer.hpp +++ b/src/lms/ui/MediaPlayer.hpp @@ -89,7 +89,7 @@ namespace lms::ui }; MediaPlayer(); - ~MediaPlayer() = default; + ~MediaPlayer() override; MediaPlayer(const MediaPlayer&) = delete; MediaPlayer& operator=(const MediaPlayer&) = delete; diff --git a/src/lms/ui/ModalManager.cpp b/src/lms/ui/ModalManager.cpp index d17e5a41..e2a5290f 100644 --- a/src/lms/ui/ModalManager.cpp +++ b/src/lms/ui/ModalManager.cpp @@ -18,6 +18,7 @@ */ #include "ModalManager.hpp" + #include "core/ILogger.hpp" namespace lms::ui diff --git a/src/lms/ui/PlayQueue.cpp b/src/lms/ui/PlayQueue.cpp index e8e86dd5..44365446 100644 --- a/src/lms/ui/PlayQueue.cpp +++ b/src/lms/ui/PlayQueue.cpp @@ -32,7 +32,6 @@ #include "core/ILogger.hpp" #include "core/Random.hpp" #include "core/Service.hpp" -#include "core/String.hpp" #include "database/Artist.hpp" #include "database/Release.hpp" #include "database/Session.hpp" diff --git a/src/lms/ui/SettingsView.cpp b/src/lms/ui/SettingsView.cpp index 73d70f58..befccef5 100644 --- a/src/lms/ui/SettingsView.cpp +++ b/src/lms/ui/SettingsView.cpp @@ -29,7 +29,6 @@ #include #include "core/IConfig.hpp" -#include "core/ILogger.hpp" #include "core/Service.hpp" #include "database/Session.hpp" #include "database/User.hpp" diff --git a/src/lms/ui/common/PasswordValidator.cpp b/src/lms/ui/common/PasswordValidator.cpp index 0c22c793..690a8e1d 100644 --- a/src/lms/ui/common/PasswordValidator.cpp +++ b/src/lms/ui/common/PasswordValidator.cpp @@ -21,7 +21,6 @@ #include -#include "core/Service.hpp" #include "services/auth/IPasswordService.hpp" #include "LmsApplication.hpp" @@ -39,6 +38,10 @@ namespace lms::ui { } + ~PasswordStrengthValidator() override = default; + PasswordStrengthValidator(const PasswordStrengthValidator&) = delete; + PasswordStrengthValidator& operator=(const PasswordStrengthValidator&) = delete; + private: Wt::WValidator::Result validate(const Wt::WString& input) const override; std::string javaScriptValidate() const override { return {}; } @@ -80,6 +83,9 @@ namespace lms::ui : _passwordService{ passwordService } { } + ~PasswordCheckValidator() = default; + PasswordCheckValidator(const PasswordCheckValidator&) = delete; + PasswordCheckValidator& operator=(const PasswordCheckValidator&) = delete; private: Wt::WValidator::Result validate(const Wt::WString& input) const override; diff --git a/src/lms/ui/explore/ArtistListHelpers.cpp b/src/lms/ui/explore/ArtistListHelpers.cpp index 00ae8580..db8be097 100644 --- a/src/lms/ui/explore/ArtistListHelpers.cpp +++ b/src/lms/ui/explore/ArtistListHelpers.cpp @@ -18,8 +18,9 @@ */ #include "ArtistListHelpers.hpp" +#include + #include "database/Artist.hpp" -#include "database/Session.hpp" #include "LmsApplication.hpp" #include "Utils.hpp" diff --git a/src/lms/ui/explore/ArtistView.cpp b/src/lms/ui/explore/ArtistView.cpp index 8a363f04..09d5cd8a 100644 --- a/src/lms/ui/explore/ArtistView.cpp +++ b/src/lms/ui/explore/ArtistView.cpp @@ -21,7 +21,6 @@ #include -#include "core/ILogger.hpp" #include "core/String.hpp" #include "database/Artist.hpp" #include "database/Cluster.hpp" diff --git a/src/lms/ui/explore/ArtistView.hpp b/src/lms/ui/explore/ArtistView.hpp index 7220e625..cdf54f75 100644 --- a/src/lms/ui/explore/ArtistView.hpp +++ b/src/lms/ui/explore/ArtistView.hpp @@ -20,9 +20,7 @@ #pragma once #include -#include -#include "core/EnumSet.hpp" #include "database/ArtistId.hpp" #include "database/Object.hpp" #include "database/ReleaseId.hpp" diff --git a/src/lms/ui/explore/ArtistsView.cpp b/src/lms/ui/explore/ArtistsView.cpp index fab15863..20b4757f 100644 --- a/src/lms/ui/explore/ArtistsView.cpp +++ b/src/lms/ui/explore/ArtistsView.cpp @@ -19,9 +19,9 @@ #include "ArtistsView.hpp" +#include #include -#include "core/ILogger.hpp" #include "database/Artist.hpp" #include "database/Session.hpp" #include "database/TrackArtistLink.hpp" diff --git a/src/lms/ui/explore/ArtistsView.hpp b/src/lms/ui/explore/ArtistsView.hpp index e00546f8..4ef4c38f 100644 --- a/src/lms/ui/explore/ArtistsView.hpp +++ b/src/lms/ui/explore/ArtistsView.hpp @@ -20,7 +20,6 @@ #pragma once #include -#include #include #include diff --git a/src/lms/ui/explore/DatabaseCollectorBase.hpp b/src/lms/ui/explore/DatabaseCollectorBase.hpp index fe8f03eb..956abbe8 100644 --- a/src/lms/ui/explore/DatabaseCollectorBase.hpp +++ b/src/lms/ui/explore/DatabaseCollectorBase.hpp @@ -22,7 +22,6 @@ #include #include #include -#include #include #include "database/Types.hpp" diff --git a/src/lms/ui/explore/Filters.hpp b/src/lms/ui/explore/Filters.hpp index d1a01175..bf380433 100644 --- a/src/lms/ui/explore/Filters.hpp +++ b/src/lms/ui/explore/Filters.hpp @@ -29,8 +29,6 @@ #include "database/ClusterId.hpp" #include "database/MediaLibraryId.hpp" -#include "Filters.hpp" - namespace lms::ui { class Filters : public Wt::WTemplate diff --git a/src/lms/ui/explore/PlayQueueController.cpp b/src/lms/ui/explore/PlayQueueController.cpp index 3af83380..518bb86c 100644 --- a/src/lms/ui/explore/PlayQueueController.cpp +++ b/src/lms/ui/explore/PlayQueueController.cpp @@ -19,7 +19,6 @@ #include "explore/PlayQueueController.hpp" -#include "database/ClusterId.hpp" #include "database/Release.hpp" #include "database/Session.hpp" #include "database/Track.hpp" diff --git a/src/lms/ui/explore/ReleaseCollector.hpp b/src/lms/ui/explore/ReleaseCollector.hpp index a4a54940..4b002e95 100644 --- a/src/lms/ui/explore/ReleaseCollector.hpp +++ b/src/lms/ui/explore/ReleaseCollector.hpp @@ -23,7 +23,6 @@ #include "DatabaseCollectorBase.hpp" -#include "database/Object.hpp" #include "database/ReleaseId.hpp" #include "database/Types.hpp" diff --git a/src/lms/ui/explore/ReleaseHelpers.hpp b/src/lms/ui/explore/ReleaseHelpers.hpp index 547efa42..791a9a2e 100644 --- a/src/lms/ui/explore/ReleaseHelpers.hpp +++ b/src/lms/ui/explore/ReleaseHelpers.hpp @@ -26,9 +26,7 @@ #include #include -#include "core/EnumSet.hpp" #include "database/Object.hpp" -#include "database/Types.hpp" #include "ReleaseTypes.hpp" diff --git a/src/lms/ui/explore/ReleaseTypes.cpp b/src/lms/ui/explore/ReleaseTypes.cpp index b844daac..6b54076a 100644 --- a/src/lms/ui/explore/ReleaseTypes.cpp +++ b/src/lms/ui/explore/ReleaseTypes.cpp @@ -20,9 +20,10 @@ #include #include -#include "ReleaseTypes.hpp" #include "core/String.hpp" +#include "ReleaseTypes.hpp" + namespace lms::core::stringUtils { template<> diff --git a/src/lms/ui/explore/ReleaseTypes.hpp b/src/lms/ui/explore/ReleaseTypes.hpp index 92db1ce5..882f4317 100644 --- a/src/lms/ui/explore/ReleaseTypes.hpp +++ b/src/lms/ui/explore/ReleaseTypes.hpp @@ -21,7 +21,6 @@ #include #include -#include #include #include "core/EnumSet.hpp" diff --git a/src/lms/ui/explore/ReleaseView.cpp b/src/lms/ui/explore/ReleaseView.cpp index ae69b29c..76466ca4 100644 --- a/src/lms/ui/explore/ReleaseView.cpp +++ b/src/lms/ui/explore/ReleaseView.cpp @@ -26,7 +26,6 @@ #include #include "av/IAudioFile.hpp" -#include "core/ILogger.hpp" #include "database/Artist.hpp" #include "database/Cluster.hpp" #include "database/Release.hpp" diff --git a/src/lms/ui/explore/ReleasesView.hpp b/src/lms/ui/explore/ReleasesView.hpp index e81dcc48..f321b2bb 100644 --- a/src/lms/ui/explore/ReleasesView.hpp +++ b/src/lms/ui/explore/ReleasesView.hpp @@ -19,8 +19,6 @@ #pragma once -#include "database/Types.hpp" - #include "ReleaseCollector.hpp" #include "common/Template.hpp" diff --git a/src/lms/ui/explore/TrackCollector.cpp b/src/lms/ui/explore/TrackCollector.cpp index 8c882e50..4bb2a338 100644 --- a/src/lms/ui/explore/TrackCollector.cpp +++ b/src/lms/ui/explore/TrackCollector.cpp @@ -19,8 +19,6 @@ #include "TrackCollector.hpp" -#include - #include "core/Service.hpp" #include "database/Session.hpp" #include "database/Track.hpp" diff --git a/src/lms/ui/explore/TrackCollector.hpp b/src/lms/ui/explore/TrackCollector.hpp index 88ce422f..034d4cb6 100644 --- a/src/lms/ui/explore/TrackCollector.hpp +++ b/src/lms/ui/explore/TrackCollector.hpp @@ -21,7 +21,6 @@ #include -#include "database/Object.hpp" #include "database/TrackId.hpp" #include "DatabaseCollectorBase.hpp" diff --git a/src/lms/ui/explore/TrackListHelpers.cpp b/src/lms/ui/explore/TrackListHelpers.cpp index f8bb10bb..40b62b9f 100644 --- a/src/lms/ui/explore/TrackListHelpers.cpp +++ b/src/lms/ui/explore/TrackListHelpers.cpp @@ -26,7 +26,6 @@ #include #include "av/IAudioFile.hpp" -#include "core/ILogger.hpp" #include "core/Service.hpp" #include "database/Artist.hpp" #include "database/Release.hpp" diff --git a/src/lms/ui/explore/TrackListView.cpp b/src/lms/ui/explore/TrackListView.cpp index cdd77b26..37336966 100644 --- a/src/lms/ui/explore/TrackListView.cpp +++ b/src/lms/ui/explore/TrackListView.cpp @@ -21,7 +21,6 @@ #include -#include "core/ILogger.hpp" #include "core/String.hpp" #include "database/Cluster.hpp" #include "database/ScanSettings.hpp" diff --git a/src/lms/ui/explore/TrackListView.hpp b/src/lms/ui/explore/TrackListView.hpp index eb765a03..2e381f3d 100644 --- a/src/lms/ui/explore/TrackListView.hpp +++ b/src/lms/ui/explore/TrackListView.hpp @@ -20,7 +20,6 @@ #pragma once #include "database/TrackListId.hpp" -#include "database/Types.hpp" #include "common/Template.hpp" diff --git a/src/lms/ui/explore/TrackListsView.hpp b/src/lms/ui/explore/TrackListsView.hpp index e169203c..8f04e4b9 100644 --- a/src/lms/ui/explore/TrackListsView.hpp +++ b/src/lms/ui/explore/TrackListsView.hpp @@ -25,7 +25,6 @@ #include "database/Object.hpp" #include "database/TrackListId.hpp" -#include "database/Types.hpp" #include "common/Template.hpp" diff --git a/src/lms/ui/explore/TracksView.cpp b/src/lms/ui/explore/TracksView.cpp index 63b1b306..b83aef68 100644 --- a/src/lms/ui/explore/TracksView.cpp +++ b/src/lms/ui/explore/TracksView.cpp @@ -22,7 +22,6 @@ #include #include -#include "core/ILogger.hpp" #include "database/Session.hpp" #include "database/Track.hpp" diff --git a/src/lms/ui/explore/TracksView.hpp b/src/lms/ui/explore/TracksView.hpp index ca1062b3..2d7db3e9 100644 --- a/src/lms/ui/explore/TracksView.hpp +++ b/src/lms/ui/explore/TracksView.hpp @@ -19,8 +19,6 @@ #pragma once -#include "database/Types.hpp" - #include "TrackCollector.hpp" #include "common/Template.hpp" diff --git a/src/lms/ui/resource/ArtworkResource.cpp b/src/lms/ui/resource/ArtworkResource.cpp index 78c9f5d1..131f085c 100644 --- a/src/lms/ui/resource/ArtworkResource.cpp +++ b/src/lms/ui/resource/ArtworkResource.cpp @@ -22,7 +22,6 @@ #include #include -#include "core/Exception.hpp" #include "core/ILogger.hpp" #include "core/ITraceLogger.hpp" #include "core/Service.hpp" diff --git a/src/lms/ui/resource/AudioFileResource.cpp b/src/lms/ui/resource/AudioFileResource.cpp index c1b0d64f..cefc5ea7 100644 --- a/src/lms/ui/resource/AudioFileResource.cpp +++ b/src/lms/ui/resource/AudioFileResource.cpp @@ -19,11 +19,8 @@ #include "AudioFileResource.hpp" -#include - #include -#include "av/IAudioFile.hpp" #include "av/RawResourceHandlerCreator.hpp" #include "core/ILogger.hpp" #include "core/ITraceLogger.hpp" diff --git a/src/lms/ui/resource/AudioFileResource.hpp b/src/lms/ui/resource/AudioFileResource.hpp index 3ed9e0a9..da00ae7d 100644 --- a/src/lms/ui/resource/AudioFileResource.hpp +++ b/src/lms/ui/resource/AudioFileResource.hpp @@ -28,7 +28,7 @@ namespace lms::ui class AudioFileResource : public Wt::WResource { public: - ~AudioFileResource(); + ~AudioFileResource() override; std::string getUrl(db::TrackId trackId) const; diff --git a/src/lms/ui/resource/DownloadResource.cpp b/src/lms/ui/resource/DownloadResource.cpp index 88acc471..812c70a3 100644 --- a/src/lms/ui/resource/DownloadResource.cpp +++ b/src/lms/ui/resource/DownloadResource.cpp @@ -22,7 +22,6 @@ #include #include -#include "core/Exception.hpp" #include "core/ILogger.hpp" #include "database/Artist.hpp" #include "database/Release.hpp" diff --git a/src/lms/ui/resource/DownloadResource.hpp b/src/lms/ui/resource/DownloadResource.hpp index 36128422..b525b560 100644 --- a/src/lms/ui/resource/DownloadResource.hpp +++ b/src/lms/ui/resource/DownloadResource.hpp @@ -23,7 +23,6 @@ #include #include "core/IZipper.hpp" -#include "core/ZipperResourceHandlerCreator.hpp" #include "database/ArtistId.hpp" #include "database/ReleaseId.hpp" #include "database/TrackId.hpp" @@ -36,7 +35,7 @@ namespace lms::ui public: static constexpr std::size_t bufferSize{ 32768 }; - ~DownloadResource(); + ~DownloadResource() override; private: void handleRequest(const Wt::Http::Request& request, Wt::Http::Response& response) override; diff --git a/src/tools/cover/LmsCover.cpp b/src/tools/cover/LmsCover.cpp index db177b01..c5e08921 100644 --- a/src/tools/cover/LmsCover.cpp +++ b/src/tools/cover/LmsCover.cpp @@ -19,7 +19,6 @@ #include #include -#include #include #include diff --git a/src/tools/db-generator/LmsDbGenerator.cpp b/src/tools/db-generator/LmsDbGenerator.cpp index b4361d24..13effd41 100644 --- a/src/tools/db-generator/LmsDbGenerator.cpp +++ b/src/tools/db-generator/LmsDbGenerator.cpp @@ -19,7 +19,6 @@ #include #include -#include #include #include #include diff --git a/src/tools/metadata/LmsMetadata.cpp b/src/tools/metadata/LmsMetadata.cpp index 96dbb7e2..0ed739af 100644 --- a/src/tools/metadata/LmsMetadata.cpp +++ b/src/tools/metadata/LmsMetadata.cpp @@ -22,7 +22,6 @@ #include #include #include -#include #include #include diff --git a/src/tools/recommendation/LmsRecommendation.cpp b/src/tools/recommendation/LmsRecommendation.cpp index 0dd76576..cf44404b 100644 --- a/src/tools/recommendation/LmsRecommendation.cpp +++ b/src/tools/recommendation/LmsRecommendation.cpp @@ -19,7 +19,6 @@ #include #include -#include #include #include