diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/corelib/global/qglobal.h | 17 | ||||
-rw-r--r-- | src/corelib/io/qdebug.cpp | 8 | ||||
-rw-r--r-- | src/corelib/io/qdebug.h | 1 | ||||
-rw-r--r-- | src/corelib/io/qtextstream.cpp | 9 | ||||
-rw-r--r-- | src/corelib/io/qtextstream.h | 1 | ||||
-rw-r--r-- | src/corelib/tools/qbytearray.cpp | 6 | ||||
-rw-r--r-- | src/corelib/tools/qbytearray.h | 18 | ||||
-rw-r--r-- | src/corelib/tools/qlist.cpp | 2 | ||||
-rw-r--r-- | src/corelib/tools/qlist.h | 8 | ||||
-rw-r--r-- | src/corelib/tools/qstring.h | 46 | ||||
-rw-r--r-- | src/corelib/tools/qstringlist.cpp | 10 | ||||
-rw-r--r-- | src/corelib/tools/qstringlist.h | 6 | ||||
-rw-r--r-- | src/tools/uic/qclass_lib_map.h | 1 |
13 files changed, 48 insertions, 85 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 2b868df75d..4a606f556e 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -1922,23 +1922,6 @@ public: #endif -class QBool -{ - bool b; - -public: - inline explicit QBool(bool B) : b(B) {} - inline operator const void *() const - { return b ? static_cast<const void *>(this) : static_cast<const void *>(0); } -}; - -inline bool operator==(QBool b1, bool b2) { return !b1 == !b2; } -inline bool operator==(bool b1, QBool b2) { return !b1 == !b2; } -inline bool operator==(QBool b1, QBool b2) { return !b1 == !b2; } -inline bool operator!=(QBool b1, bool b2) { return !b1 != !b2; } -inline bool operator!=(bool b1, QBool b2) { return !b1 != !b2; } -inline bool operator!=(QBool b1, QBool b2) { return !b1 != !b2; } - Q_DECL_CONSTEXPR static inline bool qFuzzyCompare(double p1, double p2) { return (qAbs(p1 - p2) <= 0.000000000001 * qMin(qAbs(p1), qAbs(p2))); diff --git a/src/corelib/io/qdebug.cpp b/src/corelib/io/qdebug.cpp index 8ca15b19ca..18f6d1692d 100644 --- a/src/corelib/io/qdebug.cpp +++ b/src/corelib/io/qdebug.cpp @@ -165,14 +165,6 @@ */ /*! - \fn QDebug &QDebug::operator<<(QBool t) - \internal - - Writes the boolean value, \a t, to the stream and returns a reference to the - stream. -*/ - -/*! \fn QDebug &QDebug::operator<<(bool t) Writes the boolean value, \a t, to the stream and returns a reference to the diff --git a/src/corelib/io/qdebug.h b/src/corelib/io/qdebug.h index 54663d5d65..a86cdb68a8 100644 --- a/src/corelib/io/qdebug.h +++ b/src/corelib/io/qdebug.h @@ -93,7 +93,6 @@ public: inline QDebug &maybeSpace() { if (stream->space) stream->ts << ' '; return *this; } inline QDebug &operator<<(QChar t) { stream->ts << '\'' << t << '\''; return maybeSpace(); } - inline QDebug &operator<<(QBool t) { stream->ts << (bool(t != 0) ? "true" : "false"); return maybeSpace(); } inline QDebug &operator<<(bool t) { stream->ts << (t ? "true" : "false"); return maybeSpace(); } inline QDebug &operator<<(char t) { stream->ts << t; return maybeSpace(); } inline QDebug &operator<<(signed short t) { stream->ts << t; return maybeSpace(); } diff --git a/src/corelib/io/qtextstream.cpp b/src/corelib/io/qtextstream.cpp index 8c7f57fddf..e26a2034dc 100644 --- a/src/corelib/io/qtextstream.cpp +++ b/src/corelib/io/qtextstream.cpp @@ -2324,15 +2324,6 @@ void QTextStreamPrivate::putNumber(qulonglong number, bool negative) } /*! - \internal - \overload -*/ -QTextStream &QTextStream::operator<<(QBool b) -{ - return *this << bool(b); -} - -/*! Writes the character \a c to the stream, then returns a reference to the QTextStream. diff --git a/src/corelib/io/qtextstream.h b/src/corelib/io/qtextstream.h index 0531d4017d..9c3b98d8ac 100644 --- a/src/corelib/io/qtextstream.h +++ b/src/corelib/io/qtextstream.h @@ -175,7 +175,6 @@ public: QTextStream &operator>>(QByteArray &array); QTextStream &operator>>(char *c); - QTextStream &operator<<(QBool b); QTextStream &operator<<(QChar ch); QTextStream &operator<<(char ch); QTextStream &operator<<(signed short i); diff --git a/src/corelib/tools/qbytearray.cpp b/src/corelib/tools/qbytearray.cpp index 8c625c2868..ec68bbbd3e 100644 --- a/src/corelib/tools/qbytearray.cpp +++ b/src/corelib/tools/qbytearray.cpp @@ -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 diff --git a/src/corelib/tools/qbytearray.h b/src/corelib/tools/qbytearray.h index e96997909f..49da83b041 100644 --- a/src/corelib/tools/qbytearray.h +++ b/src/corelib/tools/qbytearray.h @@ -232,9 +232,9 @@ public: int lastIndexOf(const char *c, int from = -1) const; int lastIndexOf(const QByteArray &a, int from = -1) const; - QBool contains(char c) const; - QBool contains(const char *a) const; - QBool contains(const QByteArray &a) const; + bool contains(char c) const; + bool contains(const char *a) const; + bool contains(const QByteArray &a) const; int count(char c) const; int count(const char *a) const; int count(const QByteArray &a) const; @@ -523,10 +523,10 @@ inline void QByteArray::push_front(const char *c) { prepend(c); } inline void QByteArray::push_front(const QByteArray &a) { prepend(a); } -inline QBool QByteArray::contains(const QByteArray &a) const -{ return QBool(indexOf(a) != -1); } -inline QBool QByteArray::contains(char c) const -{ return QBool(indexOf(c) != -1); } +inline bool QByteArray::contains(const QByteArray &a) const +{ return indexOf(a) != -1; } +inline bool QByteArray::contains(char c) const +{ return indexOf(c) != -1; } inline bool operator==(const QByteArray &a1, const QByteArray &a2) { return (a1.size() == a2.size()) && (memcmp(a1.constData(), a2.constData(), a1.size())==0); } inline bool operator==(const QByteArray &a1, const char *a2) @@ -575,8 +575,8 @@ inline const QByteArray operator+(const char *a1, const QByteArray &a2) inline const QByteArray operator+(char a1, const QByteArray &a2) { return QByteArray(&a1, 1) += a2; } #endif // QT_USE_QSTRINGBUILDER -inline QBool QByteArray::contains(const char *c) const -{ return QBool(indexOf(c) != -1); } +inline bool QByteArray::contains(const char *c) const +{ return indexOf(c) != -1; } inline QByteArray &QByteArray::replace(char before, const char *c) { return replace(&before, 1, c, qstrlen(c)); } inline QByteArray &QByteArray::replace(const QByteArray &before, const char *c) diff --git a/src/corelib/tools/qlist.cpp b/src/corelib/tools/qlist.cpp index adc6ee7a4b..4e62b8d0b0 100644 --- a/src/corelib/tools/qlist.cpp +++ b/src/corelib/tools/qlist.cpp @@ -869,7 +869,7 @@ void **QListData::erase(void **xi) \sa indexOf() */ -/*! \fn QBool QList::contains(const T &value) const +/*! \fn bool QList::contains(const T &value) const Returns true if the list contains an occurrence of \a value; otherwise returns false. diff --git a/src/corelib/tools/qlist.h b/src/corelib/tools/qlist.h index d192d31234..194c65a4da 100644 --- a/src/corelib/tools/qlist.h +++ b/src/corelib/tools/qlist.h @@ -170,7 +170,7 @@ public: void swap(int i, int j); int indexOf(const T &t, int from = 0) const; int lastIndexOf(const T &t, int from = -1) const; - QBool contains(const T &t) const; + bool contains(const T &t) const; int count(const T &t) const; class const_iterator; @@ -859,14 +859,14 @@ Q_OUTOFLINE_TEMPLATE int QList<T>::lastIndexOf(const T &t, int from) const } template <typename T> -Q_OUTOFLINE_TEMPLATE QBool QList<T>::contains(const T &t) const +Q_OUTOFLINE_TEMPLATE bool QList<T>::contains(const T &t) const { Node *b = reinterpret_cast<Node *>(p.begin()); Node *i = reinterpret_cast<Node *>(p.end()); while (i-- != b) if (i->t() == t) - return QBool(true); - return QBool(false); + return true; + return false; } template <typename T> 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) diff --git a/src/corelib/tools/qstringlist.cpp b/src/corelib/tools/qstringlist.cpp index 1fca78b03b..f260f65c77 100644 --- a/src/corelib/tools/qstringlist.cpp +++ b/src/corelib/tools/qstringlist.cpp @@ -266,7 +266,7 @@ QStringList QtPrivate::QStringList_filter(const QStringList *that, const QString /*! - \fn QBool QStringList::contains(const QString &str, Qt::CaseSensitivity cs) const + \fn bool QStringList::contains(const QString &str, Qt::CaseSensitivity cs) const Returns true if the list contains the string \a str; otherwise returns false. The search is case insensitive if \a cs is @@ -274,15 +274,15 @@ QStringList QtPrivate::QStringList_filter(const QStringList *that, const QString \sa indexOf(), lastIndexOf(), QString::contains() */ -QBool QtPrivate::QStringList_contains(const QStringList *that, const QString &str, - Qt::CaseSensitivity cs) +bool QtPrivate::QStringList_contains(const QStringList *that, const QString &str, + Qt::CaseSensitivity cs) { for (int i = 0; i < that->size(); ++i) { const QString & string = that->at(i); if (string.length() == str.length() && str.compare(string, cs) == 0) - return QBool(true); + return true; } - return QBool(false); + return false; } #ifndef QT_NO_REGEXP diff --git a/src/corelib/tools/qstringlist.h b/src/corelib/tools/qstringlist.h index 6c32f11096..6a9141c70e 100644 --- a/src/corelib/tools/qstringlist.h +++ b/src/corelib/tools/qstringlist.h @@ -77,7 +77,7 @@ public: inline QString join(const QString &sep) const; inline QStringList filter(const QString &str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; - inline QBool contains(const QString &str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; + inline bool contains(const QString &str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; inline QStringList &replaceInStrings(const QString &before, const QString &after, Qt::CaseSensitivity cs = Qt::CaseSensitive); @@ -114,7 +114,7 @@ namespace QtPrivate { QStringList Q_CORE_EXPORT QStringList_filter(const QStringList *that, const QString &str, Qt::CaseSensitivity cs); - QBool Q_CORE_EXPORT QStringList_contains(const QStringList *that, const QString &str, Qt::CaseSensitivity cs); + bool Q_CORE_EXPORT QStringList_contains(const QStringList *that, const QString &str, Qt::CaseSensitivity cs); void Q_CORE_EXPORT QStringList_replaceInStrings(QStringList *that, const QString &before, const QString &after, Qt::CaseSensitivity cs); @@ -148,7 +148,7 @@ inline QStringList QStringList::filter(const QString &str, Qt::CaseSensitivity c return QtPrivate::QStringList_filter(this, str, cs); } -inline QBool QStringList::contains(const QString &str, Qt::CaseSensitivity cs) const +inline bool QStringList::contains(const QString &str, Qt::CaseSensitivity cs) const { return QtPrivate::QStringList_contains(this, str, cs); } diff --git a/src/tools/uic/qclass_lib_map.h b/src/tools/uic/qclass_lib_map.h index 19664d4d01..9ef0e2fa7d 100644 --- a/src/tools/uic/qclass_lib_map.h +++ b/src/tools/uic/qclass_lib_map.h @@ -54,7 +54,6 @@ QT_CLASS_LIB(QtMsgHandler, QtCore, qglobal.h) QT_CLASS_LIB(QGlobalStatic, QtCore, qglobal.h) QT_CLASS_LIB(QGlobalStatic, QtCore, qglobal.h) QT_CLASS_LIB(QGlobalStaticDeleter, QtCore, qglobal.h) -QT_CLASS_LIB(QBool, QtCore, qglobal.h) QT_CLASS_LIB(QTypeInfo, QtCore, qglobal.h) QT_CLASS_LIB(QTypeInfo, QtCore, qglobal.h) QT_CLASS_LIB(QFlag, QtCore, qglobal.h) |