Changeset 846 for trunk/src/script/bridge/qscriptobject_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/qscriptobject_p.h
r651 r846 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) … … 68 68 JSC::JSValue, JSC::PutPropertySlot&); 69 69 virtual bool deleteProperty(JSC::ExecState*, 70 const JSC::Identifier& propertyName, 71 bool checkDontDelete = true); 72 virtual bool getPropertyAttributes(JSC::ExecState*, const JSC::Identifier&, 73 unsigned&) const; 70 const JSC::Identifier& propertyName); 74 71 virtual void getOwnPropertyNames(JSC::ExecState*, JSC::PropertyNameArray&, 75 bool includeNonEnumerable = false);72 ); 76 73 virtual void markChildren(JSC::MarkStack& markStack); 77 74 virtual JSC::CallType getCallData(JSC::CallData&); … … 85 82 static WTF::PassRefPtr<JSC::Structure> createStructure(JSC::JSValue prototype) 86 83 { 87 return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType, JSC::ImplementsHasInstance | JSC::OverridesHasInstance));84 return JSC::Structure::create(prototype, JSC::TypeInfo(JSC::ObjectType, )); 88 85 } 89 86 … … 95 92 96 93 protected: 94 95 97 96 Data *d; 98 97 }; … … 129 128 JSC::JSValue, JSC::PutPropertySlot&); 130 129 virtual bool deleteProperty(QScriptObject*, JSC::ExecState*, 131 const JSC::Identifier& propertyName, 132 bool checkDontDelete = true); 133 virtual bool getPropertyAttributes(const QScriptObject*, JSC::ExecState*, 134 const JSC::Identifier&, unsigned&) const; 130 const JSC::Identifier& propertyName); 135 131 virtual void getOwnPropertyNames(QScriptObject*, JSC::ExecState*, JSC::PropertyNameArray&, 136 bool includeNonEnumerable = false);132 ); 137 133 virtual void markChildren(QScriptObject*, JSC::MarkStack& markStack); 138 134 virtual JSC::CallType getCallData(QScriptObject*, JSC::CallData&);
Note:
See TracChangeset
for help on using the changeset viewer.