diff options
Diffstat (limited to 'src/corelib/tools/qset.qdoc')
| -rw-r--r-- | src/corelib/tools/qset.qdoc | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/src/corelib/tools/qset.qdoc b/src/corelib/tools/qset.qdoc index 542def4651..48dcc9eec0 100644 --- a/src/corelib/tools/qset.qdoc +++ b/src/corelib/tools/qset.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -11,8 +11,8 @@ ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. ** ** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free @@ -20,7 +20,7 @@ ** Foundation and appearing in the file included in the packaging of ** this file. Please review the following information to ensure ** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -257,8 +257,8 @@ */ /*! - \fn QSet::iterator QSet::erase(iterator pos) - \since 4.2 + \fn QSet::iterator QSet::erase(const_iterator pos) + \since 5.7 Removes the item at the iterator position \a pos from the set, and returns an iterator positioned at the next item in the set. @@ -270,6 +270,12 @@ \sa remove(), find() */ +/*! + \fn QSet::iterator QSet::erase(iterator pos) + \since 4.2 + \overload +*/ + /*! \fn QSet::const_iterator QSet::find(const T &value) const \since 4.2 |