Changeset 846 for trunk/src/network/socket/qabstractsocket.cpp
- Timestamp:
- May 5, 2011, 5:36:53 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/vendor/nokia/qt/4.7.2 (added) merged: 845 /branches/vendor/nokia/qt/current merged: 844 /branches/vendor/nokia/qt/4.6.3 removed
- Property svn:mergeinfo changed
-
trunk/src/network/socket/qabstractsocket.cpp
r769 r846 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) … … 366 366 367 367 #include <qabstracteventdispatcher.h> 368 #include <qdatetime.h>369 368 #include <qhostaddress.h> 370 369 #include <qhostinfo.h> … … 372 371 #include <qpointer.h> 373 372 #include <qtimer.h> 373 #include <qelapsedtimer.h> 374 374 375 375 #ifndef QT_NO_OPENSSL … … 1213 1213 } 1214 1214 1215 1216 void QAbstractSocketPrivate::pauseSocketNotifiers(QAbstractSocket *socket) 1217 { 1218 QAbstractSocketEngine *socketEngine = socket->d_func()->socketEngine; 1219 if (!socketEngine) 1220 return; 1221 socket->d_func()->prePauseReadSocketNotifierState = socketEngine->isReadNotificationEnabled(); 1222 socket->d_func()->prePauseWriteSocketNotifierState = socketEngine->isWriteNotificationEnabled(); 1223 socket->d_func()->prePauseExceptionSocketNotifierState = socketEngine->isExceptionNotificationEnabled(); 1224 socketEngine->setReadNotificationEnabled(false); 1225 socketEngine->setWriteNotificationEnabled(false); 1226 socketEngine->setExceptionNotificationEnabled(false); 1227 } 1228 1229 void QAbstractSocketPrivate::resumeSocketNotifiers(QAbstractSocket *socket) 1230 { 1231 QAbstractSocketEngine *socketEngine = socket->d_func()->socketEngine; 1232 if (!socketEngine) 1233 return; 1234 socketEngine->setReadNotificationEnabled(socket->d_func()->prePauseReadSocketNotifierState); 1235 socketEngine->setWriteNotificationEnabled(socket->d_func()->prePauseWriteSocketNotifierState); 1236 socketEngine->setExceptionNotificationEnabled(socket->d_func()->prePauseExceptionSocketNotifierState); 1237 } 1238 1239 QAbstractSocketEngine* QAbstractSocketPrivate::getSocketEngine(QAbstractSocket *socket) 1240 { 1241 return socket->d_func()->socketEngine; 1242 } 1243 1244 1215 1245 /*! \internal 1216 1246 … … 1381 1411 } else { 1382 1412 if (d->threadData->eventDispatcher) { 1383 // this internal API for QHostInfo either immediat ly gives us the desired1413 // this internal API for QHostInfo either immediately gives us the desired 1384 1414 // QHostInfo from cache or later calls the _q_startConnecting slot. 1385 1415 bool immediateResultValid = false; … … 1739 1769 bool wasPendingClose = d->pendingClose; 1740 1770 d->pendingClose = false; 1741 Q TimestopWatch;1771 QElapsedTimer stopWatch; 1742 1772 stopWatch.start(); 1743 1773 … … 1820 1850 } 1821 1851 1822 Q TimestopWatch;1852 QElapsedTimer stopWatch; 1823 1853 stopWatch.start(); 1824 1854 … … 1879 1909 return false; 1880 1910 1881 Q TimestopWatch;1911 QElapsedTimer stopWatch; 1882 1912 stopWatch.start(); 1883 1913 … … 1961 1991 } 1962 1992 1963 Q TimestopWatch;1993 QElapsedTimer stopWatch; 1964 1994 stopWatch.start(); 1965 1995
Note:
See TracChangeset
for help on using the changeset viewer.