diff options
| author | Jędrzej Nowacki <jedrzej.nowacki@digia.com> | 2014-02-14 16:32:31 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-16 09:51:38 +0200 |
| commit | 71fb3633e8d909e9a91e1bee6eaf53c146f25998 (patch) | |
| tree | 93995d7c6965b3cc944ed461dfcb4c5bbf5ac6f1 /src/corelib/tools/qarraydata.h | |
| parent | 8f3a393e412fccd6606af5ef8d909da6435e16e2 (diff) | |
Unify all mid() functions in QtBase.
Up to now, Qt had at least 3 different implementations of the mid().
Only QString::mid implementation was not crashing on edge cases and
was protected against overflows, therefore I picked that one as the
base implementation, even if it has weird semantics for an invalid
input.
As a side effect QVector::mid was slightly optimized to not detach in
all cases (which follows current QList behavior). Documentation of
QVector::mid and QList::mid was updated to not mention "copy of data"
which could suggest that the mid() result is detached.
QStringRef::mid was fixed and now it follows general Qt behavior, by
returning a null value for a null input.
Change-Id: Ie9ff5d98372bd193d66508e6dd92b6ed1180ad9b
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/tools/qarraydata.h')
| -rw-r--r-- | src/corelib/tools/qarraydata.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/corelib/tools/qarraydata.h b/src/corelib/tools/qarraydata.h index 5a8c46b582..90503786e4 100644 --- a/src/corelib/tools/qarraydata.h +++ b/src/corelib/tools/qarraydata.h @@ -361,6 +361,14 @@ namespace QtPrivate { QT_PREPEND_NAMESPACE(QtPrivate::qMakeArrayLiteral)<Type>( Array ) #endif // !defined(Q_ARRAY_LITERAL) +namespace QtPrivate { +struct Q_CORE_EXPORT QContainerImplHelper +{ + enum CutResult { Null, Empty, Full, Subset }; + static CutResult mid(int originalLength, int *position, int *length); +}; +} + QT_END_NAMESPACE #endif // include guard |