From 95d83cb1b68cc4a415d5d80859b4e74472ad7112 Mon Sep 17 00:00:00 2001 From: Casper van Donderen Date: Thu, 1 Mar 2012 15:28:31 +0100 Subject: Remove the usage of deprecated qdoc macros. QDoc now has support for Doxygen style commands for italics, bold and list items. This change applies that change in QDoc to the actual documentation. Task-number: QTBUG-24578 Change-Id: I519bf9c29b14092e3ab6067612f42bf749eeedf5 Reviewed-by: Shane Kearns Reviewed-by: Lars Knoll --- src/corelib/json/qjsonarray.cpp | 4 ++-- src/corelib/json/qjsonobject.cpp | 4 ++-- src/corelib/json/qjsonvalue.cpp | 32 ++++++++++++++++---------------- 3 files changed, 20 insertions(+), 20 deletions(-) (limited to 'src/corelib/json') diff --git a/src/corelib/json/qjsonarray.cpp b/src/corelib/json/qjsonarray.cpp index 0eb1974147..cdf9192b27 100644 --- a/src/corelib/json/qjsonarray.cpp +++ b/src/corelib/json/qjsonarray.cpp @@ -559,7 +559,7 @@ bool QJsonArray::operator!=(const QJsonArray &other) const /*! \typedef QJsonArray::iterator::iterator_category - A synonym for \i {std::random_access_iterator_tag} indicating + A synonym for \e {std::random_access_iterator_tag} indicating this iterator is a random access iterator. */ @@ -793,7 +793,7 @@ bool QJsonArray::operator!=(const QJsonArray &other) const /*! \typedef QJsonArray::const_iterator::iterator_category - A synonym for \i {std::random_access_iterator_tag} indicating + A synonym for \e {std::random_access_iterator_tag} indicating this iterator is a random access iterator. */ diff --git a/src/corelib/json/qjsonobject.cpp b/src/corelib/json/qjsonobject.cpp index b7af8c22cf..a854f73c7e 100644 --- a/src/corelib/json/qjsonobject.cpp +++ b/src/corelib/json/qjsonobject.cpp @@ -568,7 +568,7 @@ QJsonObject::const_iterator QJsonObject::constFind(const QString &key) const /*! \typedef QJsonObject::iterator::iterator_category - A synonym for \i {std::bidirectional_iterator_tag} indicating + A synonym for \e {std::bidirectional_iterator_tag} indicating this iterator is a bidirectional iterator. */ @@ -757,7 +757,7 @@ QJsonObject::const_iterator QJsonObject::constFind(const QString &key) const /*! \typedef QJsonObject::const_iterator::iterator_category - A synonym for \i {std::bidirectional_iterator_tag} indicating + A synonym for \e {std::bidirectional_iterator_tag} indicating this iterator is a bidirectional iterator. */ diff --git a/src/corelib/json/qjsonvalue.cpp b/src/corelib/json/qjsonvalue.cpp index 603cba8897..b4a689da60 100644 --- a/src/corelib/json/qjsonvalue.cpp +++ b/src/corelib/json/qjsonvalue.cpp @@ -64,12 +64,12 @@ QT_BEGIN_NAMESPACE JSON is a format to store structured data. It has 6 basic data types: \list - \o bool QJsonValue::Bool - \o double QJsonValue::Double - \o string QJsonValue::String - \o array QJsonValue::Array - \o object QJsonValue::Object - \o null QJsonValue::Null + \li bool QJsonValue::Bool + \li double QJsonValue::Double + \li string QJsonValue::String + \li array QJsonValue::Array + \li object QJsonValue::Object + \li null QJsonValue::Null \endlist A value can represent any of the above data types. In addition, QJsonValue has one special @@ -260,16 +260,16 @@ QJsonValue &QJsonValue::operator =(const QJsonValue &other) The conversion will convert QVariant types as follows: \list - \o QVariant::Bool to Bool - \o QVariant::Int - \o QVariant::Double - \o QVariant::LongLong - \o QVariant::ULongLong - \o QVariant::UInt to Double - \o QVariant::String to String - \o QVariant::StringList - \o QVariant::VariantList to Array - \o QVariant::VariantMap to Object + \li QVariant::Bool to Bool + \li QVariant::Int + \li QVariant::Double + \li QVariant::LongLong + \li QVariant::ULongLong + \li QVariant::UInt to Double + \li QVariant::String to String + \li QVariant::StringList + \li QVariant::VariantList to Array + \li QVariant::VariantMap to Object \endlist For all other QVariant types a conversion to a QString will be attempted. If the returned string -- cgit v1.2.3