From 918bb8ec47f01a43c9284c8879ec987224761319 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Martins?= Date: Sat, 12 Dec 2015 19:45:39 +0000 Subject: network: Pass types with copy-ctor or dtor by const-ref Change-Id: I7bea3e03bff6f424b02335476211dd466ce4d720 Reviewed-by: Marc Mutz --- src/network/access/qhttpnetworkconnection.cpp | 2 +- src/network/access/qhttpnetworkconnection_p.h | 2 +- src/network/access/qhttpthreaddelegate_p.h | 10 +++++----- src/network/access/qnetworkreplyhttpimpl.cpp | 9 ++++----- src/network/access/qnetworkreplyhttpimpl_p.h | 6 +++--- src/network/access/qspdyprotocolhandler.cpp | 2 +- src/network/access/qspdyprotocolhandler_p.h | 2 +- src/network/bearer/qnetworksession_p.h | 2 +- src/network/bearer/qsharednetworksession.cpp | 4 ++-- src/network/bearer/qsharednetworksession_p.h | 4 ++-- 10 files changed, 21 insertions(+), 22 deletions(-) diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp index bb1580044f..bfe3eb9252 100644 --- a/src/network/access/qhttpnetworkconnection.cpp +++ b/src/network/access/qhttpnetworkconnection.cpp @@ -1131,7 +1131,7 @@ void QHttpNetworkConnectionPrivate::startHostInfoLookup() } -void QHttpNetworkConnectionPrivate::_q_hostLookupFinished(QHostInfo info) +void QHttpNetworkConnectionPrivate::_q_hostLookupFinished(const QHostInfo &info) { bool bIpv4 = false; bool bIpv6 = false; diff --git a/src/network/access/qhttpnetworkconnection_p.h b/src/network/access/qhttpnetworkconnection_p.h index 9af39d416a..fe7f7c9b55 100644 --- a/src/network/access/qhttpnetworkconnection_p.h +++ b/src/network/access/qhttpnetworkconnection_p.h @@ -224,7 +224,7 @@ public: // private slots void _q_startNextRequest(); // send the next request from the queue - void _q_hostLookupFinished(QHostInfo info); + void _q_hostLookupFinished(const QHostInfo &info); void _q_connectDelayedChannel(); void createAuthorization(QAbstractSocket *socket, QHttpNetworkRequest &request); diff --git a/src/network/access/qhttpthreaddelegate_p.h b/src/network/access/qhttpthreaddelegate_p.h index 784e9c14b8..eb22b40ba0 100644 --- a/src/network/access/qhttpthreaddelegate_p.h +++ b/src/network/access/qhttpthreaddelegate_p.h @@ -130,14 +130,14 @@ signals: #ifndef QT_NO_SSL void encrypted(); void sslErrors(const QList &, bool *, QList *); - void sslConfigurationChanged(const QSslConfiguration); + void sslConfigurationChanged(const QSslConfiguration &); void preSharedKeyAuthenticationRequired(QSslPreSharedKeyAuthenticator *); #endif - void downloadMetaData(QList >, int, QString, bool, + void downloadMetaData(const QList > &, int, const QString &, bool, QSharedPointer, qint64, bool); void downloadProgress(qint64, qint64); - void downloadData(QByteArray); - void error(QNetworkReply::NetworkError, const QString); + void downloadData(const QByteArray &); + void error(QNetworkReply::NetworkError, const QString &); void downloadFinished(); void redirected(const QUrl &url, int httpStatus, int maxRedirectsRemainig); @@ -285,7 +285,7 @@ public: public slots: // From user thread: - void haveDataSlot(qint64 pos, QByteArray dataArray, bool dataAtEnd, qint64 dataSize) + void haveDataSlot(qint64 pos, const QByteArray &dataArray, bool dataAtEnd, qint64 dataSize) { if (pos != m_pos) { // Sometimes when re-sending a request in the qhttpnetwork* layer there is a pending haveData from the diff --git a/src/network/access/qnetworkreplyhttpimpl.cpp b/src/network/access/qnetworkreplyhttpimpl.cpp index 05457decc4..f50502167f 100644 --- a/src/network/access/qnetworkreplyhttpimpl.cpp +++ b/src/network/access/qnetworkreplyhttpimpl.cpp @@ -1162,11 +1162,10 @@ void QNetworkReplyHttpImplPrivate::checkForRedirect(const int statusCode) } } -void QNetworkReplyHttpImplPrivate::replyDownloadMetaData - (QList > hm, - int sc,QString rp,bool pu, - QSharedPointer db, - qint64 contentLength, bool spdyWasUsed) +void QNetworkReplyHttpImplPrivate::replyDownloadMetaData(const QList > &hm, + int sc, const QString &rp, bool pu, + QSharedPointer db, + qint64 contentLength, bool spdyWasUsed) { Q_Q(QNetworkReplyHttpImpl); Q_UNUSED(contentLength); diff --git a/src/network/access/qnetworkreplyhttpimpl_p.h b/src/network/access/qnetworkreplyhttpimpl_p.h index 44d51d82a4..25762be5f9 100644 --- a/src/network/access/qnetworkreplyhttpimpl_p.h +++ b/src/network/access/qnetworkreplyhttpimpl_p.h @@ -147,7 +147,7 @@ signals: void startHttpRequestSynchronously(); - void haveUploadData(const qint64 pos, QByteArray dataArray, bool dataAtEnd, qint64 dataSize); + void haveUploadData(const qint64 pos, const QByteArray &dataArray, bool dataAtEnd, qint64 dataSize); }; class QNetworkReplyHttpImplPrivate: public QNetworkReplyPrivate @@ -273,8 +273,8 @@ public: // From HTTP thread: void replyDownloadData(QByteArray); void replyFinished(); - void replyDownloadMetaData(QList >, int, QString, bool, - QSharedPointer, qint64, bool); + void replyDownloadMetaData(const QList > &, int, const QString &, + bool, QSharedPointer, qint64, bool); void replyDownloadProgressSlot(qint64,qint64); void httpAuthenticationRequired(const QHttpNetworkRequest &request, QAuthenticator *auth); void httpError(QNetworkReply::NetworkError error, const QString &errorString); diff --git a/src/network/access/qspdyprotocolhandler.cpp b/src/network/access/qspdyprotocolhandler.cpp index 5f9697ab92..ea0f152eb0 100644 --- a/src/network/access/qspdyprotocolhandler.cpp +++ b/src/network/access/qspdyprotocolhandler.cpp @@ -601,7 +601,7 @@ void QSpdyProtocolHandler::sendControlFrame(FrameType type, Q_UNUSED(written); // silence -Wunused-variable } -void QSpdyProtocolHandler::sendSYN_STREAM(HttpMessagePair messagePair, +void QSpdyProtocolHandler::sendSYN_STREAM(const HttpMessagePair &messagePair, qint32 streamID, qint32 associatedToStreamID) { QHttpNetworkRequest request = messagePair.first; diff --git a/src/network/access/qspdyprotocolhandler_p.h b/src/network/access/qspdyprotocolhandler_p.h index ed71878cd4..35f5b47360 100644 --- a/src/network/access/qspdyprotocolhandler_p.h +++ b/src/network/access/qspdyprotocolhandler_p.h @@ -166,7 +166,7 @@ private: void sendControlFrame(FrameType type, ControlFrameFlags flags, const char *data, quint32 length); - void sendSYN_STREAM(HttpMessagePair pair, qint32 streamID, + void sendSYN_STREAM(const HttpMessagePair &pair, qint32 streamID, qint32 associatedToStreamID); void sendRST_STREAM(qint32 streamID, RST_STREAM_STATUS_CODE statusCode); void sendPING(quint32 pingID); diff --git a/src/network/bearer/qnetworksession_p.h b/src/network/bearer/qnetworksession_p.h index f2ecf9902a..652687f07d 100644 --- a/src/network/bearer/qnetworksession_p.h +++ b/src/network/bearer/qnetworksession_p.h @@ -106,7 +106,7 @@ protected: } inline void setPrivateConfiguration(QNetworkConfiguration &config, - QNetworkConfigurationPrivatePointer ptr) const + const QNetworkConfigurationPrivatePointer &ptr) const { config.d = ptr; } diff --git a/src/network/bearer/qsharednetworksession.cpp b/src/network/bearer/qsharednetworksession.cpp index 0879bfbc2b..d2a3c78207 100644 --- a/src/network/bearer/qsharednetworksession.cpp +++ b/src/network/bearer/qsharednetworksession.cpp @@ -56,7 +56,7 @@ static void doDeleteLater(QObject* obj) obj->deleteLater(); } -QSharedPointer QSharedNetworkSessionManager::getSession(QNetworkConfiguration config) +QSharedPointer QSharedNetworkSessionManager::getSession(const QNetworkConfiguration &config) { QSharedNetworkSessionManager *m(sharedNetworkSessionManager()); //if already have a session, return it @@ -71,7 +71,7 @@ QSharedPointer QSharedNetworkSessionManager::getSession(QNetwor return session; } -void QSharedNetworkSessionManager::setSession(QNetworkConfiguration config, QSharedPointer session) +void QSharedNetworkSessionManager::setSession(const QNetworkConfiguration &config, QSharedPointer session) { QSharedNetworkSessionManager *m(sharedNetworkSessionManager()); m->sessions[config] = session; diff --git a/src/network/bearer/qsharednetworksession_p.h b/src/network/bearer/qsharednetworksession_p.h index 3525c8359c..149e978e4f 100644 --- a/src/network/bearer/qsharednetworksession_p.h +++ b/src/network/bearer/qsharednetworksession_p.h @@ -61,8 +61,8 @@ uint qHash(const QNetworkConfiguration& config); class QSharedNetworkSessionManager { public: - static QSharedPointer getSession(QNetworkConfiguration config); - static void setSession(QNetworkConfiguration config, QSharedPointer session); + static QSharedPointer getSession(const QNetworkConfiguration &config); + static void setSession(const QNetworkConfiguration &config, QSharedPointer session); private: QHash > sessions; }; -- cgit v1.2.3