Changeset 846 for trunk/src/network/socket/qabstractsocket.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/network/socket/qabstractsocket.cpp (modified) (9 diffs)

trunk/src/network/socket/qabstractsocket.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -366 +366 @@
 
 #include <qabstracteventdispatcher.h>
-#include <qdatetime.h>
 #include <qhostaddress.h>
 #include <qhostinfo.h>
@@ -372 +371 @@
 #include <qpointer.h>
 #include <qtimer.h>
+
 
 #ifndef QT_NO_OPENSSL
@@ -1213 +1213 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 /*! \internal
 
@@ -1381 +1411 @@
     } else {
         if (d->threadData->eventDispatcher) {
-            // this internal API for QHostInfo either immediatly gives us the desired
+            // this internal API for QHostInfo either immediatly gives us the desired
             // QHostInfo from cache or later calls the _q_startConnecting slot.
             bool immediateResultValid = false;
@@ -1739 +1769 @@
     bool wasPendingClose = d->pendingClose;
     d->pendingClose = false;
-    QTime stopWatch;
+    Q stopWatch;
     stopWatch.start();
 
@@ -1820 +1850 @@
     }
 
-    QTime stopWatch;
+    Q stopWatch;
     stopWatch.start();
 
@@ -1879 +1909 @@
         return false;
 
-    QTime stopWatch;
+    Q stopWatch;
     stopWatch.start();
 
@@ -1961 +1991 @@
     }
 
-    QTime stopWatch;
+    Q stopWatch;
     stopWatch.start();