From 56c783f14bf906e5b51fbfa68939cbaf70a49146 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Mon, 10 Jun 2019 18:44:54 +0000 Subject: [PATCH] remove QStringBuilder leftovers Signed-off-by: Ivailo Monev --- src/core/tools/qbytearray.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/core/tools/qbytearray.h b/src/core/tools/qbytearray.h index 53ac817b7..c7622f8ea 100644 --- a/src/core/tools/qbytearray.h +++ b/src/core/tools/qbytearray.h @@ -472,7 +472,6 @@ inline bool operator>=(const QByteArray &a1, const char *a2) { return qstrcmp(a1, a2) >= 0; } inline bool operator>=(const char *a1, const QByteArray &a2) { return qstrcmp(a1, a2) >= 0; } -#if !defined(QT_USE_QSTRINGBUILDER) inline const QByteArray operator+(const QByteArray &a1, const QByteArray &a2) { return QByteArray(a1) += a2; } inline const QByteArray operator+(const QByteArray &a1, const char *a2) @@ -483,7 +482,6 @@ inline const QByteArray operator+(const char *a1, const QByteArray &a2) { return QByteArray(a1) += a2; } inline const QByteArray operator+(char a1, const QByteArray &a2) { return QByteArray(&a1, 1) += a2; } -#endif // QT_USE_QSTRINGBUILDER inline bool QByteArray::contains(const char *c) const { return indexOf(c) != -1; } inline QByteArray &QByteArray::replace(char before, const char *c) @@ -531,8 +529,4 @@ QT_END_NAMESPACE QT_END_HEADER -#ifdef QT_USE_QSTRINGBUILDER -#include -#endif - #endif // QBYTEARRAY_H -- 2.11.0