AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove some comments that are no longer relevant

Browse Source 
Task-number: QTBUG-85700
Change-Id: I5ce368e8edca2b9483a0f0ef34bc9eb6b4e44574
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Edward Welbourne 2020-08-31 14:02:27 +02:00
parent db61425225
commit 3d7d8346dd
4 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/corelib/itemmodels/qitemselectionmodel.h
View File

@ -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();

1
src/corelib/kernel/qmetatype.h
View File

@ -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) \

5
src/corelib/text/qstring.cpp
View File

@ -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)

2
src/corelib/thread/qexception.cpp
View File

@ -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