Changeset 846 for trunk/src/script/bridge/qscriptdeclarativeclass_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/bridge/qscriptdeclarativeclass_p.h (modified) (7 diffs)

trunk/src/script/bridge/qscriptdeclarativeclass_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -48 +48 @@
 {
 public:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     typedef void* Identifier;
 
@@ -53 +81 @@
 
     static QScriptValue newObject(QScriptEngine *, QScriptDeclarativeClass *, Object *);
+
     static QScriptDeclarativeClass *scriptClass(const QScriptValue &);
     static Object *object(const QScriptValue &);
@@ -58 +87 @@
     static QScriptValue function(const QScriptValue &, const Identifier &);
     static QScriptValue property(const QScriptValue &, const Identifier &);
+
+
 
     static QScriptValue scopeChainValue(QScriptContext *, int index);
     static QScriptContext *pushCleanContext(QScriptEngine *);
+
+
+
+
+
 
     class Q_SCRIPT_EXPORT PersistentIdentifier 
@@ -74 +110 @@
     private:
         friend class QScriptDeclarativeClass;
-        PersistentIdentifier(bool) : identifier(0), d(0) {}
+        PersistentIdentifier(QScriptEnginePrivate *e) : identifier(0), engine(e), d(0) {}
+        QScriptEnginePrivate *engine;
         void *d;
     };
@@ -82 +119 @@
 
     QScriptEngine *engine() const;
+
+
+
 
     PersistentIdentifier createPersistentIdentifier(const QString &);
@@ -92 +132 @@
                                                    QScriptClass::QueryFlags flags);
 
-    virtual QScriptValue property(Object *, const Identifier &);
+    virtual Value property(Object *, const Identifier &);
     virtual void setProperty(Object *, const Identifier &name, const QScriptValue &);
     virtual QScriptValue::PropertyFlags propertyFlags(Object *, const Identifier &);
+
+
 
     virtual QStringList propertyNames(Object *);