aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/v8/qjsconverter_p.h
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@digia.com>2013-04-17 18:17:30 +0200
committerSimon Hausmann <simon.hausmann@digia.com>2013-04-18 12:43:30 +0200
commit94eee5842aa5a4d4fd43ffe7a4b5613548ef2bb9 (patch)
tree39e58a786ffa97e9f85054a4fffb87c35b063ad5 /src/qml/qml/v8/qjsconverter_p.h
parent67b09aef34ff7997808e04194cdb92273ec76f14 (diff)
Cleanup lots of V8 dependencies in QJS* classes
Implement a good part of QJSValue using V4. Keep the QV8Engine for now (as it is used everywhere), but add an ExecutionEngine pointer to it so other parts can more easily be ported to V4. Remove a lot of other stuff that's not required anymore. Change-Id: Ibe2c9ab10f0ee977e0e3d05a42f526206d7b22b5 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/v8/qjsconverter_p.h')
-rw-r--r--src/qml/qml/v8/qjsconverter_p.h22
1 files changed, 10 insertions, 12 deletions
diff --git a/src/qml/qml/v8/qjsconverter_p.h b/src/qml/qml/v8/qjsconverter_p.h
index 5f6633f580..3522b3885a 100644
--- a/src/qml/qml/v8/qjsconverter_p.h
+++ b/src/qml/qml/v8/qjsconverter_p.h
@@ -65,45 +65,43 @@ QT_BEGIN_NAMESPACE
*/
class QJSConverter {
public:
- static inline quint32 toArrayIndex(const QString& string);
+ static quint32 toArrayIndex(const QString& string);
- static inline QString toString(v8::Handle<v8::String> jsString);
- static inline v8::Local<v8::String> toString(const QString& string);
- static inline QString toString(double value);
+ static QString toString(v8::Handle<v8::String> jsString);
+ static v8::Local<v8::String> toString(const QString& string);
+ static QString toString(double value);
enum {
PropertyAttributeMask = v8::ReadOnly | v8::DontDelete | v8::DontEnum,
};
- // return a mask of v8::PropertyAttribute that may also contains QScriptValue::PropertyGetter or QScriptValue::PropertySetter
- static inline uint toPropertyAttributes(const QFlags<QJSValuePrivate::PropertyFlag>& flags);
// Converts a JS RegExp to a QRegExp.
// The conversion is not 100% exact since ECMA regexp and QRegExp
// have different semantics/flags, but we try to do our best.
- static inline QRegExp toRegExp(v8::Handle<v8::RegExp> jsRegExp);
+ static QRegExp toRegExp(v8::Handle<v8::RegExp> jsRegExp);
// Converts a QRegExp to a JS RegExp.
// The conversion is not 100% exact since ECMA regexp and QRegExp
// have different semantics/flags, but we try to do our best.
- static inline v8::Local<v8::RegExp> toRegExp(const QRegExp &re);
+ static v8::Local<v8::RegExp> toRegExp(const QRegExp &re);
// Converts a QStringList to JS.
// The result is a new Array object with length equal to the length
// of the QStringList, and the elements being the QStringList's
// elements converted to JS Strings.
- static inline v8::Local<v8::Array> toStringList(const QStringList &lst);
+ static v8::Local<v8::Array> toStringList(const QStringList &lst);
// Converts a JS Array object to a QStringList.
// The result is a QStringList with length equal to the length
// of the JS Array, and elements being the JS Array's elements
// converted to QStrings.
- static inline QStringList toStringList(v8::Handle<v8::Array> jsArray);
+ static QStringList toStringList(v8::Handle<v8::Array> jsArray);
// Converts a JS Date to a QDateTime.
- static inline QDateTime toDateTime(v8::Handle<v8::Date> jsDate);
+ static QDateTime toDateTime(v8::Handle<v8::Date> jsDate);
// Converts a QDateTime to a JS Date.
- static inline v8::Local<v8::Value> toDateTime(const QDateTime &dt);
+ static v8::Local<v8::Value> toDateTime(const QDateTime &dt);
};
QT_END_NAMESPACE