summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Goetz <Markus.Goetz@nokia.com>2009-10-06 12:53:15 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2009-10-07 02:56:40 (GMT)
commitddd5cf293a5636202b905efc880615e5c34bf1b3 (patch)
tree96cf8ef893cde268510f61666c556d8241902e41
parent5430688f93425cdc14507fefbc98de40e5f75da7 (diff)
downloadQt-ddd5cf293a5636202b905efc880615e5c34bf1b3.zip
Qt-ddd5cf293a5636202b905efc880615e5c34bf1b3.tar.gz
Qt-ddd5cf293a5636202b905efc880615e5c34bf1b3.tar.bz2
QAbstractSocket::setSocketOption: Make const reference
After 4.6 API review. Reviewed-by: Volker Hilsheimer (cherry picked from commit f83ae188edb09a94b25b962c8a8b793180d22b67)
-rw-r--r--src/network/socket/qabstractsocket.cpp2
-rw-r--r--src/network/socket/qabstractsocket.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp
index 675e88a..86ccef2 100644
--- a/src/network/socket/qabstractsocket.cpp
+++ b/src/network/socket/qabstractsocket.cpp
@@ -1576,7 +1576,7 @@ bool QAbstractSocket::setSocketDescriptor(int socketDescriptor, SocketState sock
\sa socketOption()
\since 4.6
*/
-void QAbstractSocket::setSocketOption(QAbstractSocket::SocketOption option, QVariant value)
+void QAbstractSocket::setSocketOption(QAbstractSocket::SocketOption option, const QVariant &value)
{
if (!d_func()->socketEngine)
return;
diff --git a/src/network/socket/qabstractsocket.h b/src/network/socket/qabstractsocket.h
index 4a7763f..5d94a01 100644
--- a/src/network/socket/qabstractsocket.h
+++ b/src/network/socket/qabstractsocket.h
@@ -154,8 +154,8 @@ public:
OpenMode openMode = ReadWrite);
// ### Qt 5: Make virtual?
- void setSocketOption(QAbstractSocket::SocketOption o, QVariant v);
- QVariant socketOption(QAbstractSocket::SocketOption o);
+ void setSocketOption(QAbstractSocket::SocketOption option, const QVariant &value);
+ QVariant socketOption(QAbstractSocket::SocketOption option);
SocketType socketType() const;
SocketState state() const;