diff options
author | David Faure <faure@kde.org> | 2012-01-20 11:22:09 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-20 14:17:41 +0100 |
commit | 47d5d349d8f5bc590ca7cdf30bf13b69bddf3225 (patch) | |
tree | be75994c1d77e479d562d571ef9cfaf48f9583d9 /src/corelib/tools/qstring.h | |
parent | 841b0c4fac8e8a96ebb2120b704cf7bbf1260543 (diff) |
Remove QBool and use bool instead.
QBool was introduced with Qt-4.0, to detect Qt3-like code like
if (c.contains(d) == 2) and break compilation on such constructs.
This isn't necessary anymore, given that such code couldn't possibly
compile in Qt4 times.
And QBool was confusing developers, and creating compile errors (e.g.
QVariant doesn't have support for it), so better remove it for Qt 5.
Change-Id: I6642f43f5e12b872f98abb56600186179f072b09
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/corelib/tools/qstring.h')
-rw-r--r-- | src/corelib/tools/qstring.h | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/src/corelib/tools/qstring.h b/src/corelib/tools/qstring.h index f2d1de9c00..5be5243029 100644 --- a/src/corelib/tools/qstring.h +++ b/src/corelib/tools/qstring.h @@ -266,9 +266,9 @@ public: int lastIndexOf(const QLatin1String &s, int from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; int lastIndexOf(const QStringRef &s, int from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; - inline QBool contains(QChar c, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; - inline QBool contains(const QString &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; - inline QBool contains(const QStringRef &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; + inline bool contains(QChar c, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; + inline bool contains(const QString &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; + inline bool contains(const QStringRef &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; int count(QChar c, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; int count(const QString &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; int count(const QStringRef &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; @@ -276,12 +276,12 @@ public: #ifndef QT_NO_REGEXP int indexOf(const QRegExp &, int from = 0) const; int lastIndexOf(const QRegExp &, int from = -1) const; - inline QBool contains(const QRegExp &rx) const { return QBool(indexOf(rx) != -1); } + inline bool contains(const QRegExp &rx) const { return indexOf(rx) != -1; } int count(const QRegExp &) const; int indexOf(QRegExp &, int from = 0) const; int lastIndexOf(QRegExp &, int from = -1) const; - inline QBool contains(QRegExp &rx) const { return QBool(indexOf(rx) != -1); } + inline bool contains(QRegExp &rx) const { return indexOf(rx) != -1; } #endif enum SectionFlag { @@ -910,12 +910,12 @@ inline QString::const_iterator QString::end() const { return reinterpret_cast<const QChar*>(d->data() + d->size); } inline QString::const_iterator QString::constEnd() const { return reinterpret_cast<const QChar*>(d->data() + d->size); } -inline QBool QString::contains(const QString &s, Qt::CaseSensitivity cs) const -{ return QBool(indexOf(s, 0, cs) != -1); } -inline QBool QString::contains(const QStringRef &s, Qt::CaseSensitivity cs) const -{ return QBool(indexOf(s, 0, cs) != -1); } -inline QBool QString::contains(QChar c, Qt::CaseSensitivity cs) const -{ return QBool(indexOf(c, 0, cs) != -1); } +inline bool QString::contains(const QString &s, Qt::CaseSensitivity cs) const +{ return indexOf(s, 0, cs) != -1; } +inline bool QString::contains(const QStringRef &s, Qt::CaseSensitivity cs) const +{ return indexOf(s, 0, cs) != -1; } +inline bool QString::contains(QChar c, Qt::CaseSensitivity cs) const +{ return indexOf(c, 0, cs) != -1; } inline bool operator==(QString::Null, QString::Null) { return true; } @@ -1115,10 +1115,10 @@ public: int lastIndexOf(QLatin1String str, int from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; int lastIndexOf(const QStringRef &str, int from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; - inline QBool contains(const QString &str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; - inline QBool contains(QChar ch, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; - inline QBool contains(QLatin1String str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; - inline QBool contains(const QStringRef &str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; + inline bool contains(const QString &str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; + inline bool contains(QChar ch, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; + inline bool contains(QLatin1String str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; + inline bool contains(const QStringRef &str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; int count(const QString &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; int count(QChar c, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; @@ -1258,14 +1258,14 @@ inline int QStringRef::localeAwareCompare(const QStringRef &s1, const QString &s inline int QStringRef::localeAwareCompare(const QStringRef &s1, const QStringRef &s2) { return QString::localeAwareCompare_helper(s1.constData(), s1.length(), s2.constData(), s2.length()); } -inline QBool QStringRef::contains(const QString &s, Qt::CaseSensitivity cs) const -{ return QBool(indexOf(s, 0, cs) != -1); } -inline QBool QStringRef::contains(QLatin1String s, Qt::CaseSensitivity cs) const -{ return QBool(indexOf(s, 0, cs) != -1); } -inline QBool QStringRef::contains(QChar c, Qt::CaseSensitivity cs) const -{ return QBool(indexOf(c, 0, cs) != -1); } -inline QBool QStringRef::contains(const QStringRef &s, Qt::CaseSensitivity cs) const -{ return QBool(indexOf(s, 0, cs) != -1); } +inline bool QStringRef::contains(const QString &s, Qt::CaseSensitivity cs) const +{ return indexOf(s, 0, cs) != -1; } +inline bool QStringRef::contains(QLatin1String s, Qt::CaseSensitivity cs) const +{ return indexOf(s, 0, cs) != -1; } +inline bool QStringRef::contains(QChar c, Qt::CaseSensitivity cs) const +{ return indexOf(c, 0, cs) != -1; } +inline bool QStringRef::contains(const QStringRef &s, Qt::CaseSensitivity cs) const +{ return indexOf(s, 0, cs) != -1; } namespace Qt { #if QT_DEPRECATED_SINCE(5, 0) |