diff options
author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-08-05 09:38:41 (GMT) |
---|---|---|
committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-08-06 09:06:17 (GMT) |
commit | 4232955aa9498a5e1e4e4b3fb4662222acffe70f (patch) | |
tree | 7c1710aadf6a405c540f537596340581bc491102 /src/script | |
parent | 6f09167b4fde25e04611557549a0d0d0cfd6a6ae (diff) | |
download | Qt-4232955aa9498a5e1e4e4b3fb4662222acffe70f.zip Qt-4232955aa9498a5e1e4e4b3fb4662222acffe70f.tar.gz Qt-4232955aa9498a5e1e4e4b3fb4662222acffe70f.tar.bz2 |
Remove usage of deprecated QScriptValue* function
Tests were untouched.
Regexp used:
git grep -O"sed -i 's/qScriptValueFromQMetaObject *<\([^>]*\)> *(\([^&*\(),]*\))/\\2->scriptValueFromQMetaObject<\\1>()/g'" qScriptValueFromQMetaObject
git grep -O"sed -i 's/qScriptValueFromValue(this, */toScriptValue(/'" qScriptValueFromValue
git grep -O"sed -i 's/qScriptValueFromValue(\([^&*\(),]*\), */\\1->toScriptValue(/'" qScriptValueFromValue
git grep -O"sed -i 's/qScriptValueFromValue(&\([^&*\(),]*\), */\\1.toScriptValue(/'" qScriptValueFromValue
git grep -O"sed -i 's/qScriptValueToValue</qscriptvalue_cast</'" qScriptValueToValue
Rev-by: dev mailing list
Diffstat (limited to 'src/script')
-rw-r--r-- | src/script/api/qscriptengine.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/script/api/qscriptengine.h b/src/script/api/qscriptengine.h index eafd40c..cdf6099 100644 --- a/src/script/api/qscriptengine.h +++ b/src/script/api/qscriptengine.h @@ -212,7 +212,7 @@ public: template <typename T> inline QScriptValue toScriptValue(const T &value) { - return qScriptValueFromValue(this, value); + return toScriptValue(value); } template <typename T> inline T fromScriptValue(const QScriptValue &value) @@ -409,7 +409,7 @@ QScriptValue qScriptValueFromSequence(QScriptEngine *eng, const Container &cont) typename Container::const_iterator it; quint32 i; for (it = begin, i = 0; it != end; ++it, ++i) - a.setProperty(i, qScriptValueFromValue(eng, *it)); + a.setProperty(i, eng->toScriptValue(*it)); return a; } |