diff options
author | Daniel Teske <daniel.teske@theqtcompany.com> | 2015-01-15 16:34:53 +0100 |
---|---|---|
committer | Daniel Teske <daniel.teske@theqtcompany.com> | 2015-04-14 15:20:46 +0000 |
commit | ac31d397a8a82a0a5b5b1276025e55371c3c9972 (patch) | |
tree | 4834bb3592666bc15e14da3aaf1437cfdf8827fa /src/plugins/qmltooling/shared | |
parent | 181824f2497b3c874acce0f4a54a5580ee64ea90 (diff) |
Use qt_subtract_from_timeout instead of duplicating qt_timeout_value
The same function was duplicated 5 times in qtbase, so create one copy
to rule them all and use it also in QtDeclarative.
Change-Id: I4e39a7ee0541ce4fe9710cea344e537ee011bbe9
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Diffstat (limited to 'src/plugins/qmltooling/shared')
-rw-r--r-- | src/plugins/qmltooling/shared/qpacketprotocol.cpp | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/src/plugins/qmltooling/shared/qpacketprotocol.cpp b/src/plugins/qmltooling/shared/qpacketprotocol.cpp index e60011c4f7..d52d730a5d 100644 --- a/src/plugins/qmltooling/shared/qpacketprotocol.cpp +++ b/src/plugins/qmltooling/shared/qpacketprotocol.cpp @@ -35,6 +35,7 @@ #include <QtCore/QBuffer> #include <QtCore/QElapsedTimer> +#include <private/qiodevice_p.h> QT_BEGIN_NAMESPACE @@ -318,19 +319,6 @@ QPacket QPacketProtocol::read() return rv; } -/* - Returns the difference between msecs and elapsed. If msecs is -1, - however, -1 is returned. -*/ -static int qt_timeout_value(int msecs, int elapsed) -{ - if (msecs == -1) - return -1; - - int timeout = msecs - elapsed; - return timeout < 0 ? 0 : timeout; -} - /*! This function locks until a new packet is available for reading and the \l{QIODevice::}{readyRead()} signal has been emitted. The function @@ -356,7 +344,7 @@ bool QPacketProtocol::waitForReadyRead(int msecs) return false; if (!d->waitingForPacket) return true; - msecs = qt_timeout_value(msecs, stopWatch.elapsed()); + msecs = qt_subtract_from_timeout(msecs, stopWatch.elapsed()); } while (true); } |