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/gui/kernel/qclipboard_x11.cpp | |
| parent | e0c97f943e80488c7e674075d40a27822b7e8c78 (diff) | |
| download | Qt-21983be486af0d252b8d393ed36b15becb3c8824.zip Qt-21983be486af0d252b8d393ed36b15becb3c8824.tar.gz Qt-21983be486af0d252b8d393ed36b15becb3c8824.tar.bz2 | |
Rename QTimestamp to QElapsedTimer
Diffstat (limited to 'src/gui/kernel/qclipboard_x11.cpp')
| -rw-r--r-- | src/gui/kernel/qclipboard_x11.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/kernel/qclipboard_x11.cpp b/src/gui/kernel/qclipboard_x11.cpp index 2a9706b..3bdc971 100644 --- a/src/gui/kernel/qclipboard_x11.cpp +++ b/src/gui/kernel/qclipboard_x11.cpp @@ -75,7 +75,7 @@ #include "qt_x11_p.h" #include "qx11info_x11.h" #include "qimagewriter.h" -#include "qtimestamp.h" +#include "qelapsedtimer.h" #include "qvariant.h" #include "qdnd_p.h" #include <private/qwidget_p.h> @@ -516,9 +516,9 @@ static Bool checkForClipboardEvents(Display *, XEvent *e, XPointer) bool QX11Data::clipboardWaitForEvent(Window win, int type, XEvent *event, int timeout) { - QTimestamp started; + QElapsedTimer started; started.start(); - QTimestamp now = started; + QElapsedTimer now = started; if (QAbstractEventDispatcher::instance()->inherits("QtMotif") || QApplication::clipboard()->property("useEventLoopWhenWaiting").toBool()) { |