diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2014-08-06 11:57:31 -0300 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2014-08-08 00:05:03 +0200 |
| commit | 6a237a4e766979ff191818cbdab2c5aa1a6f490b (patch) | |
| tree | ff104c259fba37f1eb2f7d176ad0f5ed3c201f05 /src/corelib/tools/qstring.h | |
| parent | 04ba6fbed900403ef8892820fa93925a8e21f7b1 (diff) | |
Add some missing STL typedefs and functions to QStringRef and QByteArray
These will be needed in some template code that is to come.
Change-Id: I5b93f4320313f7b15a6404de2c98f85485735fda
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Diffstat (limited to 'src/corelib/tools/qstring.h')
| -rw-r--r-- | src/corelib/tools/qstring.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/corelib/tools/qstring.h b/src/corelib/tools/qstring.h index 349588911b..dfb98ffaa2 100644 --- a/src/corelib/tools/qstring.h +++ b/src/corelib/tools/qstring.h @@ -1264,6 +1264,12 @@ class Q_CORE_EXPORT QStringRef { int m_position; int m_size; public: + typedef QString::size_type size_type; + typedef QString::value_type value_type; + typedef QString::const_iterator const_iterator; + typedef QString::const_pointer const_pointer; + typedef QString::const_reference const_reference; + // ### Qt 6: make this constructor constexpr, after the destructor is made trivial inline QStringRef():m_string(0), m_position(0), m_size(0){} inline QStringRef(const QString *string, int position, int size); @@ -1333,6 +1339,10 @@ public: } inline const QChar *data() const { return unicode(); } inline const QChar *constData() const { return unicode(); } + inline const QChar *begin() const { return unicode(); } + inline const QChar *cbegin() const { return unicode(); } + inline const QChar *end() const { return unicode() + size(); } + inline const QChar *cend() const { return unicode() + size(); } #if QT_DEPRECATED_SINCE(5, 0) QT_DEPRECATED QByteArray toAscii() const Q_REQUIRED_RESULT |