Changeset 846 for trunk/src/network/socket/qsocks5socketengine.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/qsocks5socketengine.cpp (modified) (10 diffs)

trunk/src/network/socket/qsocks5socketengine.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])
@@ -50 +50 @@
 #include "qhash.h"
 #include "qqueue.h"
-#include "qdatetime.h"
+#include "q.h"
 #include "qmutex.h"
 #include "qthread.h"
@@ -309 +309 @@
     QHostAddress peerAddress;
     quint16 peerPort;
-    QDateTime timeStamp;
+    Q timeStamp;
 };
 
@@ -370 +370 @@
         // qDebug() << "delete it";
     }
-    bindData->timeStamp = QDateTime::currentDateTime();
+    bindData->timeStamp();
     store.insert(socketDescriptor, bindData);
     // start sweep timer if not started
@@ -413 +413 @@
         while (it.hasNext()) {
             it.next();
-            if (it.value()->timeStamp.secsTo(QDateTime::currentDateTime()) > 350) {
+            if (it.value()->timeStamp.) {
                 QSOCKS5_DEBUG << "QSocks5BindStore removing JJJJ";
                 it.remove();
@@ -1356 +1356 @@
 
     int msecs = SOCKS5_BLOCKING_BIND_TIMEOUT;
-    QTime stopWatch;
+    Q stopWatch;
     stopWatch.start();
     d->data->controlSocket->connectToHost(d->proxyInfo.hostName(), d->proxyInfo.port());
@@ -1456 +1456 @@
         if (d->data->controlSocket->state() == QAbstractSocket::ConnectedState) {
             int msecs = 100;
-            QTime stopWatch;
+            Q stopWatch;
             stopWatch.start();
             while (!d->data->controlSocket->bytesToWrite()) {
@@ -1675 +1675 @@
         UdpAssociateSuccess;
 
-    QTime stopWatch;
+    Q