Use override

This commit is contained in:
Jonas Kvinge
2020-06-15 21:55:05 +02:00
parent 72ede666d4
commit 651020388d
271 changed files with 1199 additions and 1231 deletions

View File

@@ -53,8 +53,6 @@ SubsonicBaseRequest::SubsonicBaseRequest(SubsonicService *service, QObject *pare
}
SubsonicBaseRequest::~SubsonicBaseRequest() {}
QUrl SubsonicBaseRequest::CreateUrl(const QString &ressource_name, const QList<Param> &params_provided) {
ParamList params = ParamList() << params_provided

View File

@@ -45,9 +45,7 @@ class SubsonicBaseRequest : public QObject {
Q_OBJECT
public:
explicit SubsonicBaseRequest(SubsonicService *service, QObject *parent);
~SubsonicBaseRequest();
typedef QPair<QString, QString> Param;
typedef QList<Param> ParamList;

View File

@@ -53,7 +53,7 @@ class SubsonicRequest : public SubsonicBaseRequest {
public:
explicit SubsonicRequest(SubsonicService *service, SubsonicUrlHandler *url_handler, Application *app, QObject *parent);
~SubsonicRequest();
~SubsonicRequest() override;
void ReloadSettings();
@@ -109,7 +109,7 @@ class SubsonicRequest : public SubsonicBaseRequest {
void FinishCheck();
void Warn(const QString &error, const QVariant &debug = QVariant());
void Error(const QString &error, const QVariant &debug = QVariant());
void Error(const QString &error, const QVariant &debug = QVariant()) override;
static const int kMaxConcurrentAlbumsRequests;
static const int kMaxConcurrentArtistAlbumsRequests;

View File

@@ -33,13 +33,13 @@
#include <QString>
#include <QStringList>
#include <QUrl>
#include <QNetworkAccessManager>
#include <QSslError>
#include "core/song.h"
#include "internet/internetservice.h"
class QSortFilterProxyModel;
class QNetworkAccessManager;
class QNetworkReply;
class Application;
@@ -53,12 +53,12 @@ class SubsonicService : public InternetService {
public:
explicit SubsonicService(Application *app, QObject *parent);
~SubsonicService();
~SubsonicService() override;
static const Song::Source kSource;
void ReloadSettings();
void Exit();
void ReloadSettings() override;
void Exit() override;
Application *app() { return app_; }
@@ -74,18 +74,18 @@ class SubsonicService : public InternetService {
CollectionModel *collection_model() { return collection_model_; }
QSortFilterProxyModel *collection_sort_model() { return collection_sort_model_; }
CollectionBackend *songs_collection_backend() { return collection_backend_; }
CollectionModel *songs_collection_model() { return collection_model_; }
QSortFilterProxyModel *songs_collection_sort_model() { return collection_sort_model_; }
CollectionBackend *songs_collection_backend() override { return collection_backend_; }
CollectionModel *songs_collection_model() override { return collection_model_; }
QSortFilterProxyModel *songs_collection_sort_model() override { return collection_sort_model_; }
void CheckConfiguration();
public slots:
void ShowConfig();
void ShowConfig() override;
void SendPing();
void SendPing(QUrl url, const QString &username, const QString &password, const bool redirect = false);
void GetSongs();
void ResetSongsRequest();
void GetSongs() override;
void ResetSongsRequest() override;
private slots:
void HandlePingSSLErrors(QList<QSslError> ssl_errors);

View File

@@ -41,12 +41,12 @@ class SubsonicUrlHandler : public UrlHandler {
public:
explicit SubsonicUrlHandler(Application *app, SubsonicService *service);
QString scheme() const { return service_->url_scheme(); }
QString scheme() const override { return service_->url_scheme(); }
QUrl server_url() const { return service_->server_url(); }
QString username() const { return service_->username(); }
QString password() const { return service_->password(); }
LoadResult StartLoading(const QUrl &url);
LoadResult StartLoading(const QUrl &url) override;
private:
typedef QPair<QString, QString> Param;