fixed latest Qt support

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@9255 90c681e8-e032-0410-971d-27865f9a5e38

5 files changed, 2 insertions, 39 deletions

diff --git a/src/plugins/General/listenbrainz/listenbrainz.cpp b/src/plugins/General/listenbrainz/listenbrainz.cpp
index 521bbe0d9..d763ff13e 100644
--- a/src/plugins/General/listenbrainz/listenbrainz.cpp
+++ b/src/plugins/General/listenbrainz/listenbrainz.cpp
@@ -140,11 +140,7 @@ void ListenBrainz::updateMetaData()
 
 void ListenBrainz::processResponse(QNetworkReply *reply)
 {
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
-    if (reply->networkError() != QNetworkReply::NoError)
-#else
     if (reply->error() != QNetworkReply::NoError)
-#endif
     {
         qWarning("ListenBrainz: http error: %s", qPrintable(reply->errorString()));
     }
@@ -152,19 +148,13 @@ void ListenBrainz::processResponse(QNetworkReply *reply)
     QByteArray data = reply->readAll();
     QJsonDocument document = QJsonDocument::fromJson(data);
     QString status = document.object().value("status").toString();
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
-    if(status != "ok" || reply->networkError() != QNetworkReply::NoError)
-#else
+
     if(status != "ok" || reply->error() != QNetworkReply::NoError)
-#endif
     {
         status.clear();
         qWarning("ListenBrainz: server reply: %s", data.constData());
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
-        if(reply->networkError() == QNetworkReply::AuthenticationRequiredError)
-#else
+
         if(reply->error() == QNetworkReply::AuthenticationRequiredError)
-#endif
         {
             m_token.clear();
             qWarning("ListenBrainz: invalid user token, submitting has been disabled");
diff --git a/src/plugins/General/lyrics/lyricswindow.cpp b/src/plugins/General/lyrics/lyricswindow.cpp
index 35bf51681..750d91835 100644
--- a/src/plugins/General/lyrics/lyricswindow.cpp
+++ b/src/plugins/General/lyrics/lyricswindow.cpp
@@ -94,11 +94,7 @@ void LyricsWindow::onRequestFinished(QNetworkReply *reply)
     QVariant redirectTarget = reply->attribute(QNetworkRequest::RedirectionTargetAttribute);
     int code = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
 
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
-    if(reply->networkError() == QNetworkReply::NoError && code == 200)
-#else
     if(reply->error() == QNetworkReply::NoError && code == 200)
-#endif
     {
         QByteArray data = reply->readAll();
         LyricsProvider *provider = m_parser.provider(name);
diff --git a/src/plugins/General/scrobbler/scrobbler.cpp b/src/plugins/General/scrobbler/scrobbler.cpp
index 4616c3951..61c60cdff 100644
--- a/src/plugins/General/scrobbler/scrobbler.cpp
+++ b/src/plugins/General/scrobbler/scrobbler.cpp
@@ -181,11 +181,7 @@ void Scrobbler::updateMetaData()
 
 void Scrobbler::processResponse(QNetworkReply *reply)
 {
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
-    if (reply->networkError() != QNetworkReply::NoError)
-#else
     if (reply->error() != QNetworkReply::NoError)
-#endif
     {
         qWarning("Scrobbler[%s]: http error: %s", qPrintable(m_name), qPrintable(reply->errorString()));
     }
@@ -501,11 +497,7 @@ QString ScrobblerAuth::session() const
 
 void ScrobblerAuth::processResponse(QNetworkReply *reply)
 {
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
-    if (reply->networkError() != QNetworkReply::NoError)
-#else
     if (reply->error() != QNetworkReply::NoError)
-#endif
     {
         qWarning("ScrobblerAuth[%s]: http error: %s", qPrintable(m_name), qPrintable(reply->errorString()));
     }
diff --git a/src/plugins/General/streambrowser/streamwindow.cpp b/src/plugins/General/streambrowser/streamwindow.cpp
index 54090ab63..814196132 100644
--- a/src/plugins/General/streambrowser/streamwindow.cpp
+++ b/src/plugins/General/streambrowser/streamwindow.cpp
@@ -153,11 +153,7 @@ StreamWindow::~StreamWindow()
 void StreamWindow::showText(QNetworkReply *reply)
 {
     m_ui->statusLabel->setText(tr("Done"));
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
-    if (reply->networkError() != QNetworkReply::NoError)
-#else
     if (reply->error() != QNetworkReply::NoError)
-#endif
     {
         m_ui->statusLabel->setText(tr("Error"));
         QMessageBox::warning (this, tr("Error"), reply->errorString());
diff --git a/src/qmmpui/playlistdownloader.cpp b/src/qmmpui/playlistdownloader.cpp
index 0459839a7..01dbcbcb3 100644
--- a/src/qmmpui/playlistdownloader.cpp
+++ b/src/qmmpui/playlistdownloader.cpp
@@ -72,23 +72,12 @@ void PlayListDownloader::readResponse(QNetworkReply *reply)
         reply->deleteLater();
         return;
     }
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
-    if(reply->networkError() != QNetworkReply::NoError)
-    {
-        {
-            emit finished(false, reply->errorString() + " (" + reply->networkError() + ")");
-            reply->deleteLater();
-            return;
-        }
-    }
-#else
     if(reply->error() != QNetworkReply::NoError)
     {
         emit finished(false, reply->errorString() + " (" + reply->error() + ")");
         reply->deleteLater();
         return;
     }
-#endif
 
     QUrl url = reply->attribute(QNetworkRequest::RedirectionTargetAttribute).toUrl();
     if(!url.isEmpty() && url != m_redirect_url)