From b49467220811059ea85f1a31eeecb6797dc753e2 Mon Sep 17 00:00:00 2001 From: "Jonas M. Gastal" Date: Tue, 27 Dec 2011 18:00:18 -0200 Subject: Emit error if trying to connect while socket is connected or connecting. This applies to both local and abstract sockets. Task-number: QTBUG-22450 Change-Id: I5c58d68da95ffb6bcde5be510853359b288e5984 Reviewed-by: Thiago Macieira Reviewed-by: Peter Hartmann --- src/network/socket/qlocalsocket_tcp.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/network/socket/qlocalsocket_tcp.cpp') diff --git a/src/network/socket/qlocalsocket_tcp.cpp b/src/network/socket/qlocalsocket_tcp.cpp index 38d2b627b1..4585fddbc3 100644 --- a/src/network/socket/qlocalsocket_tcp.cpp +++ b/src/network/socket/qlocalsocket_tcp.cpp @@ -155,6 +155,9 @@ QString QLocalSocketPrivate::generateErrorString(QLocalSocket::LocalSocketError case QLocalSocket::UnsupportedSocketOperationError: errorString = QLocalSocket::tr("%1: The socket operation is not supported").arg(function); break; + case QLocalSocket::OperationError: + errorString = QLocalSocket::tr("%1: Operation not permitted when socket is in this state").arg(function); + break; case QLocalSocket::UnknownSocketError: default: errorString = QLocalSocket::tr("%1: Unknown error").arg(function); -- cgit v1.2.3 From 1fdfc2abfe1fa26b86028934d4853432e25b4655 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Thu, 5 Jan 2012 14:03:39 +1000 Subject: Update copyright year in license headers. Change-Id: I02f2c620296fcd91d4967d58767ea33fc4e1e7dc Reviewed-by: Rohan McGovern --- src/network/socket/qlocalsocket_tcp.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/network/socket/qlocalsocket_tcp.cpp') diff --git a/src/network/socket/qlocalsocket_tcp.cpp b/src/network/socket/qlocalsocket_tcp.cpp index 4585fddbc3..5a2fe3fcf7 100644 --- a/src/network/socket/qlocalsocket_tcp.cpp +++ b/src/network/socket/qlocalsocket_tcp.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -- cgit v1.2.3 From b03fa845a72ce0f4e0785c6ebeb430ded970426b Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 9 Jan 2012 12:33:17 +0100 Subject: QLocalSocket: make socket descriptor qintptr This is consistent with the other socket classes. Also see commit bf7f17060773803f332e8c729a70f47b94243890. Change-Id: Ic4bf01bd4abf778e21fe575c5304f86c9bee82fc Reviewed-by: Jonas Gastal Reviewed-by: Oswald Buddenhagen Reviewed-by: Joerg Bornemann --- src/network/socket/qlocalsocket_tcp.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/network/socket/qlocalsocket_tcp.cpp') diff --git a/src/network/socket/qlocalsocket_tcp.cpp b/src/network/socket/qlocalsocket_tcp.cpp index 5a2fe3fcf7..3b83d0ee01 100644 --- a/src/network/socket/qlocalsocket_tcp.cpp +++ b/src/network/socket/qlocalsocket_tcp.cpp @@ -250,7 +250,7 @@ void QLocalSocket::connectToServer(const QString &name, OpenMode openMode) QIODevice::open(openMode); } -bool QLocalSocket::setSocketDescriptor(quintptr socketDescriptor, +bool QLocalSocket::setSocketDescriptor(qintptr socketDescriptor, LocalSocketState socketState, OpenMode openMode) { Q_D(QLocalSocket); @@ -290,7 +290,7 @@ bool QLocalSocket::setSocketDescriptor(quintptr socketDescriptor, newSocketState, openMode); } -quintptr QLocalSocket::socketDescriptor() const +qintptr QLocalSocket::socketDescriptor() const { Q_D(const QLocalSocket); return d->tcpSocket->socketDescriptor(); -- cgit v1.2.3