diff options
| author | João Abecasis <joao.abecasis@nokia.com> | 2012-02-05 21:25:31 +0100 |
|---|---|---|
| committer | João Abecasis <joao.abecasis@nokia.com> | 2012-02-05 21:26:33 +0100 |
| commit | d065dfd454890c332482a6109ed34a989e50809b (patch) | |
| tree | 0d3e9c5367c1fad7d089d368182374e8d1d46ca1 /src/corelib/tools/qbytearray.cpp | |
| parent | 632840cb0f5ad355d87fc040b015d04af86371ec (diff) | |
| parent | 9f54846d951838361f4188b423e7aa7c7b9a9540 (diff) | |
Merge remote-tracking branch 'gerrit/master' into containers
Conflicts:
src/corelib/tools/qstring.cpp
Change-Id: I23d214bf33c2badfae1876da3cc7d6d8f6e635fb
Diffstat (limited to 'src/corelib/tools/qbytearray.cpp')
| -rw-r--r-- | src/corelib/tools/qbytearray.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/corelib/tools/qbytearray.cpp b/src/corelib/tools/qbytearray.cpp index 4173cf28e2..aa22413d94 100644 --- a/src/corelib/tools/qbytearray.cpp +++ b/src/corelib/tools/qbytearray.cpp @@ -1,8 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the QtCore module of the Qt Toolkit. ** @@ -35,6 +34,7 @@ ** ** ** +** ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -1143,7 +1143,7 @@ QByteArray &QByteArray::operator=(const char *str) \overload */ -/*! \fn QBool QByteArray::contains(const QByteArray &ba) const +/*! \fn bool QByteArray::contains(const QByteArray &ba) const Returns true if the byte array contains an occurrence of the byte array \a ba; otherwise returns false. @@ -1151,7 +1151,7 @@ QByteArray &QByteArray::operator=(const char *str) \sa indexOf(), count() */ -/*! \fn QBool QByteArray::contains(const char *str) const +/*! \fn bool QByteArray::contains(const char *str) const \overload @@ -1159,7 +1159,7 @@ QByteArray &QByteArray::operator=(const char *str) otherwise returns false. */ -/*! \fn QBool QByteArray::contains(char ch) const +/*! \fn bool QByteArray::contains(char ch) const \overload @@ -2660,7 +2660,7 @@ QByteArray QByteArray::right(int len) const QByteArray QByteArray::mid(int pos, int len) const { - if (d == &shared_null.ba || d == &shared_empty.ba || pos >= d->size) + if (d == &shared_null.ba || d == &shared_empty.ba || pos > d->size) return QByteArray(); if (len < 0) len = d->size - pos; |