diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-08-04 11:17:47 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-08-04 11:17:47 (GMT) |
| commit | be212bf108e71ba3b5b75802b1f4de6613ba315c (patch) | |
| tree | c541ad12e8698f04e8fe386c2e1b94e8baca6c1b /src/corelib/tools/qringbuffer_p.h | |
| parent | 67ae1b0dac175f48875507f3187ed49276a29ddf (diff) | |
| parent | e6bb00250b321b149dd80259dc4f479088d5949b (diff) | |
| download | Qt-be212bf108e71ba3b5b75802b1f4de6613ba315c.zip Qt-be212bf108e71ba3b5b75802b1f4de6613ba315c.tar.gz Qt-be212bf108e71ba3b5b75802b1f4de6613ba315c.tar.bz2 | |
Merge commit 'origin/master'
Conflicts:
src/corelib/global/qglobal.h
src/corelib/kernel/qmetatype.cpp
src/corelib/kernel/qobject.cpp
src/corelib/thread/qthread_unix.cpp
src/gui/graphicsview/qgraphicssceneevent.h
src/gui/itemviews/qheaderview.h
src/gui/kernel/qapplication_qws.cpp
src/gui/kernel/qgesture.h
src/gui/kernel/qgesturerecognizer.h
src/gui/painting/qpaintengine_raster.cpp
src/network/access/qhttpnetworkreply.cpp
src/network/access/qnetworkcookie.h
src/network/socket/qnativesocketengine_unix.cpp
Diffstat (limited to 'src/corelib/tools/qringbuffer_p.h')
| -rw-r--r-- | src/corelib/tools/qringbuffer_p.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/corelib/tools/qringbuffer_p.h b/src/corelib/tools/qringbuffer_p.h index 7cfca0e..a0d6943 100644 --- a/src/corelib/tools/qringbuffer_p.h +++ b/src/corelib/tools/qringbuffer_p.h @@ -245,12 +245,7 @@ public: inline void clear() { if(!buffers.isEmpty()) { - QByteArray tmp = buffers[0]; - buffers.clear(); - buffers << tmp; - //TODO merge this optimization ? - //buffers.erase(buffers.begin() + 1, buffers.end()); - //>>>>>>> 08ae7ee1fb930e7d4b4039e2294cba69f9380964:src/corelib/tools/qringbuffer_p.h + buffers.erase(buffers.begin() + 1, buffers.end()); if (buffers.at(0).size() != basicBlockSize) buffers[0].resize(basicBlockSize); } |