diff options
author | Mårten Nordheim <marten.nordheim@qt.io> | 2018-08-06 13:48:01 +0200 |
---|---|---|
committer | Mårten Nordheim <marten.nordheim@qt.io> | 2018-08-07 12:13:58 +0000 |
commit | e6b9d11581cae80bb1da3858e28a81a3276ee487 (patch) | |
tree | 379fa9da0cb91c42e02ad6f553d5963d8ca4cc0f | |
parent | 9767a47173312e06d2154e72ad02e58ed4f9b8d7 (diff) |
NeworkAccessBackend: Remove duplicated/shadowed member
QNetworkAccessBackend has a QSharedPointer called uploadByteDevice.
QNetworkAccessDebugPipeBackend and QNetworkAccessFileBackend both
duplicated the member, by taking a copy of the raw pointer, while also
shadowing the QNetworkAccessBackend's member by reusing the name.
Change-Id: I91f4e8d43d95c5f30c5bc2571393804209b7a843
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
4 files changed, 5 insertions, 8 deletions
diff --git a/src/network/access/qnetworkaccessdebugpipebackend.cpp b/src/network/access/qnetworkaccessdebugpipebackend.cpp index d7914e4143..67a856506c 100644 --- a/src/network/access/qnetworkaccessdebugpipebackend.cpp +++ b/src/network/access/qnetworkaccessdebugpipebackend.cpp @@ -107,8 +107,8 @@ void QNetworkAccessDebugPipeBackend::open() bareProtocol = QUrlQuery(url()).queryItemValue(QLatin1String("bare")) == QLatin1String("1"); if (operation() == QNetworkAccessManager::PutOperation) { - uploadByteDevice = createUploadByteDevice(); - QObject::connect(uploadByteDevice, SIGNAL(readyRead()), this, SLOT(uploadReadyReadSlot())); + createUploadByteDevice(); + QObject::connect(uploadByteDevice.data(), SIGNAL(readyRead()), this, SLOT(uploadReadyReadSlot())); QMetaObject::invokeMethod(this, "uploadReadyReadSlot", Qt::QueuedConnection); } } diff --git a/src/network/access/qnetworkaccessdebugpipebackend_p.h b/src/network/access/qnetworkaccessdebugpipebackend_p.h index d9a7aabdad..761c7055b8 100644 --- a/src/network/access/qnetworkaccessdebugpipebackend_p.h +++ b/src/network/access/qnetworkaccessdebugpipebackend_p.h @@ -77,7 +77,6 @@ protected: void pushFromSocketToDownstream(); void pushFromUpstreamToSocket(); void possiblyFinish(); - QNonContiguousByteDevice *uploadByteDevice; private slots: void uploadReadyReadSlot(); diff --git a/src/network/access/qnetworkaccessfilebackend.cpp b/src/network/access/qnetworkaccessfilebackend.cpp index d4ca9c22fc..60353cb03e 100644 --- a/src/network/access/qnetworkaccessfilebackend.cpp +++ b/src/network/access/qnetworkaccessfilebackend.cpp @@ -99,7 +99,7 @@ QNetworkAccessFileBackendFactory::create(QNetworkAccessManager::Operation op, } QNetworkAccessFileBackend::QNetworkAccessFileBackend() - : uploadByteDevice(0), totalBytes(0), hasUploadFinished(false) + : totalBytes(0), hasUploadFinished(false) { } @@ -154,8 +154,8 @@ void QNetworkAccessFileBackend::open() break; case QNetworkAccessManager::PutOperation: mode = QIODevice::WriteOnly | QIODevice::Truncate; - uploadByteDevice = createUploadByteDevice(); - QObject::connect(uploadByteDevice, SIGNAL(readyRead()), this, SLOT(uploadReadyReadSlot())); + createUploadByteDevice(); + QObject::connect(uploadByteDevice.data(), SIGNAL(readyRead()), this, SLOT(uploadReadyReadSlot())); QMetaObject::invokeMethod(this, "uploadReadyReadSlot", Qt::QueuedConnection); break; default: diff --git a/src/network/access/qnetworkaccessfilebackend_p.h b/src/network/access/qnetworkaccessfilebackend_p.h index 2c01fb1121..2204958ee0 100644 --- a/src/network/access/qnetworkaccessfilebackend_p.h +++ b/src/network/access/qnetworkaccessfilebackend_p.h @@ -73,8 +73,6 @@ public: public slots: void uploadReadyReadSlot(); -protected: - QNonContiguousByteDevice *uploadByteDevice; private: QFile file; qint64 totalBytes; |