summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qmlobjectscriptclass_p.h
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-10-02 07:09:09 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-10-05 02:40:47 (GMT)
commit3490b478ed02859f0355438efba900cd853e9c13 (patch)
treef554feca685671aef6775da255150a122597c258 /src/declarative/qml/qmlobjectscriptclass_p.h
parentb3605d7f45c1cdb61bbd2a572e58bd29aaea6956 (diff)
downloadQt-3490b478ed02859f0355438efba900cd853e9c13.zip
Qt-3490b478ed02859f0355438efba900cd853e9c13.tar.gz
Qt-3490b478ed02859f0355438efba900cd853e9c13.tar.bz2
Reenable types/enums and move scripts into an isolated scope
Diffstat (limited to 'src/declarative/qml/qmlobjectscriptclass_p.h')
-rw-r--r--src/declarative/qml/qmlobjectscriptclass_p.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/declarative/qml/qmlobjectscriptclass_p.h b/src/declarative/qml/qmlobjectscriptclass_p.h
index cd67fac..c86abdb 100644
--- a/src/declarative/qml/qmlobjectscriptclass_p.h
+++ b/src/declarative/qml/qmlobjectscriptclass_p.h
@@ -86,13 +86,11 @@ protected:
virtual void destroyed(const Object &);
private:
- uint m_id;
QmlPropertyCache::Data *lastData;
QmlPropertyCache::Data local;
- struct Dummy {};
- PersistentIdentifier<Dummy> *m_destroyId;
- PersistentIdentifier<Dummy> *m_toStringId;
+ PersistentIdentifier m_destroyId;
+ PersistentIdentifier m_toStringId;
QScriptValue m_destroy;
QScriptValue m_toString;