dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use override

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
src/scrobbler/audioscrobbler.cpp
View File

@@ -63,8 +63,6 @@ AudioScrobbler::AudioScrobbler(Application *app, QObject *parent) :
}
AudioScrobbler::~AudioScrobbler() {}
void AudioScrobbler::ReloadSettings() {
QSettings s;

1
src/scrobbler/audioscrobbler.h
View File

@@ -36,7 +36,6 @@ class AudioScrobbler : public QObject {
public:
explicit AudioScrobbler(Application *app, QObject *parent = nullptr);
~AudioScrobbler();
void ReloadSettings();

6
src/scrobbler/lastfmscrobbler.h
View File

@@ -38,13 +38,13 @@ class LastFMScrobbler : public ScrobblingAPI20 {
public:
explicit LastFMScrobbler(Application *app, QObject *parent = nullptr);
~LastFMScrobbler();
~LastFMScrobbler() override;
static const char *kName;
static const char *kSettingsGroup;
NetworkAccessManager *network() { return network_; }
ScrobblerCache *cache() { return cache_; }
NetworkAccessManager *network() const override { return network_; }
ScrobblerCache *cache() const override { return cache_; }
private:
static const char *kAuthUrl;

6
src/scrobbler/librefmscrobbler.h
View File

@@ -38,13 +38,13 @@ class LibreFMScrobbler : public ScrobblingAPI20 {
public:
explicit LibreFMScrobbler(Application *app, QObject *parent = nullptr);
~LibreFMScrobbler();
~LibreFMScrobbler() override;
static const char *kName;
static const char *kSettingsGroup;
NetworkAccessManager *network() { return network_; }
ScrobblerCache *cache() { return cache_; }
NetworkAccessManager *network() const override { return network_; }
ScrobblerCache *cache() const override { return cache_; }
private:
static const char *kAuthUrl;

26
src/scrobbler/listenbrainzscrobbler.h
View File

@@ -47,33 +47,33 @@ class ListenBrainzScrobbler : public ScrobblerService {
public:
explicit ListenBrainzScrobbler(Application *app, QObject *parent = nullptr);
~ListenBrainzScrobbler();
~ListenBrainzScrobbler() override;
static const char *kName;
static const char *kSettingsGroup;
void ReloadSettings();
void ReloadSettings() override;
void LoadSession();
bool IsEnabled() const { return enabled_; }
bool IsAuthenticated() const { return !access_token_.isEmpty() && !user_token_.isEmpty(); }
bool IsSubmitted() const { return submitted_; }
void Submitted() { submitted_ = true; }
bool IsEnabled() const override { return enabled_; }
bool IsAuthenticated() const override { return !access_token_.isEmpty() && !user_token_.isEmpty(); }
bool IsSubmitted() const override { return submitted_; }
void Submitted() override { submitted_ = true; }
QString user_token() const { return user_token_; }
void Authenticate(const bool https = false);
void Logout();
void ShowConfig();
void Submit();
void UpdateNowPlaying(const Song &song);
void ClearPlaying();
void Scrobble(const Song &song);
void Submit() override;
void UpdateNowPlaying(const Song &song) override;
void ClearPlaying() override;
void Scrobble(const Song &song) override;
signals:
void AuthenticationComplete(bool success, QString error = QString());
public slots:
void WriteCache() { cache_->WriteCache(); }
void WriteCache() override { cache_->WriteCache(); }
private slots:
void RedirectArrived();
@@ -87,8 +87,8 @@ class ListenBrainzScrobbler : public ScrobblerService {
QByteArray GetReplyData(QNetworkReply *reply);
void AuthError(const QString &error);
void Error(const QString &error, const QVariant &debug = QVariant());
void DoSubmit();
void Error(const QString &error, const QVariant &debug = QVariant()) override;
void DoSubmit() override;
void CheckScrobblePrevSong();
static const char *kOAuthAuthorizeUrl;

2
src/scrobbler/scrobblercache.h
View File

@@ -39,7 +39,7 @@ class ScrobblerCache : public QObject {
public:
explicit ScrobblerCache(const QString &filename, QObject *parent);
~ScrobblerCache();
~ScrobblerCache() override;
void ReadCache();

2
src/scrobbler/scrobblerservices.h
View File

@@ -37,7 +37,7 @@ class ScrobblerServices : public QObject {
public:
explicit ScrobblerServices(QObject *parent = nullptr);
~ScrobblerServices();
~ScrobblerServices() override;
void AddService(ScrobblerService *service);
void RemoveService(ScrobblerService *service);

32
src/scrobbler/scrobblingapi20.h
View File

@@ -45,37 +45,37 @@ class ScrobblingAPI20 : public ScrobblerService {
public:
explicit ScrobblingAPI20(const QString &name, const QString &settings_group, const QString &auth_url, const QString &api_url, const bool batch, Application *app, QObject *parent = nullptr);
~ScrobblingAPI20();
~ScrobblingAPI20() override;
static const char *kRedirectUrl;
void ReloadSettings();
void ReloadSettings() override;
void LoadSession();
virtual NetworkAccessManager *network() = 0;
virtual ScrobblerCache *cache() = 0;
virtual NetworkAccessManager *network() const = 0;
virtual ScrobblerCache *cache() const = 0;
bool IsEnabled() const { return enabled_; }
bool IsEnabled() const override { return enabled_; }
bool IsUseHTTPS() const { return https_; }
bool IsAuthenticated() const { return !username_.isEmpty() && !session_key_.isEmpty(); }
bool IsAuthenticated() const override { return !username_.isEmpty() && !session_key_.isEmpty(); }
bool IsSubscriber() const { return subscriber_; }
bool IsSubmitted() const { return submitted_; }
void Submitted() { submitted_ = true; }
bool IsSubmitted() const override { return submitted_; }
void Submitted() override { submitted_ = true; }
QString username() const { return username_; }
void Authenticate(const bool https = false);
void Logout();
void UpdateNowPlaying(const Song &song);
void ClearPlaying();
void Scrobble(const Song &song);
void Submit();
void Love();
void UpdateNowPlaying(const Song &song) override;
void ClearPlaying() override;
void Scrobble(const Song &song) override;
void Submit() override;
void Love() override;
signals:
void AuthenticationComplete(bool success, QString error = QString());
public slots:
void WriteCache() { cache()->WriteCache(); }
void WriteCache() override { cache()->WriteCache(); }
private slots:
void RedirectArrived();
@@ -130,9 +130,9 @@ class ScrobblingAPI20 : public ScrobblerService {
void RequestSession(const QString &token);
void AuthError(const QString &error);
void SendSingleScrobble(ScrobblerCacheItemPtr item);
void Error(const QString &error, const QVariant &debug = QVariant());
void Error(const QString &error, const QVariant &debug = QVariant()) override;
QString ErrorString(const ScrobbleErrorCode error) const;
void DoSubmit();
void DoSubmit() override;
void CheckScrobblePrevSong();
QString name_;