summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2014-02-22 23:38:21 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-26 22:03:57 +0100
commitbcea86b7da38b39f83bafba6f53c08409f5f09a3 (patch)
tree7ef8727c3b74cd2257cfba98a4165d4633797ad9
parente3db3c4d78e6a82adfb13746d5177abc5d4c12d8 (diff)
QtNetwork: add qMove() to QSharedPointer uses where applicable
QSharedPointers here are passed by value - good, since it enabled C++11 move semantics, transparently. However, when passing such parameters on to assignment operators or other functions, copies were made where moves would have been sufficient. Thus, add some qMove()s. Change-Id: Ied1a5edf1bfbb16108dfeefbe85e58ab3d4ef92f Reviewed-by: Richard J. Moore <rich@kde.org>
-rw-r--r--src/network/access/qhttpnetworkconnection.cpp6
-rw-r--r--src/network/access/qhttpthreaddelegate.cpp2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp
index 66c97f7485..866a9399a9 100644
--- a/src/network/access/qhttpnetworkconnection.cpp
+++ b/src/network/access/qhttpnetworkconnection.cpp
@@ -1131,7 +1131,7 @@ QHttpNetworkConnection::QHttpNetworkConnection(const QString &hostName, quint16
: QObject(*(new QHttpNetworkConnectionPrivate(hostName, port, encrypt)), parent)
{
Q_D(QHttpNetworkConnection);
- d->networkSession = networkSession;
+ d->networkSession = qMove(networkSession);
d->init();
}
@@ -1139,7 +1139,7 @@ QHttpNetworkConnection::QHttpNetworkConnection(quint16 connectionCount, const QS
: QObject(*(new QHttpNetworkConnectionPrivate(connectionCount, hostName, port, encrypt)), parent)
{
Q_D(QHttpNetworkConnection);
- d->networkSession = networkSession;
+ d->networkSession = qMove(networkSession);
d->init();
}
#else
@@ -1248,7 +1248,7 @@ QSharedPointer<QSslContext> QHttpNetworkConnection::sslContext()
void QHttpNetworkConnection::setSslContext(QSharedPointer<QSslContext> context)
{
Q_D(QHttpNetworkConnection);
- d->sslContext = context;
+ d->sslContext = qMove(context);
}
void QHttpNetworkConnection::ignoreSslErrors(int channel)
diff --git a/src/network/access/qhttpthreaddelegate.cpp b/src/network/access/qhttpthreaddelegate.cpp
index b7e8bb3f72..5602c8028a 100644
--- a/src/network/access/qhttpthreaddelegate.cpp
+++ b/src/network/access/qhttpthreaddelegate.cpp
@@ -184,7 +184,7 @@ public:
: QHttpNetworkConnection(hostName, port, encrypt)
#else
QNetworkAccessCachedHttpConnection(const QString &hostName, quint16 port, bool encrypt, QSharedPointer<QNetworkSession> networkSession)
- : QHttpNetworkConnection(hostName, port, encrypt, /*parent=*/0, networkSession)
+ : QHttpNetworkConnection(hostName, port, encrypt, /*parent=*/0, qMove(networkSession))
#endif
{
setExpires(true);