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

Remove some deprecation comments from qmap.h

Browse Source 
Lars says documenting that the methods are slow is sufficient, no need
to deprecate them.

Task-number: QTBUG-85700
Change-Id: I7b1d19e91e30205df7d8198e3704cecc72a853e0
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Edward Welbourne 2020-08-31 13:27:55 +02:00
parent ac43986aa5
commit fc3be403d0
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/corelib/tools/qmap.h
View File

@ -355,8 +355,6 @@ public:
return i != d->m.end();
}
// ### Qt 6: deprecate value->key lookup.
//Q_DECL_DEPRECATED_X("This function is inefficient; don't use it")
Key key(const T &value, const Key &defaultKey = Key()) const
{
if (!d)
@ -390,7 +388,6 @@ public:
return value(key);
}
// ### Qt 6: this stuff should be deprecated as well
QList<Key> keys() const
{
if (!d)
@ -965,8 +962,6 @@ public:
return find(key, value) != end();
}
// ### Qt 6: deprecate value->key lookup.
//Q_DECL_DEPRECATED_X("This function is inefficient; don't use it")
Key key(const T &value, const Key &defaultKey = Key()) const
{
if (!d)
@ -985,7 +980,6 @@ public:
return defaultValue;
}
// ### Qt 6: deprecate value->key lookup.
QList<Key> keys() const
{
if (!d)

6
src/corelib/tools/qmultimap.qdoc
View File

@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2020 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
** Copyright (C) 2016 The Qt Company Ltd.
** Copyright (C) 2020 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the QtCore module of the Qt Toolkit.
@ -422,6 +422,10 @@
The order is guaranteed to be the same as that used by values().
This function creates a new list, in \l {linear time}. The time and memory
use that entails can be avoided by iterating from \l keyBegin() to
\l keyEnd().
\sa values(), key()
*/