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

Fix minor code issues

Browse Source
This commit is contained in:
Jonas Kvinge
2019-09-15 20:27:32 +02:00
parent 83e10aac27
commit 2d67279180
147 changed files with 644 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/lyrics/auddlyricsprovider.cpp
View File

@@ -48,6 +48,8 @@ AuddLyricsProvider::AuddLyricsProvider(QObject *parent) : JsonLyricsProvider("Au
bool AuddLyricsProvider::StartSearch(const QString &artist, const QString &album, const QString &title, const quint64 id) {
Q_UNUSED(album);
const ParamList params = ParamList() << Param("api_token", QByteArray::fromBase64(kAPITokenB64))
<< Param("q", QString(artist + " " + title));
@@ -71,7 +73,7 @@ bool AuddLyricsProvider::StartSearch(const QString &artist, const QString &album
}
void AuddLyricsProvider::CancelSearch(quint64 id) {}
void AuddLyricsProvider::CancelSearch(const quint64 id) { Q_UNUSED(id); }
void AuddLyricsProvider::HandleSearchReply(QNetworkReply *reply, const quint64 id, const QString &artist, const QString &title) {
@@ -164,7 +166,7 @@ QJsonArray AuddLyricsProvider::ExtractResult(QNetworkReply *reply, const quint64
}
void AuddLyricsProvider::Error(const quint64 id, const QString &error, QVariant debug) {
void AuddLyricsProvider::Error(const quint64 id, const QString &error, const QVariant &debug) {
qLog(Error) << "AudDLyrics:" << error;
if (debug.isValid()) qLog(Debug) << debug;
emit SearchFinished(id, LyricsSearchResults());

4
src/lyrics/auddlyricsprovider.h
View File

@@ -40,7 +40,7 @@ class AuddLyricsProvider : public JsonLyricsProvider {
explicit AuddLyricsProvider(QObject *parent = nullptr);
bool StartSearch(const QString &artist, const QString &album, const QString &title, quint64 id);
void CancelSearch(quint64 id);
void CancelSearch(const quint64 id);
private slots:
void HandleSearchReply(QNetworkReply *reply, const quint64 id, const QString &artist, const QString &title);
@@ -50,7 +50,7 @@ class AuddLyricsProvider : public JsonLyricsProvider {
static const char *kAPITokenB64;
static const int kMaxLength;
QNetworkAccessManager *network_;
void Error(const quint64 id, const QString &error, QVariant debug = QVariant());
void Error(const quint64 id, const QString &error, const QVariant &debug = QVariant());
QJsonArray ExtractResult(QNetworkReply *reply, const quint64 id, const QString &artist, const QString &title);

2
src/lyrics/jsonlyricsprovider.h
View File

@@ -38,7 +38,7 @@ class JsonLyricsProvider : public LyricsProvider {
QJsonObject ExtractJsonObj(QNetworkReply *reply, const quint64 id);
private:
virtual void Error(const quint64 id, const QString &error, QVariant debug = QVariant()) = 0;
virtual void Error(const quint64 id, const QString &error, const QVariant &debug = QVariant()) = 0;
};

6
src/lyrics/lololyricsprovider.cpp
View File

@@ -43,6 +43,8 @@ LoloLyricsProvider::LoloLyricsProvider(QObject *parent) : LyricsProvider("LoloLy
bool LoloLyricsProvider::StartSearch(const QString &artist, const QString &album, const QString &title, const quint64 id) {
Q_UNUSED(album);
const ParamList params = ParamList() << Param("artist", artist)
<< Param("track", title);
@@ -66,7 +68,7 @@ bool LoloLyricsProvider::StartSearch(const QString &artist, const QString &album
}
void LoloLyricsProvider::CancelSearch(const quint64 id) {}
void LoloLyricsProvider::CancelSearch(const quint64 id) { Q_UNUSED(id); }
void LoloLyricsProvider::HandleSearchReply(QNetworkReply *reply, const quint64 id, const QString &artist, const QString &title) {
@@ -132,7 +134,7 @@ void LoloLyricsProvider::HandleSearchReply(QNetworkReply *reply, const quint64 i
}
void LoloLyricsProvider::Error(const quint64 id, const QString &error, QVariant debug) {
void LoloLyricsProvider::Error(const quint64 id, const QString &error, const QVariant &debug) {
qLog(Error) << "LoloLyrics:" << error;
if (debug.isValid()) qLog(Debug) << debug;

4
src/lyrics/lololyricsprovider.h
View File

@@ -41,7 +41,7 @@ class LoloLyricsProvider : public LyricsProvider {
explicit LoloLyricsProvider(QObject *parent = nullptr);
bool StartSearch(const QString &artist, const QString &album, const QString &title, const quint64 id);
void CancelSearch(quint64 id);
void CancelSearch(const quint64 id);
private slots:
void HandleSearchReply(QNetworkReply *reply, const quint64 id, const QString &artist, const QString &title);
@@ -49,7 +49,7 @@ class LoloLyricsProvider : public LyricsProvider {
private:
static const char *kUrlSearch;
QNetworkAccessManager *network_;
void Error(const quint64 id, const QString &error, QVariant debug = QVariant());
void Error(const quint64 id, const QString &error, const QVariant &debug = QVariant());
};

4
src/lyrics/lyricsfetcher.h
View File

@@ -53,10 +53,10 @@ struct LyricsSearchResult {
QString lyrics;
float score;
};
Q_DECLARE_METATYPE(LyricsSearchResult);
Q_DECLARE_METATYPE(LyricsSearchResult)
typedef QList<LyricsSearchResult> LyricsSearchResults;
Q_DECLARE_METATYPE(QList<LyricsSearchResult>);
Q_DECLARE_METATYPE(QList<LyricsSearchResult>)
class LyricsFetcher : public QObject {
Q_OBJECT

2
src/lyrics/lyricsprovider.h
View File

@@ -42,7 +42,7 @@ class LyricsProvider : public QObject {
QString name() const { return name_; }
virtual bool StartSearch(const QString &artist, const QString &album, const QString &title, const quint64 id) = 0;
virtual void CancelSearch(const quint64 id) {}
virtual void CancelSearch(const quint64 id) { Q_UNUSED(id); }
signals:
void SearchFinished(const quint64 id, const LyricsSearchResults &results);

2
src/lyrics/lyricsproviders.h
View File

@@ -51,7 +51,7 @@ class LyricsProviders : public QObject {
void ProviderDestroyed();
private:
Q_DISABLE_COPY(LyricsProviders);
Q_DISABLE_COPY(LyricsProviders)
QMap<LyricsProvider *, QString> lyrics_providers_;
QMutex mutex_;

6
src/lyrics/ovhlyricsprovider.cpp
View File

@@ -45,6 +45,8 @@ OVHLyricsProvider::OVHLyricsProvider(QObject *parent) : JsonLyricsProvider("Lyri
bool OVHLyricsProvider::StartSearch(const QString &artist, const QString &album, const QString &title, const quint64 id) {
Q_UNUSED(album);
QUrl url(kUrlSearch + QString(QUrl::toPercentEncoding(artist)) + "/" + QString(QUrl::toPercentEncoding(title)));
QNetworkRequest req(url);
#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
@@ -59,7 +61,7 @@ bool OVHLyricsProvider::StartSearch(const QString &artist, const QString &album,
}
void OVHLyricsProvider::CancelSearch(quint64 id) {}
void OVHLyricsProvider::CancelSearch(const quint64 id) { Q_UNUSED(id); }
void OVHLyricsProvider::HandleSearchReply(QNetworkReply *reply, const quint64 id, const QString &artist, const QString &title) {
@@ -91,7 +93,7 @@ void OVHLyricsProvider::HandleSearchReply(QNetworkReply *reply, const quint64 id
}
void OVHLyricsProvider::Error(const quint64 id, const QString &error, QVariant debug) {
void OVHLyricsProvider::Error(const quint64 id, const QString &error, const QVariant &debug) {
qLog(Error) << "OVHLyrics:" << error;
if (debug.isValid()) qLog(Debug) << debug;

6
src/lyrics/ovhlyricsprovider.h
View File

@@ -41,8 +41,8 @@ class OVHLyricsProvider : public JsonLyricsProvider {
public:
explicit OVHLyricsProvider(QObject *parent = nullptr);
bool StartSearch(const QString &artist, const QString &album, const QString &title, quint64 id);
void CancelSearch(quint64 id);
bool StartSearch(const QString &artist, const QString &album, const QString &title, const quint64 id);
void CancelSearch(const quint64 id);
private slots:
void HandleSearchReply(QNetworkReply *reply, const quint64 id, const QString &artist, const QString &title);
@@ -50,7 +50,7 @@ class OVHLyricsProvider : public JsonLyricsProvider {
private:
static const char *kUrlSearch;
QNetworkAccessManager *network_;
void Error(const quint64 id, const QString &error, QVariant debug = QVariant());
void Error(const quint64 id, const QString &error, const QVariant &debug = QVariant());
};