diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-07-19 13:53:50 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-20 02:18:18 +0200 |
| commit | 122fa138f3c01b7c4f745aaafa526d1bcdc38bbb (patch) | |
| tree | 289da1338b98cc9ecfab846e43e0f13baf911955 /src/corelib/json/qjsonobject.cpp | |
| parent | 917ef5787444403ce0f7f035e27b1740c7672e34 (diff) | |
Fixed most qdoc errors for the json classes.
Change-Id: Ibbbdd7212f6c5e25422bbaa9ccaf4822db52222a
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Reviewed-by: Richard J. Moore <rich@kde.org>
Diffstat (limited to 'src/corelib/json/qjsonobject.cpp')
| -rw-r--r-- | src/corelib/json/qjsonobject.cpp | 45 |
1 files changed, 34 insertions, 11 deletions
diff --git a/src/corelib/json/qjsonobject.cpp b/src/corelib/json/qjsonobject.cpp index 8801e9c96dc..c60b2215c73 100644 --- a/src/corelib/json/qjsonobject.cpp +++ b/src/corelib/json/qjsonobject.cpp @@ -72,6 +72,37 @@ QT_BEGIN_NAMESPACE */ /*! + \typedef QJsonObject::Iterator + + Qt-style synonym for QJsonObject::iterator. +*/ + +/*! + \typedef QJsonObject::ConstIterator + + Qt-style synonym for QJsonObject::const_iterator. +*/ + +/*! + \typedef QJsonObject::key_type + + Typedef for QString. Provided for STL compatibility. +*/ + +/*! + \typedef QJsonObject::mapped_type + + Typedef for QJsonValue. Provided for STL compatibility. +*/ + +/*! + \typedef QJsonObject::size_type + + Typedef for int. Provided for STL compatibility. +*/ + + +/*! Constructs an empty JSON object \sa isEmpty() @@ -754,7 +785,7 @@ QJsonObject::const_iterator QJsonObject::constFind(const QString &key) const Multiple iterators can be used on the same object. Existing iterators will however become dangling if the object gets modified. - \sa QJsonObject::iterator, QJsonObjectIterator + \sa QJsonObject::iterator */ /*! \typedef QJsonObject::const_iterator::difference_type @@ -818,6 +849,7 @@ QJsonObject::const_iterator QJsonObject::constFind(const QString &key) const */ /*! \fn bool QJsonObject::const_iterator::operator==(const const_iterator &other) const + \fn bool QJsonObject::const_iterator::operator==(const iterator &other) const Returns \c true if \a other points to the same item as this iterator; otherwise returns \c false. @@ -826,6 +858,7 @@ QJsonObject::const_iterator QJsonObject::constFind(const QString &key) const */ /*! \fn bool QJsonObject::const_iterator::operator!=(const const_iterator &other) const + \fn bool QJsonObject::const_iterator::operator!=(const iterator &other) const Returns \c true if \a other points to a different item than this iterator; otherwise returns \c false. @@ -983,16 +1016,6 @@ void QJsonObject::setValueAt(int i, const QJsonValue &val) insert(e->key(), val); } -/*! \typedef QJsonObject::Iterator - - Qt-style synonym for QJsonObject::iterator. -*/ - -/*! \typedef QJsonObject::ConstIterator - - Qt-style synonym for QJsonObject::const_iterator. -*/ - #ifndef QT_NO_DEBUG_STREAM QDebug operator<<(QDebug dbg, const QJsonObject &o) { |