diff options
author | Kent Hansen <kent.hansen@nokia.com> | 2012-01-16 12:47:58 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-20 23:35:18 +0100 |
commit | 5d78efa25fd3b720eca536936d45602c8f5b0fa4 (patch) | |
tree | 4922b22cb2198a5eb3b54c71b25a563eca7b73d7 /src/declarative/qml/v8/qjsengine.cpp | |
parent | 1d577f68883bdc41be18d2a09a5bdf0a0611c380 (diff) |
Mark deprecated functions in QJSEngine and QJSValue
This functionality will be removed or renamed in the final Qt 5 API.
From this commit and with deprecated warnings enabled
(DEFINES += QT_DEPRECATED_WARNINGS), it's easy to see how existing
users of this API (e.g. qtjsondb) are affected.
Task-number: QTBUG-23604
Change-Id: I242c43377bb34ddcca84b6ed5b7ef9fbf2017a83
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Diffstat (limited to 'src/declarative/qml/v8/qjsengine.cpp')
-rw-r--r-- | src/declarative/qml/v8/qjsengine.cpp | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/src/declarative/qml/v8/qjsengine.cpp b/src/declarative/qml/v8/qjsengine.cpp index 6bcd3ab134..270d6614f4 100644 --- a/src/declarative/qml/v8/qjsengine.cpp +++ b/src/declarative/qml/v8/qjsengine.cpp @@ -158,6 +158,8 @@ QJSEngine::QJSEngine() { } +#ifdef QT_DEPRECATED + /*! \internal */ @@ -166,6 +168,8 @@ QJSEngine::QJSEngine(QJSEngine::ContextOwnership ownership) { } +#endif // QT_DEPRECATED + /*! Constructs a QJSEngine object with the given \a parent. @@ -198,7 +202,11 @@ QJSEngine::~QJSEngine() \internal */ +#ifdef QT_DEPRECATED + /*! + \obsolete + Returns true if the last script evaluation resulted in an uncaught exception; otherwise returns false. @@ -215,6 +223,8 @@ bool QJSEngine::hasUncaughtException() const } /*! + \obsolete + Returns the current uncaught exception, or an invalid QJSValue if there is no uncaught exception. @@ -233,6 +243,8 @@ QJSValue QJSEngine::uncaughtException() const } /*! + \obsolete + Clears any uncaught exceptions in this engine. \sa hasUncaughtException() @@ -244,6 +256,7 @@ void QJSEngine::clearExceptions() d->clearExceptions(); } +#endif // QT_DEPRECATED /*! Runs the garbage collector. @@ -298,7 +311,11 @@ QJSValue QJSEngine::evaluate(const QString& program, const QString& fileName, in return QJSValuePrivate::get(d->evaluate(program, fileName, lineNumber)); } +#ifdef QT_DEPRECATED + /*! + \obsolete + Returns a QJSValue of the primitive type Null. \sa nullValue() @@ -312,6 +329,8 @@ QJSValue QJSEngine::nullValue() } /*! + \obsolete + Returns a QJSValue of the primitive type Undefined. \sa nullValue() @@ -324,6 +343,8 @@ QJSValue QJSEngine::undefinedValue() return QJSValuePrivate::get(new QJSValuePrivate(d, v8::Undefined())); } +#endif // QT_DEPRECATED + /*! Creates a JavaScript object of class Object. @@ -382,7 +403,11 @@ QJSValue QJSEngine::newQObject(QObject *object) return d->scriptValueFromInternal(d->newQObject(object, QV8Engine::JavaScriptOwnership)); } +#ifdef QT_DEPRECATED + /*! + \obsolete + Creates a JavaScript object holding the given variant \a value. If a default prototype has been registered with the meta type id of @@ -400,6 +425,7 @@ QJSValue QJSEngine::newVariant(const QVariant &value) return d->scriptValueFromInternal(d->newVariant(value)); } +#endif // QT_DEPRECATED /*! Returns this engine's Global Object. @@ -419,7 +445,11 @@ QJSValue QJSEngine::globalObject() const return d->scriptValueFromInternal(d->global()); } +#ifdef QT_DEPRECATED + /*! + \obsolete + Converts the given \a value to an object, if such a conversion is possible; otherwise returns an invalid QJSValue. The conversion is performed according to the following table: @@ -445,6 +475,8 @@ QJSValue QJSEngine::toObject(const QJSValue& value) } /*! + \obsolete + Creates a JavaScript object of class Date from the given \a value. \sa QJSValue::toDateTime() @@ -458,6 +490,8 @@ QJSValue QJSEngine::newDate(const QDateTime &dt) } /*! + \obsolete + Creates a JavaScript object of class Date with the given \a value (the number of milliseconds since 01 January 1970, UTC). @@ -471,6 +505,8 @@ QJSValue QJSEngine::newDate(double date) } /*! + \obsolete + Creates a JavaScript object of class RegExp with the given \a regexp. @@ -485,6 +521,8 @@ QJSValue QJSEngine::newRegExp(const QRegExp ®exp) } /*! + \obsolete + Creates a JavaScript object of class RegExp with the given \a pattern and \a flags. @@ -499,6 +537,8 @@ QJSValue QJSEngine::newRegExp(const QString &pattern, const QString &flags) return QJSValuePrivate::get(d->newRegExp(pattern, flags)); } +#endif // QT_DEPRECATED + /*! * \internal * used by QJSEngine::toScriptValue |