Changeset 846 for trunk/src/script/api/qscriptvalue_p.h

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/script/api/qscriptvalue_p.h (modified) (4 diffs)

trunk/src/script/api/qscriptvalue_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -70 +70 @@
     inline bool isObject() const;
 
-    QVariant &variantValue() const;
-    void setVariantValue(const QVariant &value);
-
     static inline QScriptValuePrivate *get(const QScriptValue &q)
     {
@@ -90 +87 @@
     }
 
-    inline QScriptValue property(const JSC::Identifier &id, int resolveMode) const;
-    QScriptValue propertyHelper(const JSC::Identifier &id, int resolveMode) const;
-    inline QScriptValue property(quint32 index, int resolveMode) const;
-    QScriptValue propertyHelper(quint32, int resolveMode) const;
-    inline QScriptValue property(const QString &, int resolveMode) const;
-    void setProperty(const JSC::Identifier &id, const QScriptValue &value,
-                     const QScriptValue::PropertyFlags &flags);
-    QScriptValue::PropertyFlags propertyFlags(
-        const JSC::Identifier &id, const QScriptValue::ResolveFlags &mode) const;
+    inline JSC::JSValue property(const JSC::Identifier &id,
+                                 const QScriptValue::ResolveFlags &mode = QScriptValue::ResolvePrototype) const;
+    inline JSC::JSValue property(quint32 index, const QScriptValue::ResolveFlags &mode = QScriptValue::ResolvePrototype) const;
+    inline JSC::JSValue property(const JSC::UString &, const QScriptValue::ResolveFlags &mode = QScriptValue::ResolvePrototype) const;
+    inline void setProperty(const JSC::UString &name, const JSC::JSValue &value,
+                            const QScriptValue::PropertyFlags &flags = QScriptValue::KeepExistingFlags);
+    inline void setProperty(const JSC::Identifier &id, const JSC::JSValue &value,
+                            const QScriptValue::PropertyFlags &flags = QScriptValue::KeepExistingFlags);
+    inline void setProperty(quint32 index, const JSC::JSValue &value,
+                            const QScriptValue::PropertyFlags &flags = QScriptValue::KeepExistingFlags);
+    inline QScriptValue::PropertyFlags propertyFlags(
+        const JSC::Identifier &id, const QScriptValue::ResolveFlags &mode = QScriptValue::ResolvePrototype) const;
 
     void detachFromEngine();
@@ -104 +104 @@
     qint64 objectId()
     {
-        if ( (type == JavaScriptCore) && (engine) )
+        if ( (type == JavaScriptCore) && (engine) && jscValue.isCell() )
             return (qint64)jscValue.asCell();
         else
             return -1;
     }
-
-    static inline void saveException(JSC::ExecState*, JSC::JSValue*);
-    static inline void restoreException(JSC::ExecState*, JSC::JSValue);
 
     QScriptEnginePrivate *engine;