Various minor header cleanup

src/lms/ui/Auth.cpp

@@ -28,7 +28,6 @@
 #include <Wt/WPushButton.h>
 #include <Wt/WRandom.h>
 
-#include "core/ILogger.hpp"
 #include "core/Service.hpp"
 #include "database/Session.hpp"
 #include "database/User.hpp"

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

src/lms/ui/LmsApplication.hpp

@@ -32,7 +32,6 @@
 
 #include "Auth.hpp"
 #include "Notification.hpp"
-#include "admin/ScannerController.hpp"
 
 namespace lms::db
 {

src/lms/ui/LmsApplicationException.hpp

@@ -19,8 +19,9 @@
 
 #pragma once
 
+#include <Wt/WString.h>
+
 #include "core/Exception.hpp"
-#include "database/Types.hpp"
 
 namespace lms::ui
 {

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());

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;
 

src/lms/ui/ModalManager.cpp

@@ -18,6 +18,7 @@
  */
 
 #include "ModalManager.hpp"
+
 #include "core/ILogger.hpp"
 
 namespace lms::ui

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"

src/lms/ui/SettingsView.cpp

@@ -29,7 +29,6 @@
 #include <Wt/WTemplateFormView.h>
 
 #include "core/IConfig.hpp"
-#include "core/ILogger.hpp"
 #include "core/Service.hpp"
 #include "database/Session.hpp"
 #include "database/User.hpp"

src/lms/ui/common/PasswordValidator.cpp

@@ -21,7 +21,6 @@
 
 #include <Wt/WEnvironment.h>
 
-#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;

src/lms/ui/explore/ArtistListHelpers.cpp

@@ -18,8 +18,9 @@
  */
 #include "ArtistListHelpers.hpp"
 
+#include <Wt/WAnchor.h>
+
 #include "database/Artist.hpp"
-#include "database/Session.hpp"
 
 #include "LmsApplication.hpp"
 #include "Utils.hpp"

src/lms/ui/explore/ArtistView.cpp

@@ -21,7 +21,6 @@
 
 #include <Wt/WPushButton.h>
 
-#include "core/ILogger.hpp"
 #include "core/String.hpp"
 #include "database/Artist.hpp"
 #include "database/Cluster.hpp"

src/lms/ui/explore/ArtistView.hpp

@@ -20,9 +20,7 @@
 #pragma once
 
 #include <map>
-#include <optional>
 
-#include "core/EnumSet.hpp"
 #include "database/ArtistId.hpp"
 #include "database/Object.hpp"
 #include "database/ReleaseId.hpp"

src/lms/ui/explore/ArtistsView.cpp

@@ -19,9 +19,9 @@
 
 #include "ArtistsView.hpp"
 
+#include <Wt/WLineEdit.h>
 #include <Wt/WPushButton.h>
 
-#include "core/ILogger.hpp"
 #include "database/Artist.hpp"
 #include "database/Session.hpp"
 #include "database/TrackArtistLink.hpp"

src/lms/ui/explore/ArtistsView.hpp

@@ -20,7 +20,6 @@
 #pragma once
 
 #include <optional>
-#include <unordered_map>
 
 #include <Wt/WComboBox.h>
 #include <Wt/WTemplate.h>

src/lms/ui/explore/DatabaseCollectorBase.hpp

@@ -22,7 +22,6 @@
 #include <optional>
 #include <string>
 #include <string_view>
-#include <unordered_map>
 #include <vector>
 
 #include "database/Types.hpp"

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

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"

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"
 

src/lms/ui/explore/ReleaseHelpers.hpp

@@ -26,9 +26,7 @@
 #include <Wt/WString.h>
 #include <Wt/WTemplate.h>
 
-#include "core/EnumSet.hpp"
 #include "database/Object.hpp"
-#include "database/Types.hpp"
 
 #include "ReleaseTypes.hpp"
 

src/lms/ui/explore/ReleaseTypes.cpp

@@ -20,9 +20,10 @@
 #include <tuple>
 #include <unordered_map>
 
-#include "ReleaseTypes.hpp"
 #include "core/String.hpp"
 
+#include "ReleaseTypes.hpp"
+
 namespace lms::core::stringUtils
 {
     template<>

src/lms/ui/explore/ReleaseTypes.hpp

@@ -21,7 +21,6 @@
 
 #include <optional>
 #include <string>
-#include <string_view>
 #include <vector>
 
 #include "core/EnumSet.hpp"

src/lms/ui/explore/ReleaseView.cpp

@@ -26,7 +26,6 @@
 #include <Wt/WPushButton.h>
 
 #include "av/IAudioFile.hpp"
-#include "core/ILogger.hpp"
 #include "database/Artist.hpp"
 #include "database/Cluster.hpp"
 #include "database/Release.hpp"

src/lms/ui/explore/ReleasesView.hpp

@@ -19,8 +19,6 @@
 
 #pragma once
 
-#include "database/Types.hpp"
-
 #include "ReleaseCollector.hpp"
 #include "common/Template.hpp"
 

src/lms/ui/explore/TrackCollector.cpp

@@ -19,8 +19,6 @@
 
 #include "TrackCollector.hpp"
 
-#include <algorithm>
-
 #include "core/Service.hpp"
 #include "database/Session.hpp"
 #include "database/Track.hpp"

src/lms/ui/explore/TrackCollector.hpp

@@ -21,7 +21,6 @@
 
 #include <optional>
 
-#include "database/Object.hpp"
 #include "database/TrackId.hpp"
 
 #include "DatabaseCollectorBase.hpp"

src/lms/ui/explore/TrackListHelpers.cpp

@@ -26,7 +26,6 @@
 #include <Wt/WPushButton.h>
 
 #include "av/IAudioFile.hpp"
-#include "core/ILogger.hpp"
 #include "core/Service.hpp"
 #include "database/Artist.hpp"
 #include "database/Release.hpp"

src/lms/ui/explore/TrackListView.cpp

@@ -21,7 +21,6 @@
 
 #include <Wt/WPushButton.h>
 
-#include "core/ILogger.hpp"
 #include "core/String.hpp"
 #include "database/Cluster.hpp"
 #include "database/ScanSettings.hpp"

src/lms/ui/explore/TrackListView.hpp

@@ -20,7 +20,6 @@
 #pragma once
 
 #include "database/TrackListId.hpp"
-#include "database/Types.hpp"
 
 #include "common/Template.hpp"
 

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"
 

src/lms/ui/explore/TracksView.cpp

@@ -22,7 +22,6 @@
 #include <Wt/WLineEdit.h>
 #include <Wt/WPushButton.h>
 
-#include "core/ILogger.hpp"
 #include "database/Session.hpp"
 #include "database/Track.hpp"
 

src/lms/ui/explore/TracksView.hpp

@@ -19,8 +19,6 @@
 
 #pragma once
 
-#include "database/Types.hpp"
-
 #include "TrackCollector.hpp"
 #include "common/Template.hpp"
 

src/lms/ui/resource/ArtworkResource.cpp

@@ -22,7 +22,6 @@
 #include <Wt/Http/Response.h>
 #include <Wt/WApplication.h>
 
-#include "core/Exception.hpp"
 #include "core/ILogger.hpp"
 #include "core/ITraceLogger.hpp"
 #include "core/Service.hpp"

src/lms/ui/resource/AudioFileResource.cpp

@@ -19,11 +19,8 @@
 
 #include "AudioFileResource.hpp"
 
-#include <fstream>
-
 #include <Wt/Http/Response.h>
 
-#include "av/IAudioFile.hpp"
 #include "av/RawResourceHandlerCreator.hpp"
 #include "core/ILogger.hpp"
 #include "core/ITraceLogger.hpp"

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;
 

src/lms/ui/resource/DownloadResource.cpp

@@ -22,7 +22,6 @@
 #include <Wt/Http/Response.h>
 #include <Wt/WDateTime.h>
 
-#include "core/Exception.hpp"
 #include "core/ILogger.hpp"
 #include "database/Artist.hpp"
 #include "database/Release.hpp"

src/lms/ui/resource/DownloadResource.hpp

@@ -23,7 +23,6 @@
 #include <memory>
 
 #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;

src/tools/cover/LmsCover.cpp

@@ -19,7 +19,6 @@
 
 #include <filesystem>
 #include <iostream>
-#include <stdexcept>
 #include <stdlib.h>
 
 #include <boost/program_options.hpp>

src/tools/db-generator/LmsDbGenerator.cpp

@@ -19,7 +19,6 @@
 
 #include <chrono>
 #include <filesystem>
-#include <iomanip>
 #include <iostream>
 #include <optional>
 #include <stdexcept>

src/tools/metadata/LmsMetadata.cpp

@@ -22,7 +22,6 @@
 #include <iomanip>
 #include <iostream>
 #include <optional>
-#include <stdexcept>
 #include <stdlib.h>
 
 #include <Wt/WDate.h>

src/tools/recommendation/LmsRecommendation.cpp

@@ -19,7 +19,6 @@
 
 #include <filesystem>
 #include <iostream>
-#include <stdexcept>
 #include <stdlib.h>
 
 #include <boost/program_options.hpp>