diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2020-08-31 14:02:27 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-09-05 02:08:29 +0200 |
| commit | 3d7d8346ddfc6651b5d52556777b7d02b7448a16 (patch) | |
| tree | 9c951f13845e89e62bfea5a8ef9fe980a5e7578f /src/corelib | |
| parent | db61425225013b720a174da4c1766f3ff90d5cb8 (diff) | |
Remove some comments that are no longer relevant
Task-number: QTBUG-85700
Change-Id: I5ce368e8edca2b9483a0f0ef34bc9eb6b4e44574
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/itemmodels/qitemselectionmodel.h | 1 | ||||
| -rw-r--r-- | src/corelib/kernel/qmetatype.h | 1 | ||||
| -rw-r--r-- | src/corelib/text/qstring.cpp | 5 | ||||
| -rw-r--r-- | src/corelib/thread/qexception.cpp | 2 |
4 files changed, 2 insertions, 7 deletions
diff --git a/src/corelib/itemmodels/qitemselectionmodel.h b/src/corelib/itemmodels/qitemselectionmodel.h index cf6b004f7e..8b3560435c 100644 --- a/src/corelib/itemmodels/qitemselectionmodel.h +++ b/src/corelib/itemmodels/qitemselectionmodel.h @@ -168,7 +168,6 @@ public: Q_INVOKABLE QModelIndexList selectedColumns(int row = 0) const; const QItemSelection selection() const; - // ### Qt 6: Merge these two as "QAbstractItemModel *model() const" const QAbstractItemModel *model() const; QAbstractItemModel *model(); diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index 4ad2885bed..5c9c9e1a89 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -76,7 +76,6 @@ template <typename T> inline constexpr int qMetaTypeId(); // F is a tuple: (QMetaType::TypeName, QMetaType::TypeNameID, RealType) -// ### Qt6: reorder the types to match the C++ integral type ranking #define QT_FOR_EACH_STATIC_PRIMITIVE_TYPE(F)\ F(Void, 43, void) \ F(Bool, 1, bool) \ diff --git a/src/corelib/text/qstring.cpp b/src/corelib/text/qstring.cpp index b7344353ec..e00b45f3f2 100644 --- a/src/corelib/text/qstring.cpp +++ b/src/corelib/text/qstring.cpp @@ -6320,7 +6320,6 @@ QString QString::toUpper_helper(QString &str) return QUnicodeTables::convertCase(str, QUnicodeTables::UpperCase); } -// ### Qt 6: Consider whether this function shouldn't be removed See task 202871. /*! \since 5.5 @@ -9763,7 +9762,7 @@ template <typename Haystack, typename Needle> bool qt_starts_with_impl(Haystack haystack, Needle needle, Qt::CaseSensitivity cs) noexcept { if (haystack.isNull()) - return needle.isNull(); // historical behavior, consider changing in ### Qt 6. + return needle.isNull(); const auto haystackLen = haystack.size(); const auto needleLen = needle.size(); if (haystackLen == 0) @@ -9836,7 +9835,7 @@ template <typename Haystack, typename Needle> bool qt_ends_with_impl(Haystack haystack, Needle needle, Qt::CaseSensitivity cs) noexcept { if (haystack.isNull()) - return needle.isNull(); // historical behavior, consider changing in ### Qt 6. + return needle.isNull(); const auto haystackLen = haystack.size(); const auto needleLen = needle.size(); if (haystackLen == 0) diff --git a/src/corelib/thread/qexception.cpp b/src/corelib/thread/qexception.cpp index bc68726e50..1a6ee7bd01 100644 --- a/src/corelib/thread/qexception.cpp +++ b/src/corelib/thread/qexception.cpp @@ -114,7 +114,6 @@ QT_BEGIN_NAMESPACE QException::~QException() noexcept { - // must stay empty until ### Qt 6 } void QException::raise() const @@ -130,7 +129,6 @@ QException *QException::clone() const QUnhandledException::~QUnhandledException() noexcept { - // must stay empty until ### Qt 6 } void QUnhandledException::raise() const |