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

8
src/lyrics/auddlyricsprovider.h
View File

@@ -40,13 +40,13 @@ class AuddLyricsProvider : public JsonLyricsProvider {
public:
explicit AuddLyricsProvider(QObject *parent = nullptr);
~AuddLyricsProvider();
~AuddLyricsProvider() override;
bool StartSearch(const QString &artist, const QString &album, const QString &title, quint64 id);
void CancelSearch(const quint64 id);
bool StartSearch(const QString &artist, const QString &album, const QString &title, quint64 id) override;
void CancelSearch(const quint64 id) override;
private:
void Error(const QString &error, const QVariant &debug = QVariant());
void Error(const QString &error, const QVariant &debug = QVariant()) override;
QJsonArray ExtractResult(QNetworkReply *reply, const QString &artist, const QString &title);
private slots:

2
src/lyrics/chartlyricsprovider.cpp
View File

@@ -135,7 +135,7 @@ void ChartLyricsProvider::HandleSearchReply(QNetworkReply *reply, const quint64
}
void ChartLyricsProvider::Error(const QString &error, QVariant debug) {
void ChartLyricsProvider::Error(const QString &error, const QVariant &debug) {
qLog(Error) << "ChartLyrics:" << error;
if (debug.isValid()) qLog(Debug) << debug;

8
src/lyrics/chartlyricsprovider.h
View File

@@ -38,13 +38,13 @@ class ChartLyricsProvider : public LyricsProvider {
public:
explicit ChartLyricsProvider(QObject *parent = nullptr);
~ChartLyricsProvider();
~ChartLyricsProvider() override;
bool StartSearch(const QString &artist, const QString &album, const QString &title, const quint64 id);
void CancelSearch(quint64 id);
bool StartSearch(const QString &artist, const QString &album, const QString &title, const quint64 id) override;
void CancelSearch(quint64 id) override;
private:
void Error(const QString &error, QVariant debug = QVariant());
void Error(const QString &error, const QVariant &debug = QVariant()) override;
private slots:
void HandleSearchReply(QNetworkReply *reply, const quint64 id, const QString &artist, const QString &title);

14
src/lyrics/geniuslyricsprovider.h
View File

@@ -48,14 +48,14 @@ class GeniusLyricsProvider : public JsonLyricsProvider {
public:
explicit GeniusLyricsProvider(QObject *parent = nullptr);
~GeniusLyricsProvider();
~GeniusLyricsProvider() override;
bool IsAuthenticated() { return !access_token_.isEmpty(); }
void Authenticate();
void Deauthenticate() { access_token_.clear(); }
bool IsAuthenticated() const override { return !access_token_.isEmpty(); }
void Authenticate() override;
void Deauthenticate() override { access_token_.clear(); }
bool StartSearch(const QString &artist, const QString &album, const QString &title, quint64 id);
void CancelSearch(const quint64 id);
bool StartSearch(const QString &artist, const QString &album, const QString &title, quint64 id) override;
void CancelSearch(const quint64 id) override;
public:
struct GeniusLyricsLyricContext {
@@ -76,7 +76,7 @@ class GeniusLyricsProvider : public JsonLyricsProvider {
private:
void RequestAccessToken(const QUrl &url, const QUrl &redirect_url);
void AuthError(const QString &error = QString(), const QVariant &debug = QVariant());
void Error(const QString &error, const QVariant &debug = QVariant());
void Error(const QString &error, const QVariant &debug = QVariant()) override;
void EndSearch(std::shared_ptr<GeniusLyricsSearchContext> search, const GeniusLyricsLyricContext lyric = GeniusLyricsLyricContext());
private slots:

4
src/lyrics/jsonlyricsprovider.h
View File

@@ -42,10 +42,6 @@ class JsonLyricsProvider : public LyricsProvider {
QByteArray ExtractData(QNetworkReply *reply);
QJsonObject ExtractJsonObj(const QByteArray &data);
QJsonObject ExtractJsonObj(QNetworkReply *reply);
private:
virtual void Error(const QString &error, const QVariant &debug = QVariant()) = 0;
};
#endif // JSONLYRICSPROVIDER_H

8
src/lyrics/lololyricsprovider.h
View File

@@ -38,13 +38,13 @@ class LoloLyricsProvider : public LyricsProvider {
public:
explicit LoloLyricsProvider(QObject *parent = nullptr);
~LoloLyricsProvider();
~LoloLyricsProvider() override;
bool StartSearch(const QString &artist, const QString &album, const QString &title, const quint64 id);
void CancelSearch(const quint64 id);
bool StartSearch(const QString &artist, const QString &album, const QString &title, const quint64 id) override;
void CancelSearch(const quint64 id) override;
private:
void Error(const QString &error, const QVariant &debug = QVariant());
void Error(const QString &error, const QVariant &debug = QVariant()) override;
private slots:
void HandleSearchReply(QNetworkReply *reply, const quint64 id, const QString &artist, const QString &title);

2
src/lyrics/lyricsfetcher.h
View File

@@ -63,7 +63,7 @@ class LyricsFetcher : public QObject {
public:
explicit LyricsFetcher(LyricsProviders *lyrics_providers, QObject *parent = nullptr);
virtual ~LyricsFetcher() {}
~LyricsFetcher() override {}
quint64 Search(const QString &artist, const QString &album, const QString &title);
void Clear();

7
src/lyrics/lyricsprovider.h
View File

@@ -26,6 +26,7 @@
#include <QObject>
#include <QPair>
#include <QList>
#include <QVariant>
#include <QString>
#include "lyricsfetcher.h"
@@ -48,11 +49,13 @@ class LyricsProvider : public QObject {
virtual bool StartSearch(const QString &artist, const QString &album, const QString &title, const quint64 id) = 0;
virtual void CancelSearch(const quint64 id) { Q_UNUSED(id); }
virtual bool AuthenticationRequired() { return authentication_required_; }
virtual bool AuthenticationRequired() const { return authentication_required_; }
virtual void Authenticate() {}
virtual bool IsAuthenticated() { return !authentication_required_; }
virtual bool IsAuthenticated() const { return !authentication_required_; }
virtual void Deauthenticate() {}
virtual void Error(const QString &error, const QVariant &debug = QVariant()) = 0;
signals:
void AuthenticationComplete(bool, QStringList = QStringList());
void AuthenticationSuccess();

2
src/lyrics/lyricsproviders.h
View File

@@ -37,7 +37,7 @@ class LyricsProviders : public QObject {
public:
explicit LyricsProviders(QObject *parent = nullptr);
~LyricsProviders();
~LyricsProviders() override;
void ReloadSettings();
LyricsProvider *ProviderByName(const QString &name) const;

8
src/lyrics/musixmatchlyricsprovider.h
View File

@@ -39,13 +39,13 @@ class MusixmatchLyricsProvider : public JsonLyricsProvider {
public:
explicit MusixmatchLyricsProvider(QObject *parent = nullptr);
~MusixmatchLyricsProvider();
~MusixmatchLyricsProvider() override;
bool StartSearch(const QString &artist, const QString &album, const QString &title, const quint64 id);
void CancelSearch(const quint64 id);
bool StartSearch(const QString &artist, const QString &album, const QString &title, const quint64 id) override;
void CancelSearch(const quint64 id) override;
private:
void Error(const QString &error, const QVariant &debug = QVariant());
void Error(const QString &error, const QVariant &debug = QVariant()) override;
private slots:
void HandleSearchReply(QNetworkReply *reply, const quint64 id, const QString &artist, const QString &album, const QString &title);

8
src/lyrics/ovhlyricsprovider.h
View File

@@ -38,13 +38,13 @@ class OVHLyricsProvider : public JsonLyricsProvider {
public:
explicit OVHLyricsProvider(QObject *parent = nullptr);
~OVHLyricsProvider();
~OVHLyricsProvider() override;
bool StartSearch(const QString &artist, const QString &album, const QString &title, const quint64 id);
void CancelSearch(const quint64 id);
bool StartSearch(const QString &artist, const QString &album, const QString &title, const quint64 id) override;
void CancelSearch(const quint64 id) override;
private:
void Error(const QString &error, const QVariant &debug = QVariant());
void Error(const QString &error, const QVariant &debug = QVariant()) override;
private slots:
void HandleSearchReply(QNetworkReply *reply, const quint64 id, const QString &artist, const QString &title);