diff options
Diffstat (limited to 'src/corelib/text/qstring.h')
| -rw-r--r-- | src/corelib/text/qstring.h | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/src/corelib/text/qstring.h b/src/corelib/text/qstring.h index 45578debd6..ba21aba618 100644 --- a/src/corelib/text/qstring.h +++ b/src/corelib/text/qstring.h @@ -928,9 +928,6 @@ private: friend inline bool operator> (QChar, QLatin1String) noexcept; void reallocData(size_t alloc, bool grow = false); -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - void expand(int i); -#endif static int compare_helper(const QChar *data1, qsizetype length1, const QChar *data2, qsizetype length2, Qt::CaseSensitivity cs = Qt::CaseSensitive) noexcept; @@ -1370,21 +1367,6 @@ public: inline QStringRef(const QString *string, int position, int size); inline QStringRef(const QString *string); -#if QT_VERSION < QT_VERSION_CHECK(6,0,0) - // ### Qt 6: remove all of these, the implicit ones are fine - QStringRef(const QStringRef &other) noexcept - :m_string(other.m_string), m_position(other.m_position), m_size(other.m_size) - {} - QStringRef(QStringRef &&other) noexcept : m_string(other.m_string), m_position(other.m_position), m_size(other.m_size) {} - QStringRef &operator=(QStringRef &&other) noexcept { return *this = other; } - QStringRef &operator=(const QStringRef &other) noexcept - { - m_string = other.m_string; m_position = other.m_position; - m_size = other.m_size; return *this; - } - inline ~QStringRef(){} -#endif // Qt < 6.0.0 - inline const QString *string() const { return m_string; } inline int position() const { return m_position; } inline int size() const { return m_size; } |