Changeset 769 for trunk/src/network/socket
- Timestamp:
- Aug 2, 2010, 9:27:30 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/vendor/nokia/qt/4.6.3 (added) merged: 768 /branches/vendor/nokia/qt/current merged: 767 /branches/vendor/nokia/qt/4.6.2 removed
- Property svn:mergeinfo changed
-
trunk/src/network/socket/qabstractsocket.cpp
r651 r769 156 156 examples for an overview of both approaches. 157 157 158 159 160 158 161 QAbstractSocket can be used with QTextStream and QDataStream's 159 162 stream operators (operator<<() and operator>>()). There is one … … 170 173 the host lookup has succeeded. 171 174 175 176 177 178 172 179 \sa connected() 173 180 */ … … 178 185 This signal is emitted after connectToHost() has been called and 179 186 a connection has been successfully established. 187 188 189 190 180 191 181 192 \sa connectToHost(), disconnected() … … 352 363 #include "qabstractsocket_p.h" 353 364 365 366 354 367 #include <qabstracteventdispatcher.h> 355 368 #include <qdatetime.h> … … 1367 1380 #endif 1368 1381 } else { 1369 if (d->threadData->eventDispatcher) 1370 d->hostLookupId = QHostInfo::lookupHost(hostName, this, SLOT(_q_startConnecting(QHostInfo))); 1382 if (d->threadData->eventDispatcher) { 1383 // this internal API for QHostInfo either immediatly gives us the desired 1384 // QHostInfo from cache or later calls the _q_startConnecting slot. 1385 bool immediateResultValid = false; 1386 QHostInfo hostInfo = qt_qhostinfo_lookup(hostName, 1387 this, 1388 SLOT(_q_startConnecting(QHostInfo)), 1389 &immediateResultValid, 1390 &d->hostLookupId); 1391 if (immediateResultValid) { 1392 d->hostLookupId = -1; 1393 d->_q_startConnecting(hostInfo); 1394 } 1395 } 1371 1396 } 1372 1397 … … 1683 1708 If msecs is -1, this function will not time out. 1684 1709 1685 Note:This function may wait slightly longer than \a msecs,1710 This function may wait slightly longer than \a msecs, 1686 1711 depending on the time it takes to complete the host lookup. 1712 1713 1714 1687 1715 1688 1716 \sa connectToHost(), connected() … … 1723 1751 } 1724 1752 if (state() == UnconnectedState) 1725 return false; 1753 return false; 1726 1754 1727 1755 bool timedOut = true; … … 2355 2383 qDebug("QAbstractSocket::disconnectFromHost() aborting immediately"); 2356 2384 #endif 2385 2386 2387 2388 2357 2389 } else { 2358 2390 // Perhaps emit closing() -
trunk/src/network/socket/qlocalserver.cpp
r755 r769 123 123 d->pendingConnections.clear(); 124 124 d->closeServer(); 125 d->serverName = QString();126 d->fullServerName = QString();127 d->errorString = QString();125 d->serverName(); 126 d->fullServerName(); 127 d->errorString(); 128 128 d->error = QAbstractSocket::UnknownSocketError; 129 129 } … … 229 229 230 230 if (!d->listen(name)) { 231 d->serverName = QString();232 d->fullServerName = QString();231 d->serverName(); 232 d->fullServerName(); 233 233 return false; 234 234 } -
trunk/src/network/socket/qlocalserver_win.cpp
r651 r769 168 168 } else { 169 169 if (GetLastError() != ERROR_IO_INCOMPLETE) { 170 170 171 setError(QLatin1String("QLocalServerPrivate::_q_onNewConnection")); 171 closeServer();172 172 return; 173 173 } -
trunk/src/network/socket/qlocalsocket_p.h
r651 r769 129 129 void _q_error(QAbstractSocket::SocketError newError); 130 130 #elif defined(Q_OS_WIN) 131 ~QLocalSocketPrivate() { 132 CloseHandle(overlapped.hEvent); 133 } 134 131 ~QLocalSocketPrivate(); 132 void destroyPipeHandles(); 135 133 void setErrorString(const QString &function); 136 134 void _q_notified(); -
trunk/src/network/socket/qlocalsocket_tcp.cpp
r651 r769 103 103 case QAbstractSocket::UnconnectedState: 104 104 state = QLocalSocket::UnconnectedState; 105 serverName = QString();106 fullServerName = QString();105 serverName(); 106 fullServerName(); 107 107 break; 108 108 case QAbstractSocket::ConnectingState: … … 219 219 return; 220 220 221 d->errorString = QString();221 d->errorString(); 222 222 d->state = ConnectingState; 223 223 emit stateChanged(d->state); … … 334 334 Q_D(QLocalSocket); 335 335 d->tcpSocket->close(); 336 d->serverName = QString();337 d->fullServerName = QString();336 d->serverName(); 337 d->fullServerName(); 338 338 QIODevice::close(); 339 339 } -
trunk/src/network/socket/qlocalsocket_unix.cpp
r651 r769 110 110 case QAbstractSocket::UnconnectedState: 111 111 state = QLocalSocket::UnconnectedState; 112 serverName = QString();113 fullServerName = QString();112 serverName(); 113 fullServerName(); 114 114 break; 115 115 case QAbstractSocket::ConnectingState: … … 226 226 return; 227 227 228 d->errorString = QString();228 d->errorString(); 229 229 d->unixSocket.setSocketState(QAbstractSocket::ConnectingState); 230 230 d->state = ConnectingState; … … 342 342 } 343 343 connectingSocket = -1; 344 connectingName = QString();344 connectingName(); 345 345 connectingOpenMode = 0; 346 346 } … … 439 439 ::close(d->connectingSocket); 440 440 d->connectingSocket = -1; 441 d->connectingName = QString();441 d->connectingName(); 442 442 d->connectingOpenMode = 0; 443 d->serverName = QString();444 d->fullServerName = QString();443 d->serverName(); 444 d->fullServerName(); 445 445 QIODevice::close(); 446 446 } -
trunk/src/network/socket/qlocalsocket_win.cpp
r651 r769 40 40 ****************************************************************************/ 41 41 42 #include "qlocalsocket.h"43 42 #include "qlocalsocket_p.h" 44 43