From 9da9ca0ac783cd9bf2a0a151e1c4a83f0aeeb54d Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Mon, 22 May 2023 14:19:23 +0200 Subject: Remove unused IS_RAW_DATA() macros from q{string,bytearray}.cpp They were made redundant at Qt 6, so now they're just defined and undefined. Don't even do that any more. Change-Id: Ic4a4a4c39c50c9af417ea6c52be5f69a2d4856c6 Reviewed-by: Giuseppe D'Angelo Reviewed-by: Fabian Kosmale Reviewed-by: Thiago Macieira --- src/corelib/text/qbytearray.cpp | 3 --- src/corelib/text/qstring.cpp | 2 -- 2 files changed, 5 deletions(-) (limited to 'src') diff --git a/src/corelib/text/qbytearray.cpp b/src/corelib/text/qbytearray.cpp index 2682344392..4e6cce49c0 100644 --- a/src/corelib/text/qbytearray.cpp +++ b/src/corelib/text/qbytearray.cpp @@ -34,8 +34,6 @@ #include -#define IS_RAW_DATA(d) ((d)->flags() & QArrayData::RawDataType) - QT_BEGIN_NAMESPACE Q_CONSTINIT const char QByteArray::_empty = '\0'; @@ -5145,5 +5143,4 @@ size_t qHash(const QByteArray::FromBase64Result &key, size_t seed) noexcept QT_END_NAMESPACE -#undef IS_RAW_DATA #undef REHASH diff --git a/src/corelib/text/qstring.cpp b/src/corelib/text/qstring.cpp index 46156669cf..b6b6f3c8a1 100644 --- a/src/corelib/text/qstring.cpp +++ b/src/corelib/text/qstring.cpp @@ -66,7 +66,6 @@ #define ULLONG_MAX quint64_C(18446744073709551615) #endif -#define IS_RAW_DATA(d) ((d.d)->flags & QArrayData::RawDataType) #define REHASH(a) \ if (sl_minus_1 < sizeof(std::size_t) * CHAR_BIT) \ hashHaystack -= std::size_t(a) << sl_minus_1; \ @@ -10033,5 +10032,4 @@ void QAbstractConcatenable::appendLatin1To(QLatin1StringView in, QChar *out) noe QT_END_NAMESPACE -#undef IS_RAW_DATA #undef REHASH -- cgit v1.2.3