From 287f0a37399c135d07ade267b8fc41204fe93da3 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Fri, 2 Oct 2020 19:27:47 +0200 Subject: [PATCH] Remove redundant check for isNull() --- ext/libstrawberry-tagreader/tagreader.cpp | 3 ++- src/covermanager/lastfmcoverprovider.cpp | 2 +- src/covermanager/musicbrainzcoverprovider.cpp | 2 +- src/covermanager/spotifycoverprovider.cpp | 2 +- src/covermanager/tidalcoverprovider.cpp | 2 +- src/lyrics/geniuslyricsprovider.cpp | 2 +- src/scrobbler/lastfmimport.cpp | 4 ++-- src/scrobbler/listenbrainzscrobbler.cpp | 4 ++-- src/scrobbler/scrobblercache.cpp | 2 +- src/scrobbler/scrobblerservice.cpp | 2 +- src/scrobbler/scrobblingapi20.cpp | 4 ++-- src/subsonic/subsonicbaserequest.cpp | 2 +- src/tidal/tidalbaserequest.cpp | 2 +- src/tidal/tidalservice.cpp | 6 +++--- 14 files changed, 20 insertions(+), 19 deletions(-) diff --git a/ext/libstrawberry-tagreader/tagreader.cpp b/ext/libstrawberry-tagreader/tagreader.cpp index 8b398ea4b..cf43643d4 100644 --- a/ext/libstrawberry-tagreader/tagreader.cpp +++ b/ext/libstrawberry-tagreader/tagreader.cpp @@ -532,7 +532,8 @@ void TagReader::SetVorbisComments(TagLib::Ogg::XiphComment *vorbis_comments, con bool TagReader::SaveFile(const QString &filename, const pb::tagreader::SongMetadata &song) const { - if (filename.isNull() || filename.isEmpty()) return false; + if (filename.isEmpty()) return false; + qLog(Debug) << "Saving tags to" << filename; std::unique_ptr fileref(factory_->GetFileRef(filename));; if (!fileref || fileref->isNull()) return false; diff --git a/src/covermanager/lastfmcoverprovider.cpp b/src/covermanager/lastfmcoverprovider.cpp index 20ffdeffc..81db2f3a7 100644 --- a/src/covermanager/lastfmcoverprovider.cpp +++ b/src/covermanager/lastfmcoverprovider.cpp @@ -304,7 +304,7 @@ QByteArray LastFmCoverProvider::GetReplyData(QNetworkReply *reply) { QString error; QJsonParseError json_error; QJsonDocument json_doc = QJsonDocument::fromJson(data, &json_error); - if (json_error.error == QJsonParseError::NoError && !json_doc.isNull() && !json_doc.isEmpty() && json_doc.isObject()) { + if (json_error.error == QJsonParseError::NoError && !json_doc.isEmpty() && json_doc.isObject()) { QJsonObject json_obj = json_doc.object(); if (json_obj.contains("error") && json_obj.contains("message")) { int code = json_obj["error"].toInt(); diff --git a/src/covermanager/musicbrainzcoverprovider.cpp b/src/covermanager/musicbrainzcoverprovider.cpp index 9d8fd9159..0706d7d31 100644 --- a/src/covermanager/musicbrainzcoverprovider.cpp +++ b/src/covermanager/musicbrainzcoverprovider.cpp @@ -247,7 +247,7 @@ QByteArray MusicbrainzCoverProvider::GetReplyData(QNetworkReply *reply) { QString error; QJsonParseError json_error; QJsonDocument json_doc = QJsonDocument::fromJson(data, &json_error); - if (json_error.error == QJsonParseError::NoError && !json_doc.isNull() && !json_doc.isEmpty() && json_doc.isObject()) { + if (json_error.error == QJsonParseError::NoError && !json_doc.isEmpty() && json_doc.isObject()) { QJsonObject json_obj = json_doc.object(); if (json_obj.contains("error")) { error = json_obj["error"].toString(); diff --git a/src/covermanager/spotifycoverprovider.cpp b/src/covermanager/spotifycoverprovider.cpp index 35cb3a3f4..bee8e807a 100644 --- a/src/covermanager/spotifycoverprovider.cpp +++ b/src/covermanager/spotifycoverprovider.cpp @@ -277,7 +277,7 @@ void SpotifyCoverProvider::AccessTokenRequestFinished(QNetworkReply *reply) { QByteArray data = reply->readAll(); QJsonParseError json_error; QJsonDocument json_doc = QJsonDocument::fromJson(data, &json_error); - if (json_error.error == QJsonParseError::NoError && !json_doc.isNull() && !json_doc.isEmpty() && json_doc.isObject()) { + if (json_error.error == QJsonParseError::NoError && !json_doc.isEmpty() && json_doc.isObject()) { QJsonObject json_obj = json_doc.object(); if (!json_obj.isEmpty() && json_obj.contains("error") && json_obj.contains("error_description")) { QString error = json_obj["error"].toString(); diff --git a/src/covermanager/tidalcoverprovider.cpp b/src/covermanager/tidalcoverprovider.cpp index 55c250a91..c2e0b0648 100644 --- a/src/covermanager/tidalcoverprovider.cpp +++ b/src/covermanager/tidalcoverprovider.cpp @@ -145,7 +145,7 @@ QByteArray TidalCoverProvider::GetReplyData(QNetworkReply *reply) { int status = 0; int sub_status = 0; QString error; - if (parse_error.error == QJsonParseError::NoError && !json_doc.isNull() && !json_doc.isEmpty() && json_doc.isObject()) { + if (parse_error.error == QJsonParseError::NoError && !json_doc.isEmpty() && json_doc.isObject()) { QJsonObject json_obj = json_doc.object(); if (!json_obj.isEmpty() && json_obj.contains("status") && json_obj.contains("userMessage")) { status = json_obj["status"].toInt(); diff --git a/src/lyrics/geniuslyricsprovider.cpp b/src/lyrics/geniuslyricsprovider.cpp index d815c4567..a4a4cb785 100644 --- a/src/lyrics/geniuslyricsprovider.cpp +++ b/src/lyrics/geniuslyricsprovider.cpp @@ -237,7 +237,7 @@ void GeniusLyricsProvider::AccessTokenRequestFinished(QNetworkReply *reply) { QByteArray data(reply->readAll()); QJsonParseError json_error; QJsonDocument json_doc = QJsonDocument::fromJson(data, &json_error); - if (json_error.error == QJsonParseError::NoError && !json_doc.isNull() && !json_doc.isEmpty() && json_doc.isObject()) { + if (json_error.error == QJsonParseError::NoError && !json_doc.isEmpty() && json_doc.isObject()) { QJsonObject json_obj = json_doc.object(); if (!json_obj.isEmpty() && json_obj.contains("error") && json_obj.contains("error_description")) { QString error = json_obj["error"].toString(); diff --git a/src/scrobbler/lastfmimport.cpp b/src/scrobbler/lastfmimport.cpp index 6f044c75c..d93204782 100644 --- a/src/scrobbler/lastfmimport.cpp +++ b/src/scrobbler/lastfmimport.cpp @@ -156,7 +156,7 @@ QByteArray LastFMImport::GetReplyData(QNetworkReply *reply) { QJsonParseError json_error; QJsonDocument json_doc = QJsonDocument::fromJson(data, &json_error); int error_code = -1; - if (json_error.error == QJsonParseError::NoError && !json_doc.isNull() && !json_doc.isEmpty() && json_doc.isObject()) { + if (json_error.error == QJsonParseError::NoError && !json_doc.isEmpty() && json_doc.isObject()) { QJsonObject json_obj = json_doc.object(); if (json_obj.contains("error") && json_obj.contains("message")) { error_code = json_obj["error"].toInt(); @@ -190,7 +190,7 @@ QJsonObject LastFMImport::ExtractJsonObj(const QByteArray &data) { Error("Reply from server missing Json data.", data); return QJsonObject(); } - if (json_doc.isNull() || json_doc.isEmpty()) { + if (json_doc.isEmpty()) { Error("Received empty Json document.", json_doc); return QJsonObject(); } diff --git a/src/scrobbler/listenbrainzscrobbler.cpp b/src/scrobbler/listenbrainzscrobbler.cpp index 11add9bd6..4e550bfb3 100644 --- a/src/scrobbler/listenbrainzscrobbler.cpp +++ b/src/scrobbler/listenbrainzscrobbler.cpp @@ -278,7 +278,7 @@ void ListenBrainzScrobbler::AuthenticateReplyFinished(QNetworkReply *reply) { QString error; QJsonParseError json_error; QJsonDocument json_doc = QJsonDocument::fromJson(data, &json_error); - if (json_error.error == QJsonParseError::NoError && !json_doc.isNull() && !json_doc.isEmpty() && json_doc.isObject()) { + if (json_error.error == QJsonParseError::NoError && !json_doc.isEmpty() && json_doc.isObject()) { QJsonObject json_obj = json_doc.object(); if (json_obj.contains("error") && json_obj.contains("error_description")) { QString error_code = json_obj["error"].toString(); @@ -383,7 +383,7 @@ QByteArray ListenBrainzScrobbler::GetReplyData(QNetworkReply *reply) { QString error; QJsonParseError json_error; QJsonDocument json_doc = QJsonDocument::fromJson(data, &json_error); - if (json_error.error == QJsonParseError::NoError && !json_doc.isNull() && !json_doc.isEmpty() && json_doc.isObject()) { + if (json_error.error == QJsonParseError::NoError && !json_doc.isEmpty() && json_doc.isObject()) { QJsonObject json_obj = json_doc.object(); if (json_obj.contains("code") && json_obj.contains("error")) { int error_code = json_obj["code"].toInt(); diff --git a/src/scrobbler/scrobblercache.cpp b/src/scrobbler/scrobblercache.cpp index 270252048..ffa2b9572 100644 --- a/src/scrobbler/scrobblercache.cpp +++ b/src/scrobbler/scrobblercache.cpp @@ -75,7 +75,7 @@ void ScrobblerCache::ReadCache() { qLog(Error) << "Scrobbler cache is missing JSON data."; return; } - if (json_doc.isNull() || json_doc.isEmpty()) { + if (json_doc.isEmpty()) { qLog(Error) << "Scrobbler cache has empty JSON document."; return; } diff --git a/src/scrobbler/scrobblerservice.cpp b/src/scrobbler/scrobblerservice.cpp index 17fd1c69d..de5a0d659 100644 --- a/src/scrobbler/scrobblerservice.cpp +++ b/src/scrobbler/scrobblerservice.cpp @@ -39,7 +39,7 @@ QJsonObject ScrobblerService::ExtractJsonObj(const QByteArray &data, const bool Error("Reply from server missing Json data.", data); return QJsonObject(); } - if (json_doc.isNull() || json_doc.isEmpty()) { + if (json_doc.isEmpty()) { Error("Received empty Json document.", json_doc); return QJsonObject(); } diff --git a/src/scrobbler/scrobblingapi20.cpp b/src/scrobbler/scrobblingapi20.cpp index 9d143ebae..fd4868a97 100644 --- a/src/scrobbler/scrobblingapi20.cpp +++ b/src/scrobbler/scrobblingapi20.cpp @@ -279,7 +279,7 @@ void ScrobblingAPI20::AuthenticateReplyFinished(QNetworkReply *reply) { QString error; QJsonParseError json_error; QJsonDocument json_doc = QJsonDocument::fromJson(data, &json_error); - if (json_error.error == QJsonParseError::NoError && !json_doc.isNull() && !json_doc.isEmpty() && json_doc.isObject()) { + if (json_error.error == QJsonParseError::NoError && !json_doc.isEmpty() && json_doc.isObject()) { QJsonObject json_obj = json_doc.object(); if (json_obj.contains("error") && json_obj.contains("message")) { int code = json_obj["error"].toInt(); @@ -416,7 +416,7 @@ QByteArray ScrobblingAPI20::GetReplyData(QNetworkReply *reply) { QJsonParseError json_error; QJsonDocument json_doc = QJsonDocument::fromJson(data, &json_error); int error_code = -1; - if (json_error.error == QJsonParseError::NoError && !json_doc.isNull() && !json_doc.isEmpty() && json_doc.isObject()) { + if (json_error.error == QJsonParseError::NoError && !json_doc.isEmpty() && json_doc.isObject()) { QJsonObject json_obj = json_doc.object(); if (json_obj.contains("error") && json_obj.contains("message")) { error_code = json_obj["error"].toInt(); diff --git a/src/subsonic/subsonicbaserequest.cpp b/src/subsonic/subsonicbaserequest.cpp index ed1be0d8a..148e198b8 100644 --- a/src/subsonic/subsonicbaserequest.cpp +++ b/src/subsonic/subsonicbaserequest.cpp @@ -136,7 +136,7 @@ QByteArray SubsonicBaseRequest::GetReplyData(QNetworkReply *reply) { QString error; QJsonParseError parse_error; QJsonDocument json_doc = QJsonDocument::fromJson(data, &parse_error); - if (parse_error.error == QJsonParseError::NoError && !json_doc.isNull() && !json_doc.isEmpty() && json_doc.isObject()) { + if (parse_error.error == QJsonParseError::NoError && !json_doc.isEmpty() && json_doc.isObject()) { QJsonObject json_obj = json_doc.object(); if (!json_obj.isEmpty() && json_obj.contains("error")) { QJsonValue json_error = json_obj["error"]; diff --git a/src/tidal/tidalbaserequest.cpp b/src/tidal/tidalbaserequest.cpp index c8819a11d..e58e0b115 100644 --- a/src/tidal/tidalbaserequest.cpp +++ b/src/tidal/tidalbaserequest.cpp @@ -107,7 +107,7 @@ QByteArray TidalBaseRequest::GetReplyData(QNetworkReply *reply, const bool send_ QJsonDocument json_doc = QJsonDocument::fromJson(data, &json_error); int status = 0; int sub_status = 0; - if (json_error.error == QJsonParseError::NoError && !json_doc.isNull() && !json_doc.isEmpty() && json_doc.isObject()) { + if (json_error.error == QJsonParseError::NoError && !json_doc.isEmpty() && json_doc.isObject()) { QJsonObject json_obj = json_doc.object(); if (!json_obj.isEmpty() && json_obj.contains("status") && json_obj.contains("userMessage")) { status = json_obj["status"].toInt(); diff --git a/src/tidal/tidalservice.cpp b/src/tidal/tidalservice.cpp index 377a8507f..3234df843 100644 --- a/src/tidal/tidalservice.cpp +++ b/src/tidal/tidalservice.cpp @@ -431,7 +431,7 @@ void TidalService::AccessTokenRequestFinished(QNetworkReply *reply) { QByteArray data(reply->readAll()); QJsonParseError json_error; QJsonDocument json_doc = QJsonDocument::fromJson(data, &json_error); - if (json_error.error == QJsonParseError::NoError && !json_doc.isNull() && !json_doc.isEmpty() && json_doc.isObject()) { + if (json_error.error == QJsonParseError::NoError && !json_doc.isEmpty() && json_doc.isObject()) { QJsonObject json_obj = json_doc.object(); if (!json_obj.isEmpty() && json_obj.contains("status") && json_obj.contains("userMessage")) { int status = json_obj["status"].toInt(); @@ -581,7 +581,7 @@ void TidalService::HandleAuthReply(QNetworkReply *reply) { QByteArray data(reply->readAll()); QJsonParseError json_error; QJsonDocument json_doc = QJsonDocument::fromJson(data, &json_error); - if (json_error.error == QJsonParseError::NoError && !json_doc.isNull() && !json_doc.isEmpty() && json_doc.isObject()) { + if (json_error.error == QJsonParseError::NoError && !json_doc.isEmpty() && json_doc.isObject()) { QJsonObject json_obj = json_doc.object(); if (!json_obj.isEmpty() && json_obj.contains("status") && json_obj.contains("userMessage")) { int status = json_obj["status"].toInt(); @@ -615,7 +615,7 @@ void TidalService::HandleAuthReply(QNetworkReply *reply) { return; } - if (json_doc.isNull() || json_doc.isEmpty()) { + if (json_doc.isEmpty()) { LoginError("Authentication reply from server has empty Json document."); return; }