diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/musicbrainz/tagfetcher.cpp | 8 | ||||
-rw-r--r-- | src/musicbrainz/tagfetcher.h | 6 | ||||
-rw-r--r-- | src/network/networktask.cpp | 9 | ||||
-rw-r--r-- | src/network/networktask.h | 6 | ||||
-rw-r--r-- | src/network/webtask.cpp | 12 | ||||
-rw-r--r-- | src/network/webtask.h | 3 |
6 files changed, 14 insertions, 30 deletions
diff --git a/src/musicbrainz/tagfetcher.cpp b/src/musicbrainz/tagfetcher.cpp index 0274f34414..a6df9b1f37 100644 --- a/src/musicbrainz/tagfetcher.cpp +++ b/src/musicbrainz/tagfetcher.cpp @@ -175,10 +175,8 @@ void TagFetcher::slotAcoustIdTaskAborted() { void TagFetcher::slotAcoustIdTaskNetworkError( const QUrl& requestUrl, QNetworkReply::NetworkError errorCode, - const QString& errorString, - const QByteArray& errorContent) { + const QString& errorString) { Q_UNUSED(requestUrl); - Q_UNUSED(errorContent); DEBUG_ASSERT_QOBJECT_THREAD_AFFINITY(this); DEBUG_ASSERT(m_pAcoustIdTask.get() == qobject_cast<mixxx::AcoustIdLookupTask*>(sender())); @@ -208,10 +206,8 @@ void TagFetcher::slotMusicBrainzTaskAborted() { void TagFetcher::slotMusicBrainzTaskNetworkError( const QUrl& requestUrl, QNetworkReply::NetworkError errorCode, - const QString& errorString, - const QByteArray& errorContent) { + const QString& errorString) { Q_UNUSED(requestUrl); - Q_UNUSED(errorContent); DEBUG_ASSERT_QOBJECT_THREAD_AFFINITY(this); DEBUG_ASSERT(m_pMusicBrainzTask.get() == qobject_cast<mixxx::MusicBrainzRecordingsTask*>(sender())); diff --git a/src/musicbrainz/tagfetcher.h b/src/musicbrainz/tagfetcher.h index 7d5784fa14..e3ab34b756 100644 --- a/src/musicbrainz/tagfetcher.h +++ b/src/musicbrainz/tagfetcher.h @@ -50,8 +50,7 @@ class TagFetcher : public QObject { void slotAcoustIdTaskNetworkError( const QUrl& requestUrl, QNetworkReply::NetworkError errorCode, - const QString& errorString, - const QByteArray& errorContent); + const QString& errorString); void slotMusicBrainzTaskSucceeded( const QList<mixxx::musicbrainz::TrackRelease>& guessedTrackReleases); @@ -63,8 +62,7 @@ class TagFetcher : public QObject { void slotMusicBrainzTaskNetworkError( const QUrl& requestUrl, QNetworkReply::NetworkError errorCode, - const QString& errorString, - const QByteArray& errorContent); + const QString& errorString); private: QNetworkAccessManager m_network; diff --git a/src/network/networktask.cpp b/src/network/networktask.cpp index 9dc25df338..acd0823b83 100644 --- a/src/network/networktask.cpp +++ b/src/network/networktask.cpp @@ -81,8 +81,7 @@ void NetworkTask::emitAborted( void NetworkTask::emitNetworkError( QUrl&& requestUrl, QNetworkReply::NetworkError errorCode, - QString&& errorString, - QByteArray&& errorContent) { + QString&& errorString) { VERIFY_OR_DEBUG_ASSERT( isSignalFuncConnected(&NetworkTask::networkError)) { kLogger.warning() @@ -90,16 +89,14 @@ void NetworkTask::emitNetworkError( << "Unhandled network error signal" << requestUrl << errorCode - << errorString - << errorContent; + << errorString; deleteLater(); return; } emit networkError( std::move(requestUrl), errorCode, - std::move(errorString), - std::move(errorContent)); + std::move(errorString)); } } // namespace network diff --git a/src/network/networktask.h b/src/network/networktask.h index 4721fd2e98..70e74953fc 100644 --- a/src/network/networktask.h +++ b/src/network/networktask.h @@ -57,8 +57,7 @@ class NetworkTask : public QObject { void emitNetworkError( QUrl&& requestUrl, QNetworkReply::NetworkError errorCode, - QString&& errorString, - QByteArray&& errorContent); + QString&& errorString); /// All member variables must only be accessed from /// the event loop thread!! @@ -101,8 +100,7 @@ class NetworkTask : public QObject { void networkError( const QUrl& requestUrl, QNetworkReply::NetworkError errorCode, - const QString& errorString, - const QByteArray& errorContent); + const QString& errorString); }; } // namespace network diff --git a/src/network/webtask.cpp b/src/network/webtask.cpp index daff097c6c..6de7dcc9b1 100644 --- a/src/network/webtask.cpp +++ b/src/network/webtask.cpp @@ -78,8 +78,7 @@ WebTask::WebTask( void WebTask::onNetworkError( QUrl&& requestUrl, QNetworkReply::NetworkError errorCode, - QString&& errorString, - QByteArray&& errorContent) { + QString&& errorString) { DEBUG_ASSERT(m_state == State::Pending); DEBUG_ASSERT(m_timeoutTimerId == kInvalidTimerId); @@ -104,8 +103,7 @@ void WebTask::onNetworkError( emitNetworkError( std::move(requestUrl), errorCode, - std::move(errorString), - std::move(errorContent)); + std::move(errorString)); } } @@ -128,8 +126,7 @@ void WebTask::slotStart(int timeoutMillis) { onNetworkError( QUrl(), QNetworkReply::NetworkSessionFailedError, - tr("No network access"), - QByteArray()); + tr("No network access")); return; } DEBUG_ASSERT_QOBJECT_THREAD_AFFINITY(pNetworkAccessManager); @@ -317,8 +314,7 @@ void WebTask::slotNetworkReplyFinished() { onNetworkError( pFinishedNetworkReply->request().url(), pFinishedNetworkReply->error(), - pFinishedNetworkReply->errorString(), - pFinishedNetworkReply->readAll()); + pFinishedNetworkReply->errorString()); DEBUG_ASSERT(hasTerminated()); return; } diff --git a/src/network/webtask.h b/src/network/webtask.h index 69e8bf3599..7d364c1afb 100644 --- a/src/network/webtask.h +++ b/src/network/webtask.h @@ -171,8 +171,7 @@ class WebTask : public NetworkTask { void onNetworkError( QUrl&& requestUrl, QNetworkReply::NetworkError errorCode, - QString&& errorString, - QByteArray&& errorContent); + QString&& errorString); /// All member variables must only be accessed from /// the event loop thread!! |