summaryrefslogtreecommitdiffstats
path: root/src/network/socket/qhttpsocketengine.cpp
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2010-02-26 14:02:26 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-03-17 10:54:19 (GMT)
commit21983be486af0d252b8d393ed36b15becb3c8824 (patch)
tree84501a18ef84aac2f186452741ac93f229090894 /src/network/socket/qhttpsocketengine.cpp
parente0c97f943e80488c7e674075d40a27822b7e8c78 (diff)
downloadQt-21983be486af0d252b8d393ed36b15becb3c8824.zip
Qt-21983be486af0d252b8d393ed36b15becb3c8824.tar.gz
Qt-21983be486af0d252b8d393ed36b15becb3c8824.tar.bz2
Rename QTimestamp to QElapsedTimer
Diffstat (limited to 'src/network/socket/qhttpsocketengine.cpp')
-rw-r--r--src/network/socket/qhttpsocketengine.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/network/socket/qhttpsocketengine.cpp b/src/network/socket/qhttpsocketengine.cpp
index 9d412ac..dfda257 100644
--- a/src/network/socket/qhttpsocketengine.cpp
+++ b/src/network/socket/qhttpsocketengine.cpp
@@ -44,7 +44,7 @@
#include "qhostaddress.h"
#include "qurl.h"
#include "qhttp.h"
-#include "qtimestamp.h"
+#include "qelapsedtimer.h"
#if !defined(QT_NO_NETWORKPROXY) && !defined(QT_NO_HTTP)
#include <qdebug.h>
@@ -319,7 +319,7 @@ bool QHttpSocketEngine::waitForRead(int msecs, bool *timedOut)
if (!d->socket || d->socket->state() == QAbstractSocket::UnconnectedState)
return false;
- QTimestamp stopWatch;
+ QElapsedTimer stopWatch;
stopWatch.start();
// Wait for more data if nothing is available.
@@ -366,7 +366,7 @@ bool QHttpSocketEngine::waitForWrite(int msecs, bool *timedOut)
return true;
}
- QTimestamp stopWatch;
+ QElapsedTimer stopWatch;
stopWatch.start();
// If we're not connected yet, wait until we are, and until bytes have