diff options
| author | Anton Kudryavtsev <antkudr@mail.ru> | 2017-03-17 21:05:54 +0300 |
|---|---|---|
| committer | Anton Kudryavtsev <antkudr@mail.ru> | 2017-03-18 06:51:24 +0000 |
| commit | 949bce97d04f350ee2918b7d0280d2b89e11d4bc (patch) | |
| tree | 80344f35db48b3cca7f7cbb857d38e7434598659 /src | |
| parent | 6cd8a90d29f563ca4b61524c84d4846dae736fdd (diff) | |
QString: de-deplicate code of leftRef, rightRef, midRef
Re-use methods of QStringRef.
Change-Id: I5ff719c08c54246e9cafd4f9aa0823ff6df8433b
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/tools/qstring.cpp | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp index 50893536af..48f3d64c4a 100644 --- a/src/corelib/tools/qstring.cpp +++ b/src/corelib/tools/qstring.cpp @@ -9621,9 +9621,7 @@ QStringRef QStringRef::left(int n) const */ QStringRef QString::leftRef(int n) const { - if (uint(n) >= uint(d->size)) - n = d->size; - return QStringRef(this, 0, n); + return QStringRef(this).left(n); } /*! @@ -9660,9 +9658,7 @@ QStringRef QStringRef::right(int n) const */ QStringRef QString::rightRef(int n) const { - if (uint(n) >= uint(d->size)) - n = d->size; - return QStringRef(this, d->size - n, n); + return QStringRef(this).right(n); } /*! @@ -9721,19 +9717,7 @@ QStringRef QStringRef::mid(int pos, int n) const */ QStringRef QString::midRef(int position, int n) const { - using namespace QtPrivate; - switch (QContainerImplHelper::mid(d->size, &position, &n)) { - case QContainerImplHelper::Null: - return QStringRef(); - case QContainerImplHelper::Empty: - return QStringRef(this, 0, 0); - case QContainerImplHelper::Full: - return QStringRef(this, 0, d->size); - case QContainerImplHelper::Subset: - return QStringRef(this, position, n); - } - Q_UNREACHABLE(); - return QStringRef(); + return QStringRef(this).mid(position, n); } /*! |