diff options
Diffstat (limited to 'connectiondata.cpp')
| -rw-r--r-- | connectiondata.cpp | 31 |
1 files changed, 2 insertions, 29 deletions
diff --git a/connectiondata.cpp b/connectiondata.cpp index 11015dbf..4e9bc77e 100644 --- a/connectiondata.cpp +++ b/connectiondata.cpp @@ -18,10 +18,9 @@ #include "connectiondata.h" +#include "networkaccessmanager.h" #include "logging.h" -#include <QtNetwork/QNetworkAccessManager> - using namespace QMatrixClient; struct ConnectionData::Private @@ -35,14 +34,8 @@ struct ConnectionData::Private mutable unsigned int txnCounter = 0; const qint64 id = QDateTime::currentMSecsSinceEpoch(); - - static QNetworkAccessManager* createNam(); - static nam_customizer_t customizeNam; }; -ConnectionData::nam_customizer_t ConnectionData::Private::customizeNam = - [] (QNetworkAccessManager* /* unused */) { }; - ConnectionData::ConnectionData(QUrl baseUrl) : d(std::make_unique<Private>(baseUrl)) { } @@ -59,22 +52,9 @@ QUrl ConnectionData::baseUrl() const return d->baseUrl; } -QNetworkAccessManager* ConnectionData::Private::createNam() -{ - auto nam = new QNetworkAccessManager; - // See #109. Once Qt bearer management gets better, this workaround - // should become unnecessary. - nam->connect(nam, &QNetworkAccessManager::networkAccessibleChanged, - [nam] { nam->setNetworkAccessible(QNetworkAccessManager::Accessible); - }); - customizeNam(nam); - return nam; -} - QNetworkAccessManager* ConnectionData::nam() const { - static auto nam = d->createNam(); - return nam; + return NetworkAccessManager::instance(); } void ConnectionData::setBaseUrl(QUrl baseUrl) @@ -126,10 +106,3 @@ QByteArray ConnectionData::generateTxnId() const return QByteArray::number(d->id) + 'q' + QByteArray::number(++d->txnCounter); } - -void -ConnectionData::customizeNetworkAccess(ConnectionData::nam_customizer_t customizer) -{ - Private::customizeNam = customizer; -} - |