diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2020-08-31 13:27:55 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-09-21 16:54:01 +0200 |
| commit | fc3be403d08ef7d0bb4fb9f46415474e07f09844 (patch) | |
| tree | 54a61269e5407ac5e9be9c7eb141570717e6a562 | |
| parent | ac43986aa5d07685cc61a5dbc00d76abf0cd1017 (diff) | |
Remove some deprecation comments from qmap.h
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>
| -rw-r--r-- | src/corelib/tools/qmap.h | 6 | ||||
| -rw-r--r-- | src/corelib/tools/qmultimap.qdoc | 6 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/corelib/tools/qmap.h b/src/corelib/tools/qmap.h index 2780c46b7d..d09fa361a0 100644 --- a/src/corelib/tools/qmap.h +++ b/src/corelib/tools/qmap.h @@ -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) diff --git a/src/corelib/tools/qmultimap.qdoc b/src/corelib/tools/qmultimap.qdoc index 9db495db1e..01b2f17c73 100644 --- a/src/corelib/tools/qmultimap.qdoc +++ b/src/corelib/tools/qmultimap.qdoc @@ -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() */ |