diff options
Diffstat (limited to 'src/corelib/text/qcollator.h')
| -rw-r--r-- | src/corelib/text/qcollator.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/corelib/text/qcollator.h b/src/corelib/text/qcollator.h index 315ce43e9b..9f61cfc22a 100644 --- a/src/corelib/text/qcollator.h +++ b/src/corelib/text/qcollator.h @@ -13,12 +13,14 @@ QT_BEGIN_NAMESPACE class QCollatorPrivate; class QCollatorSortKeyPrivate; +QT_DECLARE_QESDP_SPECIALIZATION_DTOR_WITH_EXPORT(QCollatorSortKeyPrivate, Q_CORE_EXPORT) class Q_CORE_EXPORT QCollatorSortKey { friend class QCollator; public: QCollatorSortKey(const QCollatorSortKey &other); + QCollatorSortKey(QCollatorSortKey &&other) noexcept = default; ~QCollatorSortKey(); QCollatorSortKey &operator=(const QCollatorSortKey &other); QT_MOVE_ASSIGNMENT_OPERATOR_IMPL_VIA_PURE_SWAP(QCollatorSortKey) @@ -65,15 +67,17 @@ public: void setIgnorePunctuation(bool on); bool ignorePunctuation() const; -#if QT_STRINGVIEW_LEVEL < 2 int compare(const QString &s1, const QString &s2) const { return compare(QStringView(s1), QStringView(s2)); } +#if QT_CORE_REMOVED_SINCE(6, 4) && QT_POINTER_SIZE != 4 int compare(const QChar *s1, int len1, const QChar *s2, int len2) const { return compare(QStringView(s1, len1), QStringView(s2, len2)); } +#endif + int compare(const QChar *s1, qsizetype len1, const QChar *s2, qsizetype len2) const + { return compare(QStringView(s1, len1), QStringView(s2, len2)); } bool operator()(const QString &s1, const QString &s2) const { return compare(s1, s2) < 0; } -#endif int compare(QStringView s1, QStringView s2) const; bool operator()(QStringView s1, QStringView s2) const |