diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-26 14:02:26 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-17 10:54:19 (GMT) |
| commit | 21983be486af0d252b8d393ed36b15becb3c8824 (patch) | |
| tree | 84501a18ef84aac2f186452741ac93f229090894 /src/network/socket/qlocalsocket_unix.cpp | |
| parent | e0c97f943e80488c7e674075d40a27822b7e8c78 (diff) | |
| download | Qt-21983be486af0d252b8d393ed36b15becb3c8824.zip Qt-21983be486af0d252b8d393ed36b15becb3c8824.tar.gz Qt-21983be486af0d252b8d393ed36b15becb3c8824.tar.bz2 | |
Rename QTimestamp to QElapsedTimer
Diffstat (limited to 'src/network/socket/qlocalsocket_unix.cpp')
| -rw-r--r-- | src/network/socket/qlocalsocket_unix.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/network/socket/qlocalsocket_unix.cpp b/src/network/socket/qlocalsocket_unix.cpp index 20301ba..f14decc 100644 --- a/src/network/socket/qlocalsocket_unix.cpp +++ b/src/network/socket/qlocalsocket_unix.cpp @@ -54,7 +54,7 @@ #include <qdir.h> #include <qdebug.h> -#include <qtimestamp.h> +#include <qelapsedtimer.h> #ifdef Q_OS_VXWORKS # include <selectLib.h> @@ -534,7 +534,7 @@ bool QLocalSocket::waitForConnected(int msec) int result = -1; // on Linux timeout will be updated by select, but _not_ on other systems. - QTimestamp timer; + QElapsedTimer timer; timer.start(); while (state() == ConnectingState && (-1 == msec || timer.elapsed() < msec)) { |