Changeset 846 for trunk/src/script/bridge/qscriptdeclarativeclass_p.h
- Timestamp:
- May 5, 2011, 5:36:53 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/vendor/nokia/qt/4.7.2 (added) merged: 845 /branches/vendor/nokia/qt/current merged: 844 /branches/vendor/nokia/qt/4.6.3 removed
- Property svn:mergeinfo changed
-
trunk/src/script/bridge/qscriptdeclarativeclass_p.h
r651 r846 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) … … 48 48 { 49 49 public: 50 #define QT_HAVE_QSCRIPTDECLARATIVECLASS_VALUE 51 class Q_SCRIPT_EXPORT Value 52 { 53 public: 54 Value(); 55 Value(const Value &); 56 57 Value(QScriptContext *, int); 58 Value(QScriptContext *, uint); 59 Value(QScriptContext *, bool); 60 Value(QScriptContext *, double); 61 Value(QScriptContext *, float); 62 Value(QScriptContext *, const QString &); 63 Value(QScriptContext *, const QScriptValue &); 64 Value(QScriptEngine *, int); 65 Value(QScriptEngine *, uint); 66 Value(QScriptEngine *, bool); 67 Value(QScriptEngine *, double); 68 Value(QScriptEngine *, float); 69 Value(QScriptEngine *, const QString &); 70 Value(QScriptEngine *, const QScriptValue &); 71 ~Value(); 72 73 QScriptValue toScriptValue(QScriptEngine *) const; 74 private: 75 char dummy[8]; 76 }; 77 50 78 typedef void* Identifier; 51 79 … … 53 81 54 82 static QScriptValue newObject(QScriptEngine *, QScriptDeclarativeClass *, Object *); 83 static Value newObjectValue(QScriptEngine *, QScriptDeclarativeClass *, Object *); 55 84 static QScriptDeclarativeClass *scriptClass(const QScriptValue &); 56 85 static Object *object(const QScriptValue &); … … 58 87 static QScriptValue function(const QScriptValue &, const Identifier &); 59 88 static QScriptValue property(const QScriptValue &, const Identifier &); 89 static Value functionValue(const QScriptValue &, const Identifier &); 90 static Value propertyValue(const QScriptValue &, const Identifier &); 60 91 61 92 static QScriptValue scopeChainValue(QScriptContext *, int index); 62 93 static QScriptContext *pushCleanContext(QScriptEngine *); 94 95 static QScriptValue newStaticScopeObject( 96 QScriptEngine *, int propertyCount, const QString *names, 97 const QScriptValue *values, const QScriptValue::PropertyFlags *flags); 98 static QScriptValue newStaticScopeObject(QScriptEngine *); 63 99 64 100 class Q_SCRIPT_EXPORT PersistentIdentifier … … 74 110 private: 75 111 friend class QScriptDeclarativeClass; 76 PersistentIdentifier(bool) : identifier(0), d(0) {} 112 PersistentIdentifier(QScriptEnginePrivate *e) : identifier(0), engine(e), d(0) {} 113 QScriptEnginePrivate *engine; 77 114 void *d; 78 115 }; … … 82 119 83 120 QScriptEngine *engine() const; 121 122 bool supportsCall() const; 123 void setSupportsCall(bool); 84 124 85 125 PersistentIdentifier createPersistentIdentifier(const QString &); … … 92 132 QScriptClass::QueryFlags flags); 93 133 94 virtual QScriptValue property(Object *, const Identifier &);134 virtual Value property(Object *, const Identifier &); 95 135 virtual void setProperty(Object *, const Identifier &name, const QScriptValue &); 96 136 virtual QScriptValue::PropertyFlags propertyFlags(Object *, const Identifier &); 137 virtual Value call(Object *, QScriptContext *); 138 virtual bool compare(Object *, Object *); 97 139 98 140 virtual QStringList propertyNames(Object *);
Note:
See TracChangeset
for help on using the changeset viewer.