diff --git a/scrobbler.h b/scrobbler.h --- a/scrobbler.h +++ b/scrobbler.h @@ -20,6 +20,7 @@ #include #include +#include #include #include @@ -66,8 +67,8 @@ QDateTime m_playbackTimer; FileHandle m_file; - QNetworkAccessManager *m_networkAccessManager; + std::unique_ptr m_networkAccessManager; std::unique_ptr m_wallet; }; diff --git a/scrobbler.cpp b/scrobbler.cpp --- a/scrobbler.cpp +++ b/scrobbler.cpp @@ -19,7 +19,6 @@ #include #include -#include #include #include #include @@ -38,7 +37,7 @@ Scrobbler::Scrobbler(QObject* parent) : QObject(parent) - , m_networkAccessManager(nullptr) + , m_networkAccessManager(new QNetworkAccessManager(this)) , m_wallet(Scrobbler::openKWallet()) { QByteArray sessionKey; @@ -150,9 +149,6 @@ url.setQuery(urlQuery); - if (!m_networkAccessManager) - m_networkAccessManager = new QNetworkAccessManager(this); - QNetworkReply *reply = m_networkAccessManager->get(QNetworkRequest(url)); connect(reply, SIGNAL(finished()), this, SLOT(handleAuthenticationReply())); } @@ -305,10 +301,6 @@ void Scrobbler::post(QMap ¶ms) { - if(!m_networkAccessManager) { - return; - } - QUrl url("http://ws.audioscrobbler.com/2.0/"); QByteArray data;