diff options
author | Casper van Donderen <casper.vandonderen@nokia.com> | 2012-03-01 19:11:09 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-06 00:46:34 +0100 |
commit | ffd7231dbec0a96dd34a02a056b86aae1992cdbf (patch) | |
tree | 61fec5ad5fba6df290eb67d645756b6ec91c0cf5 /src/script | |
parent | c81c78c0cf6eff2f65cfaed655ec5ac7531bb75d (diff) | |
download | qtscript-ffd7231dbec0a96dd34a02a056b86aae1992cdbf.tar.gz |
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: I7733d18ce1e3459ef618802060d176c9211d3d5f
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Diffstat (limited to 'src/script')
-rw-r--r-- | src/script/api/qscriptclass.cpp | 2 | ||||
-rw-r--r-- | src/script/api/qscriptengine.cpp | 30 | ||||
-rw-r--r-- | src/script/api/qscriptvalue.cpp | 38 |
3 files changed, 35 insertions, 35 deletions
diff --git a/src/script/api/qscriptclass.cpp b/src/script/api/qscriptclass.cpp index 80abb83..68de186 100644 --- a/src/script/api/qscriptclass.cpp +++ b/src/script/api/qscriptclass.cpp @@ -56,7 +56,7 @@ Reimplement queryProperty() to specify which properties are handled in a custom way by your script class (i.e. should be - \bold{delegated} to the QScriptClass), and which properties should + \b{delegated} to the QScriptClass), and which properties should be handled just like normal Qt Script object properties. Reimplement property() and setProperty() to perform the actual diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp index c0b19f3..2934aa6 100644 --- a/src/script/api/qscriptengine.cpp +++ b/src/script/api/qscriptengine.cpp @@ -130,7 +130,7 @@ QT_BEGIN_NAMESPACE \section1 Engine Configuration - The globalObject() function returns the \bold {Global Object} + The globalObject() function returns the \b {Global Object} associated with the script engine. Properties of the Global Object are accessible from any script code (i.e. they are global variables). Typically, before evaluating "user" scripts, you will @@ -3473,13 +3473,13 @@ void QScriptEngine::registerCustomType(int type, MarshalFunction mf, functions is described in the following table: \table - \header \o Script Function \o Corresponding C++ Function - \row \o qsTr() \o QObject::tr() - \row \o QT_TR_NOOP() \o QT_TR_NOOP() - \row \o qsTranslate() \o QCoreApplication::translate() - \row \o QT_TRANSLATE_NOOP() \o QT_TRANSLATE_NOOP() - \row \o qsTrId() (since 4.7) \o qtTrId() - \row \o QT_TRID_NOOP() (since 4.7) \o QT_TRID_NOOP() + \header \li Script Function \li Corresponding C++ Function + \row \li qsTr() \li QObject::tr() + \row \li QT_TR_NOOP() \li QT_TR_NOOP() + \row \li qsTranslate() \li QCoreApplication::translate() + \row \li QT_TRANSLATE_NOOP() \li QT_TRANSLATE_NOOP() + \row \li qsTrId() (since 4.7) \li qtTrId() + \row \li QT_TRID_NOOP() (since 4.7) \li QT_TRID_NOOP() \endtable \sa {Internationalization with Qt} @@ -4287,13 +4287,13 @@ QScriptString QScriptEngine::toStringHandle(const QString &str) is performed according to the following table: \table - \header \o Input Type \o Result - \row \o Undefined \o An invalid QScriptValue. - \row \o Null \o An invalid QScriptValue. - \row \o Boolean \o A new Boolean object whose internal value is set to the value of the boolean. - \row \o Number \o A new Number object whose internal value is set to the value of the number. - \row \o String \o A new String object whose internal value is set to the value of the string. - \row \o Object \o The result is the object itself (no conversion). + \header \li Input Type \li Result + \row \li Undefined \li An invalid QScriptValue. + \row \li Null \li An invalid QScriptValue. + \row \li Boolean \li A new Boolean object whose internal value is set to the value of the boolean. + \row \li Number \li A new Number object whose internal value is set to the value of the number. + \row \li String \li A new String object whose internal value is set to the value of the string. + \row \li Object \li The result is the object itself (no conversion). \endtable \sa newObject() diff --git a/src/script/api/qscriptvalue.cpp b/src/script/api/qscriptvalue.cpp index 7f460da..d73405e 100644 --- a/src/script/api/qscriptvalue.cpp +++ b/src/script/api/qscriptvalue.cpp @@ -881,13 +881,13 @@ bool QScriptValue::equals(const QScriptValue &other) const the result depends on the type, as shown in the following table: \table - \header \o Type \o Result - \row \o Undefined \o true - \row \o Null \o true - \row \o Boolean \o true if both values are true, false otherwise - \row \o Number \o false if either value is NaN (Not-a-Number); true if values are equal, false otherwise - \row \o String \o true if both values are exactly the same sequence of characters, false otherwise - \row \o Object \o true if both values refer to the same object, false otherwise + \header \li Type \li Result + \row \li Undefined \li true + \row \li Null \li true + \row \li Boolean \li true if both values are true, false otherwise + \row \li Number \li false if either value is NaN (Not-a-Number); true if values are equal, false otherwise + \row \li String \li true if both values are exactly the same sequence of characters, false otherwise + \row \li Object \li true if both values refer to the same object, false otherwise \endtable \sa equals() @@ -1204,18 +1204,18 @@ qsreal QScriptValue::toInteger() const The conversion is performed according to the following table: \table - \header \o Input Type \o Result - \row \o Undefined \o An invalid QVariant. - \row \o Null \o An invalid QVariant. - \row \o Boolean \o A QVariant containing the value of the boolean. - \row \o Number \o A QVariant containing the value of the number. - \row \o String \o A QVariant containing the value of the string. - \row \o QVariant Object \o The result is the QVariant value of the object (no conversion). - \row \o QObject Object \o A QVariant containing a pointer to the QObject. - \row \o Date Object \o A QVariant containing the date value (toDateTime()). - \row \o RegExp Object \o A QVariant containing the regular expression value (toRegExp()). - \row \o Array Object \o The array is converted to a QVariantList. Each element is converted to a QVariant, recursively; cyclic references are not followed. - \row \o Object \o The object is converted to a QVariantMap. Each property is converted to a QVariant, recursively; cyclic references are not followed. + \header \li Input Type \li Result + \row \li Undefined \li An invalid QVariant. + \row \li Null \li An invalid QVariant. + \row \li Boolean \li A QVariant containing the value of the boolean. + \row \li Number \li A QVariant containing the value of the number. + \row \li String \li A QVariant containing the value of the string. + \row \li QVariant Object \li The result is the QVariant value of the object (no conversion). + \row \li QObject Object \li A QVariant containing a pointer to the QObject. + \row \li Date Object \li A QVariant containing the date value (toDateTime()). + \row \li RegExp Object \li A QVariant containing the regular expression value (toRegExp()). + \row \li Array Object \li The array is converted to a QVariantList. Each element is converted to a QVariant, recursively; cyclic references are not followed. + \row \li Object \li The object is converted to a QVariantMap. Each property is converted to a QVariant, recursively; cyclic references are not followed. \endtable \sa isVariant() |