From ac4b28ce4d0793d7f36d4d2325070daa0dbcae0b Mon Sep 17 00:00:00 2001 From: Alex Trotsenko Date: Wed, 27 May 2015 18:25:55 +0300 Subject: QRingBuffer: merge indexOf() overloads Change-Id: Icfed4a29bc2ac95b3e0300eb4579751fe7e57e77 Reviewed-by: Oswald Buddenhagen --- src/corelib/tools/qringbuffer.cpp | 18 ------------------ src/corelib/tools/qringbuffer_p.h | 2 +- 2 files changed, 1 insertion(+), 19 deletions(-) (limited to 'src') diff --git a/src/corelib/tools/qringbuffer.cpp b/src/corelib/tools/qringbuffer.cpp index d8becbe07d..bcf6d2646e 100644 --- a/src/corelib/tools/qringbuffer.cpp +++ b/src/corelib/tools/qringbuffer.cpp @@ -188,24 +188,6 @@ void QRingBuffer::clear() bufferSize = 0; } -qint64 QRingBuffer::indexOf(char c) const -{ - qint64 index = 0; - qint64 j = head; - for (int i = 0; i < buffers.size(); ++i) { - const char *ptr = buffers[i].constData() + j; - j = index + (i == tailBuffer ? tail : buffers[i].size()) - j; - - while (index < j) { - if (*ptr++ == c) - return index; - ++index; - } - j = 0; - } - return -1; -} - qint64 QRingBuffer::indexOf(char c, qint64 maxLength) const { qint64 index = 0; diff --git a/src/corelib/tools/qringbuffer_p.h b/src/corelib/tools/qringbuffer_p.h index 3a8cca46d8..68509a6a80 100644 --- a/src/corelib/tools/qringbuffer_p.h +++ b/src/corelib/tools/qringbuffer_p.h @@ -113,7 +113,7 @@ public: } Q_CORE_EXPORT void clear(); - Q_CORE_EXPORT qint64 indexOf(char c) const; + inline qint64 indexOf(char c) const { return indexOf(c, size()); } Q_CORE_EXPORT qint64 indexOf(char c, qint64 maxLength) const; Q_CORE_EXPORT qint64 read(char *data, qint64 maxLength); Q_CORE_EXPORT QByteArray read(); -- cgit v1.2.3