From e97f6bb9b95ebb9111af6cfac4ef2c61181a4ca6 Mon Sep 17 00:00:00 2001 From: emeric Date: Fri, 28 Apr 2023 20:28:36 +0200 Subject: [PATCH] Fixed some warnings. ref #322 --- .../services/database/include/services/database/Artist.hpp | 2 +- .../services/database/include/services/database/AuthToken.hpp | 2 +- .../services/database/include/services/database/Cluster.hpp | 4 ++-- .../services/database/include/services/database/Listen.hpp | 2 +- .../services/database/include/services/database/Release.hpp | 2 +- .../database/include/services/database/ScanSettings.hpp | 2 +- .../database/include/services/database/StarredArtist.hpp | 2 +- .../database/include/services/database/StarredRelease.hpp | 2 +- .../database/include/services/database/StarredTrack.hpp | 2 +- .../services/database/include/services/database/Track.hpp | 2 +- .../database/include/services/database/TrackArtistLink.hpp | 3 +-- .../database/include/services/database/TrackBookmark.hpp | 2 +- .../database/include/services/database/TrackFeatures.hpp | 2 +- .../services/database/include/services/database/TrackList.hpp | 2 +- src/libs/services/database/include/services/database/User.hpp | 2 +- .../services/recommendation/IPlaylistGeneratorService.hpp | 2 ++ src/lms/ui/ModalManager.cpp | 2 +- src/lms/ui/admin/DatabaseSettingsView.cpp | 3 +-- src/lms/ui/explore/ArtistView.cpp | 2 +- 19 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/libs/services/database/include/services/database/Artist.hpp b/src/libs/services/database/include/services/database/Artist.hpp index 968a9dfc..c0c374b3 100644 --- a/src/libs/services/database/include/services/database/Artist.hpp +++ b/src/libs/services/database/include/services/database/Artist.hpp @@ -49,7 +49,7 @@ class Track; class TrackArtistLink; class User; -class Artist : public Object +class Artist final : public Object { public: struct FindParameters diff --git a/src/libs/services/database/include/services/database/AuthToken.hpp b/src/libs/services/database/include/services/database/AuthToken.hpp index 6d784ef2..a67a7ca3 100644 --- a/src/libs/services/database/include/services/database/AuthToken.hpp +++ b/src/libs/services/database/include/services/database/AuthToken.hpp @@ -32,7 +32,7 @@ namespace Database class Session; class User; - class AuthToken : public Object + class AuthToken final : public Object { public: AuthToken() = default; diff --git a/src/libs/services/database/include/services/database/Cluster.hpp b/src/libs/services/database/include/services/database/Cluster.hpp index 72c05883..a7113713 100644 --- a/src/libs/services/database/include/services/database/Cluster.hpp +++ b/src/libs/services/database/include/services/database/Cluster.hpp @@ -38,7 +38,7 @@ class ClusterType; class ScanSettings; class Session; -class Cluster : public Object +class Cluster final : public Object { public: Cluster() = default; @@ -81,7 +81,7 @@ class Cluster : public Object }; -class ClusterType : public Object +class ClusterType final : public Object { public: ClusterType() = default; diff --git a/src/libs/services/database/include/services/database/Listen.hpp b/src/libs/services/database/include/services/database/Listen.hpp index 1c981b65..5dcaf1fc 100644 --- a/src/libs/services/database/include/services/database/Listen.hpp +++ b/src/libs/services/database/include/services/database/Listen.hpp @@ -38,7 +38,7 @@ class Session; class Track; class User; -class Listen : public Object +class Listen final : public Object { public: Listen() = default; diff --git a/src/libs/services/database/include/services/database/Release.hpp b/src/libs/services/database/include/services/database/Release.hpp index 3f2957d4..ec1ca623 100644 --- a/src/libs/services/database/include/services/database/Release.hpp +++ b/src/libs/services/database/include/services/database/Release.hpp @@ -45,7 +45,7 @@ class Session; class Track; class User; -class Release : public Object +class Release final : public Object { public: struct FindParameters diff --git a/src/libs/services/database/include/services/database/ScanSettings.hpp b/src/libs/services/database/include/services/database/ScanSettings.hpp index e51a6cc0..bb9c924a 100644 --- a/src/libs/services/database/include/services/database/ScanSettings.hpp +++ b/src/libs/services/database/include/services/database/ScanSettings.hpp @@ -35,7 +35,7 @@ namespace Database { class ClusterType; class Session; -class ScanSettings : public Object +class ScanSettings final : public Object { public: // Do not modify values (just add) diff --git a/src/libs/services/database/include/services/database/StarredArtist.hpp b/src/libs/services/database/include/services/database/StarredArtist.hpp index 3d7a0d18..b4f48b6b 100644 --- a/src/libs/services/database/include/services/database/StarredArtist.hpp +++ b/src/libs/services/database/include/services/database/StarredArtist.hpp @@ -34,7 +34,7 @@ namespace Database class Session; class User; - class StarredArtist : public Object + class StarredArtist final : public Object { public: StarredArtist() = default; diff --git a/src/libs/services/database/include/services/database/StarredRelease.hpp b/src/libs/services/database/include/services/database/StarredRelease.hpp index b53c1850..f3b4280a 100644 --- a/src/libs/services/database/include/services/database/StarredRelease.hpp +++ b/src/libs/services/database/include/services/database/StarredRelease.hpp @@ -34,7 +34,7 @@ namespace Database class Session; class User; - class StarredRelease : public Object + class StarredRelease final : public Object { public: StarredRelease() = default; diff --git a/src/libs/services/database/include/services/database/StarredTrack.hpp b/src/libs/services/database/include/services/database/StarredTrack.hpp index 376fd00d..197c88c1 100644 --- a/src/libs/services/database/include/services/database/StarredTrack.hpp +++ b/src/libs/services/database/include/services/database/StarredTrack.hpp @@ -35,7 +35,7 @@ namespace Database class Session; class User; - class StarredTrack : public Object + class StarredTrack final : public Object { public: StarredTrack() = default; diff --git a/src/libs/services/database/include/services/database/Track.hpp b/src/libs/services/database/include/services/database/Track.hpp index a5495284..1f944f75 100644 --- a/src/libs/services/database/include/services/database/Track.hpp +++ b/src/libs/services/database/include/services/database/Track.hpp @@ -56,7 +56,7 @@ class TrackArtistLink; class TrackStats; class User; -class Track : public Object +class Track final : public Object { public: struct FindParameters diff --git a/src/libs/services/database/include/services/database/TrackArtistLink.hpp b/src/libs/services/database/include/services/database/TrackArtistLink.hpp index 4b14a6a3..c342d5b9 100644 --- a/src/libs/services/database/include/services/database/TrackArtistLink.hpp +++ b/src/libs/services/database/include/services/database/TrackArtistLink.hpp @@ -35,12 +35,11 @@ LMS_DECLARE_IDTYPE(TrackArtistLinkId) namespace Database { - class Artist; class Session; class Track; - class TrackArtistLink : public Object + class TrackArtistLink final : public Object { public: struct FindParameters diff --git a/src/libs/services/database/include/services/database/TrackBookmark.hpp b/src/libs/services/database/include/services/database/TrackBookmark.hpp index dee9b0fa..fd8ae8df 100644 --- a/src/libs/services/database/include/services/database/TrackBookmark.hpp +++ b/src/libs/services/database/include/services/database/TrackBookmark.hpp @@ -37,7 +37,7 @@ class Session; class Track; class User; -class TrackBookmark : public Object +class TrackBookmark final : public Object { public: TrackBookmark () = default; diff --git a/src/libs/services/database/include/services/database/TrackFeatures.hpp b/src/libs/services/database/include/services/database/TrackFeatures.hpp index b294fc72..93dcbcd6 100644 --- a/src/libs/services/database/include/services/database/TrackFeatures.hpp +++ b/src/libs/services/database/include/services/database/TrackFeatures.hpp @@ -42,7 +42,7 @@ using FeatureName = std::string; using FeatureValues = std::vector; using FeatureValuesMap = std::unordered_map; -class TrackFeatures : public Object +class TrackFeatures final : public Object { public: TrackFeatures() = default; diff --git a/src/libs/services/database/include/services/database/TrackList.hpp b/src/libs/services/database/include/services/database/TrackList.hpp index f6865bec..600d879a 100644 --- a/src/libs/services/database/include/services/database/TrackList.hpp +++ b/src/libs/services/database/include/services/database/TrackList.hpp @@ -45,7 +45,7 @@ class Track; class TrackListEntry; class User; -class TrackList : public Object +class TrackList final : public Object { public: TrackList() = default; diff --git a/src/libs/services/database/include/services/database/User.hpp b/src/libs/services/database/include/services/database/User.hpp index 300efc67..eb238af1 100644 --- a/src/libs/services/database/include/services/database/User.hpp +++ b/src/libs/services/database/include/services/database/User.hpp @@ -36,7 +36,7 @@ namespace Database { class AuthToken; class Session; -class User : public Object +class User final : public Object { public: struct PasswordHash diff --git a/src/libs/services/recommendation/include/services/recommendation/IPlaylistGeneratorService.hpp b/src/libs/services/recommendation/include/services/recommendation/IPlaylistGeneratorService.hpp index 4c87e2cb..cabefa50 100644 --- a/src/libs/services/recommendation/include/services/recommendation/IPlaylistGeneratorService.hpp +++ b/src/libs/services/recommendation/include/services/recommendation/IPlaylistGeneratorService.hpp @@ -35,6 +35,8 @@ namespace Recommendation class IPlaylistGeneratorService { public: + virtual ~IPlaylistGeneratorService() = default; + // extend an existing playlist with similar tracks (but use playlist contraints) virtual TrackContainer extendPlaylist(Database::TrackListId tracklistId, std::size_t maxCount) const = 0; }; diff --git a/src/lms/ui/ModalManager.cpp b/src/lms/ui/ModalManager.cpp index 368829f8..07cad70e 100644 --- a/src/lms/ui/ModalManager.cpp +++ b/src/lms/ui/ModalManager.cpp @@ -60,7 +60,7 @@ namespace UserInterface doJavaScript(oss.str()); - addWidget(move(modalWidget)); + addWidget(std::move(modalWidget)); } void diff --git a/src/lms/ui/admin/DatabaseSettingsView.cpp b/src/lms/ui/admin/DatabaseSettingsView.cpp index 97635cd4..108664da 100644 --- a/src/lms/ui/admin/DatabaseSettingsView.cpp +++ b/src/lms/ui/admin/DatabaseSettingsView.cpp @@ -44,7 +44,6 @@ namespace UserInterface { using namespace Database; - class DatabaseSettingsModel : public Wt::WFormModel { public: @@ -69,7 +68,7 @@ class DatabaseSettingsModel : public Wt::WFormModel auto dirValidator {createDirectoryValidator()}; dirValidator->setMandatory(true); - setValidator(MediaDirectoryField, move(dirValidator)); + setValidator(MediaDirectoryField, std::move(dirValidator)); setValidator(UpdatePeriodField, createMandatoryValidator()); setValidator(UpdateStartTimeField, createMandatoryValidator()); diff --git a/src/lms/ui/explore/ArtistView.cpp b/src/lms/ui/explore/ArtistView.cpp index 1d776ada..7e448601 100644 --- a/src/lms/ui/explore/ArtistView.cpp +++ b/src/lms/ui/explore/ArtistView.cpp @@ -272,7 +272,7 @@ Artist::refreshAppearsOnReleases() releaseContainer->bindString("release-type", Wt::WString::tr("Lms.Explore.Artist.appears-on")); _appearsOnReleaseContainer.releases = releases.results; _appearsOnReleaseContainer.container = releaseContainer->bindNew("releases", Wt::WString::tr("Lms.Explore.Releases.template.container")); - _appearsOnReleaseContainer.container->onRequestElements.connect(this, [this, &releases] + _appearsOnReleaseContainer.container->onRequestElements.connect(this, [this] { addSomeReleases(_appearsOnReleaseContainer); });