From 8e47ab59e546d074540f3762e32130f0c64690dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcus=20M=C3=BCller?= Date: Sun, 17 Sep 2023 09:24:22 +0200 Subject: [PATCH] internet services: consistently use 'override' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marcus Müller --- .../digitally/digitallyimportedservicebase.h | 10 +++++----- src/internet/icecast/icecastservice.h | 10 +++++----- .../intergalacticfm/intergalacticfmservice.h | 12 ++++++------ src/internet/internetradio/savedradio.h | 8 ++++---- src/internet/jamendo/jamendoservice.h | 10 +++++----- src/internet/magnatune/magnatuneservice.h | 14 +++++++------- src/internet/podcasts/podcastservice.h | 16 ++++++++-------- src/internet/radiobrowser/radiobrowserservice.h | 2 +- src/internet/somafm/somafmservice.h | 12 ++++++------ src/internet/subsonic/subsonicservice.h | 16 ++++++++-------- 10 files changed, 55 insertions(+), 55 deletions(-) diff --git a/src/internet/digitally/digitallyimportedservicebase.h b/src/internet/digitally/digitallyimportedservicebase.h index 97c19ccd5..1bcdaded0 100644 --- a/src/internet/digitally/digitallyimportedservicebase.h +++ b/src/internet/digitally/digitallyimportedservicebase.h @@ -41,16 +41,16 @@ class DigitallyImportedServiceBase : public InternetService { const QString& api_service_name, Application* app, InternetModel* model, bool has_premium, QObject* parent = nullptr); - ~DigitallyImportedServiceBase(); + ~DigitallyImportedServiceBase() override; static const char* kSettingsGroup; static const int kStreamsCacheDurationSecs; - QStandardItem* CreateRootItem(); - void LazyPopulate(QStandardItem* parent); - void ShowContextMenu(const QPoint& global_pos); + QStandardItem* CreateRootItem() override; + void LazyPopulate(QStandardItem* parent) override; + void ShowContextMenu(const QPoint& global_pos) override; - void ReloadSettings(); + void ReloadSettings() override; bool is_premium_account() const; diff --git a/src/internet/icecast/icecastservice.h b/src/internet/icecast/icecastservice.h index d5032399b..56f855651 100644 --- a/src/internet/icecast/icecastservice.h +++ b/src/internet/icecast/icecastservice.h @@ -40,7 +40,7 @@ class IcecastService : public InternetService { public: IcecastService(Application* app, InternetModel* parent); - ~IcecastService(); + ~IcecastService() override; static const char* kServiceName; static const char* kDirectoryUrl; @@ -51,12 +51,12 @@ class IcecastService : public InternetService { Type_Genre, }; - QStandardItem* CreateRootItem(); - void LazyPopulate(QStandardItem* item); + QStandardItem* CreateRootItem() override; + void LazyPopulate(QStandardItem* item) override; - void ShowContextMenu(const QPoint& global_pos); + void ShowContextMenu(const QPoint& global_pos) override; - QWidget* HeaderWidget() const; + QWidget* HeaderWidget() const override; private slots: void LoadDirectory(); diff --git a/src/internet/intergalacticfm/intergalacticfmservice.h b/src/internet/intergalacticfm/intergalacticfmservice.h index 10aff13a6..d8a71788e 100644 --- a/src/internet/intergalacticfm/intergalacticfmservice.h +++ b/src/internet/intergalacticfm/intergalacticfmservice.h @@ -39,7 +39,7 @@ class IntergalacticFMServiceBase : public InternetService { const QString& name, const QUrl& channel_list_url, const QUrl& homepage_url, const QUrl& donate_page_url, const QIcon& icon); - ~IntergalacticFMServiceBase(); + ~IntergalacticFMServiceBase() override; enum ItemType { Type_Stream = 2000, @@ -59,14 +59,14 @@ class IntergalacticFMServiceBase : public InternetService { const QString& url_scheme() const { return url_scheme_; } const QIcon& icon() const { return icon_; } - QStandardItem* CreateRootItem(); - void LazyPopulate(QStandardItem* item); - void ShowContextMenu(const QPoint& global_pos); + QStandardItem* CreateRootItem() override; + void LazyPopulate(QStandardItem* item) override; + void ShowContextMenu(const QPoint& global_pos) override; - PlaylistItem::Options playlistitem_options() const; + PlaylistItem::Options playlistitem_options() const override; QNetworkAccessManager* network() const { return network_; } - void ReloadSettings(); + void ReloadSettings() override; bool IsStreamListStale() const { return streams_.IsStale(); } StreamList Streams(); diff --git a/src/internet/internetradio/savedradio.h b/src/internet/internetradio/savedradio.h index 95876b9fe..22302605b 100644 --- a/src/internet/internetradio/savedradio.h +++ b/src/internet/internetradio/savedradio.h @@ -34,7 +34,7 @@ class SavedRadio : public InternetService { public: SavedRadio(Application* app, InternetModel* parent); - ~SavedRadio(); + ~SavedRadio() override; enum ItemType { Type_Stream = 2000, @@ -57,10 +57,10 @@ class SavedRadio : public InternetService { static const char* kServiceName; static const char* kSettingsGroup; - QStandardItem* CreateRootItem(); - void LazyPopulate(QStandardItem* item); + QStandardItem* CreateRootItem() override; + void LazyPopulate(QStandardItem* item) override; - void ShowContextMenu(const QPoint& global_pos); + void ShowContextMenu(const QPoint& global_pos) override; void Add(const QUrl& url, const QString& name = QString(), const QUrl& url_logo = QUrl()); diff --git a/src/internet/jamendo/jamendoservice.h b/src/internet/jamendo/jamendoservice.h index 4e59a9718..6cd13fc78 100644 --- a/src/internet/jamendo/jamendoservice.h +++ b/src/internet/jamendo/jamendoservice.h @@ -43,14 +43,14 @@ class JamendoService : public InternetService { public: JamendoService(Application* app, InternetModel* parent); - ~JamendoService(); + ~JamendoService() override; - QStandardItem* CreateRootItem(); - void LazyPopulate(QStandardItem* item); + QStandardItem* CreateRootItem() override; + void LazyPopulate(QStandardItem* item) override; - void ShowContextMenu(const QPoint& global_pos); + void ShowContextMenu(const QPoint& global_pos) override; - QWidget* HeaderWidget() const; + QWidget* HeaderWidget() const override; LibraryBackend* library_backend() const { return library_backend_.get(); } diff --git a/src/internet/magnatune/magnatuneservice.h b/src/internet/magnatune/magnatuneservice.h index 34dff9070..8ffdb7430 100644 --- a/src/internet/magnatune/magnatuneservice.h +++ b/src/internet/magnatune/magnatuneservice.h @@ -38,7 +38,7 @@ class MagnatuneService : public InternetService { public: MagnatuneService(Application* app, InternetModel* parent); - ~MagnatuneService(); + ~MagnatuneService() override; // Values are saved in QSettings and are indices into the combo box in // MagnatuneConfig @@ -71,14 +71,14 @@ class MagnatuneService : public InternetService { static QString ReadElementText(QXmlStreamReader& reader); - QStandardItem* CreateRootItem(); - void LazyPopulate(QStandardItem* item); + QStandardItem* CreateRootItem() override; + void LazyPopulate(QStandardItem* item) override; - void ShowContextMenu(const QPoint& global_pos); + void ShowContextMenu(const QPoint& global_pos) override; - QWidget* HeaderWidget() const; + QWidget* HeaderWidget() const override; - void ReloadSettings(); + void ReloadSettings() override; // Magnatune specific stuff MembershipType membership_type() const { return membership_; } @@ -99,7 +99,7 @@ class MagnatuneService : public InternetService { void Download(); void Homepage(); - void ShowConfig(); + void ShowConfig() override; private: void EnsureMenuCreated(); diff --git a/src/internet/podcasts/podcastservice.h b/src/internet/podcasts/podcastservice.h index 579f3ea2d..0e5e830dc 100644 --- a/src/internet/podcasts/podcastservice.h +++ b/src/internet/podcasts/podcastservice.h @@ -44,7 +44,7 @@ class PodcastService : public InternetService { public: PodcastService(Application* app, InternetModel* parent); - ~PodcastService(); + ~PodcastService() override; static const char* kServiceName; static const char* kSettingsGroup; @@ -57,12 +57,12 @@ class PodcastService : public InternetService { enum Role { Role_Podcast = InternetModel::RoleCount, Role_Episode }; - QStandardItem* CreateRootItem(); - void LazyPopulate(QStandardItem* parent); - bool has_initial_load_settings() const { return true; } - void ShowContextMenu(const QPoint& global_pos); - void ReloadSettings(); - void InitialLoadSettings(); + QStandardItem* CreateRootItem() override; + void LazyPopulate(QStandardItem* parent) override; + bool has_initial_load_settings() const override { return true; } + void ShowContextMenu(const QPoint& global_pos) override; + void ReloadSettings() override; + void InitialLoadSettings() override; // Called by SongLoader when the user adds a Podcast URL directly. Adds a // subscription to the podcast and displays it in the UI. If the QVariant // contains an OPML file then this displays it in the Add Podcast dialog. @@ -81,7 +81,7 @@ class PodcastService : public InternetService { void DeleteDownloadedData(); void SetNew(); void SetListened(); - void ShowConfig(); + void ShowConfig() override; void SubscriptionAdded(const Podcast& podcast); void SubscriptionRemoved(const Podcast& podcast); diff --git a/src/internet/radiobrowser/radiobrowserservice.h b/src/internet/radiobrowser/radiobrowserservice.h index bd97d509b..78e7ea0c7 100644 --- a/src/internet/radiobrowser/radiobrowserservice.h +++ b/src/internet/radiobrowser/radiobrowserservice.h @@ -35,7 +35,7 @@ class RadioBrowserService : public InternetService { public: RadioBrowserService(Application* app, InternetModel* parent); - ~RadioBrowserService(){}; + ~RadioBrowserService() override{}; enum ItemType { Type_Stream = 2000, diff --git a/src/internet/somafm/somafmservice.h b/src/internet/somafm/somafmservice.h index 6cdcdf5b6..54ef034bc 100644 --- a/src/internet/somafm/somafmservice.h +++ b/src/internet/somafm/somafmservice.h @@ -39,7 +39,7 @@ class SomaFMServiceBase : public InternetService { const QString& name, const QUrl& channel_list_url, const QUrl& homepage_url, const QUrl& donate_page_url, const QIcon& icon); - ~SomaFMServiceBase(); + ~SomaFMServiceBase() override; enum ItemType { Type_Stream = 2000, @@ -59,14 +59,14 @@ class SomaFMServiceBase : public InternetService { const QString& url_scheme() const { return url_scheme_; } const QIcon& icon() const { return icon_; } - QStandardItem* CreateRootItem(); - void LazyPopulate(QStandardItem* item); - void ShowContextMenu(const QPoint& global_pos); + QStandardItem* CreateRootItem() override; + void LazyPopulate(QStandardItem* item) override; + void ShowContextMenu(const QPoint& global_pos) override; - PlaylistItem::Options playlistitem_options() const; + PlaylistItem::Options playlistitem_options() const override; QNetworkAccessManager* network() const { return network_; } - void ReloadSettings(); + void ReloadSettings() override; bool IsStreamListStale() const { return streams_.IsStale(); } StreamList Streams(); diff --git a/src/internet/subsonic/subsonicservice.h b/src/internet/subsonic/subsonicservice.h index dbc694764..9b5c1ac1b 100644 --- a/src/internet/subsonic/subsonicservice.h +++ b/src/internet/subsonic/subsonicservice.h @@ -42,7 +42,7 @@ class SubsonicService : public InternetService { public: SubsonicService(Application* app, InternetModel* parent); - ~SubsonicService(); + ~SubsonicService() override; enum LoginState { LoginState_Loggedin, @@ -90,11 +90,11 @@ class SubsonicService : public InternetService { bool IsConfigured() const; bool IsAmpache() const; - QStandardItem* CreateRootItem(); - void LazyPopulate(QStandardItem* item); - void ShowContextMenu(const QPoint& global_pos); - QWidget* HeaderWidget() const; - void ReloadSettings(); + QStandardItem* CreateRootItem() override; + void LazyPopulate(QStandardItem* item) override; + void ShowContextMenu(const QPoint& global_pos) override; + QWidget* HeaderWidget() const override; + void ReloadSettings() override; void Login(); void Login(const QString& server, const QString& username, @@ -175,7 +175,7 @@ class SubsonicService : public InternetService { void OnLoginStateChanged(SubsonicService::LoginState newstate); void OnPingFinished(QNetworkReply* reply); - void ShowConfig(); + void ShowConfig() override; }; class SubsonicLibraryScanner : public QObject { @@ -184,7 +184,7 @@ class SubsonicLibraryScanner : public QObject { public: explicit SubsonicLibraryScanner(SubsonicService* service, QObject* parent = nullptr); - ~SubsonicLibraryScanner(); + ~SubsonicLibraryScanner() override; void Scan(); const SongList& GetSongs() const { return songs_; }