Prototype a QScriptDeclarativeClass that fits better with qml

6 files changed, 652 insertions, 3 deletions

diff --git a/src/script/bridge/bridge.pri b/src/script/bridge/bridge.pri
index 666a07e..09e2dfb 100644
--- a/src/script/bridge/bridge.pri
+++ b/src/script/bridge/bridge.pri
@@ -5,7 +5,9 @@ SOURCES += \
     $$PWD/qscriptvariant.cpp \
     $$PWD/qscriptqobject.cpp \
     $$PWD/qscriptglobalobject.cpp \
-    $$PWD/qscriptactivationobject.cpp
+    $$PWD/qscriptactivationobject.cpp \
+    $$PWD/qscriptdeclarativeobject.cpp \
+    $$PWD/qscriptdeclarativeclass.cpp 
 
 HEADERS += \
     $$PWD/qscriptfunction_p.h \
@@ -14,4 +16,6 @@ HEADERS += \
     $$PWD/qscriptvariant_p.h \
     $$PWD/qscriptqobject_p.h \
     $$PWD/qscriptglobalobject_p.h \
-    $$PWD/qscriptactivationobject_p.h
+    $$PWD/qscriptactivationobject_p.h \
+    $$PWD/qscriptdeclarativeobject_p.h \
+    $$PWD/qscriptdeclarativeclass_p.h
diff --git a/src/script/bridge/qscriptdeclarativeclass.cpp b/src/script/bridge/qscriptdeclarativeclass.cpp
new file mode 100644
index 0000000..47b693f
--- /dev/null
+++ b/src/script/bridge/qscriptdeclarativeclass.cpp
@@ -0,0 +1,221 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtScript module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qscriptdeclarativeclass_p.h"
+#include "qscriptdeclarativeobject_p.h"
+#include "qscriptobject_p.h"
+#include <QtScript/qscriptstring.h>
+#include <QtScript/qscriptengine.h>
+#include <private/qscriptengine_p.h>
+#include <private/qscriptvalue_p.h>
+#include <QtCore/qstringlist.h>
+
+QT_BEGIN_NAMESPACE
+
+class QScriptDeclarativeClassPrivate
+{
+public:
+    QScriptDeclarativeClassPrivate() {}
+
+    QScriptEngine *engine;
+    QScriptDeclarativeClass *q_ptr;
+};
+
+void QScriptDeclarativeClass::destroyPersistentIdentifier(void **d)
+{
+    ((JSC::Identifier *)d)->JSC::Identifier::~Identifier();
+}
+
+void QScriptDeclarativeClass::initPersistentIdentifier(void **d, Identifier *i, const QString &str)
+{
+    QScriptEnginePrivate *p = 
+        static_cast<QScriptEnginePrivate *>(QObjectPrivate::get(d_ptr->engine)); 
+    JSC::ExecState* exec = p->currentFrame;
+
+    new (*d) JSC::Identifier(exec, (UChar *)str.constData(), str.size());
+    *i = (Identifier)((JSC::Identifier *)*d)->ustring().rep();
+}
+
+void QScriptDeclarativeClass::initPersistentIdentifier(void **d, Identifier *i, const Identifier &id)
+{
+    QScriptEnginePrivate *p = 
+        static_cast<QScriptEnginePrivate *>(QObjectPrivate::get(d_ptr->engine)); 
+    JSC::ExecState* exec = p->currentFrame;
+
+    new (*d) JSC::Identifier(exec, (JSC::UString::Rep *)id);
+    *i = id;
+}
+
+QScriptDeclarativeClass::QScriptDeclarativeClass(QScriptEngine *engine)
+: d_ptr(new QScriptDeclarativeClassPrivate)
+{
+    Q_ASSERT(sizeof(void*) == sizeof(JSC::Identifier));
+    d_ptr->q_ptr = this;
+    d_ptr->engine = engine;
+}
+
+QScriptValue QScriptDeclarativeClass::newObject(QScriptEngine *engine, 
+                                                QScriptDeclarativeClass *scriptClass, 
+                                                Object object)
+{
+    Q_ASSERT(engine);
+    Q_ASSERT(scriptClass);
+
+    QScriptEnginePrivate *p = static_cast<QScriptEnginePrivate *>(QObjectPrivate::get(engine)); 
+
+    JSC::ExecState* exec = p->currentFrame;
+    QScriptObject *result = new (exec) QScriptObject(p->scriptObjectStructure);
+    result->setDelegate(new QScript::DeclarativeObjectDelegate(scriptClass, object));
+    return p->scriptValueFromJSCValue(result);
+}
+
+QScriptDeclarativeClass *QScriptDeclarativeClass::scriptClass(const QScriptValue &v)
+{
+    QScriptValuePrivate *d = QScriptValuePrivate::get(v);
+    if (!d || !d->isJSC() || !d->jscValue.isObject(&QScriptObject::info))
+        return 0;
+    QScriptObject *scriptObject = static_cast<QScriptObject*>(JSC::asObject(d->jscValue));
+    QScriptObjectDelegate *delegate = scriptObject->delegate();
+    if (!delegate || (delegate->type() != QScriptObjectDelegate::DeclarativeClassObject))
+        return 0;
+    return static_cast<QScript::DeclarativeObjectDelegate*>(delegate)->scriptClass();
+}
+
+QScriptDeclarativeClass::Object QScriptDeclarativeClass::object(const QScriptValue &v)
+{
+    QScriptValuePrivate *d = QScriptValuePrivate::get(v);
+    if (!d || !d->isJSC() || !d->jscValue.isObject(&QScriptObject::info))
+        return 0;
+    QScriptObject *scriptObject = static_cast<QScriptObject*>(JSC::asObject(d->jscValue));
+    QScriptObjectDelegate *delegate = scriptObject->delegate();
+    if (!delegate || (delegate->type() != QScriptObjectDelegate::DeclarativeClassObject))
+        return 0;
+    return static_cast<QScript::DeclarativeObjectDelegate*>(delegate)->object();
+}
+
+QScriptDeclarativeClass::~QScriptDeclarativeClass()
+{
+}
+
+QScriptEngine *QScriptDeclarativeClass::engine() const
+{
+    return d_ptr->engine;
+}
+
+/*
+QScriptDeclarativeClass::PersistentIdentifier *
+QScriptDeclarativeClass::createPersistentIdentifier(const QString &str)
+{
+    QScriptEnginePrivate *p = 
+        static_cast<QScriptEnginePrivate *>(QObjectPrivate::get(d_ptr->engine)); 
+    JSC::ExecState* exec = p->currentFrame;
+
+    PersistentIdentifierPrivate *rv = new PersistentIdentifierPrivate;
+    rv->identifierValue = JSC::Identifier(exec, (UChar *)str.constData(), str.size());
+    rv->identifier = (void *)rv->identifierValue.ustring().rep();
+    return rv;
+}
+
+QScriptDeclarativeClass::PersistentIdentifier *
+QScriptDeclarativeClass::createPersistentIdentifier(const Identifier &id)
+{
+    QScriptEnginePrivate *p = 
+        static_cast<QScriptEnginePrivate *>(QObjectPrivate::get(d_ptr->engine)); 
+    JSC::ExecState* exec = p->currentFrame;
+
+    PersistentIdentifierPrivate *rv = new PersistentIdentifierPrivate;
+    rv->identifierValue = JSC::Identifier(exec, (JSC::UString::Rep *)id);
+    rv->identifier = (void *)rv->identifierValue.ustring().rep();
+    return rv;
+}
+*/
+
+
+QString QScriptDeclarativeClass::toString(const Identifier &identifier)
+{
+    JSC::UString::Rep *r = (JSC::UString::Rep *)identifier;
+    return QString((QChar *)r->data(), r->size());
+}
+
+QScriptClass::QueryFlags 
+QScriptDeclarativeClass::queryProperty(const Object &object, const Identifier &name, 
+                                       QScriptClass::QueryFlags flags)
+{
+    Q_UNUSED(object);
+    Q_UNUSED(name);
+    Q_UNUSED(flags);
+    return 0;
+}
+
+QScriptValue QScriptDeclarativeClass::property(const Object &object, const Identifier &name)
+{
+    Q_UNUSED(object);
+    Q_UNUSED(name);
+    return QScriptValue();
+}
+
+void QScriptDeclarativeClass::setProperty(const Object &object, const Identifier &name, 
+                                          const QScriptValue &value)
+{
+    Q_UNUSED(object);
+    Q_UNUSED(name);
+    Q_UNUSED(value);
+}
+
+QScriptValue::PropertyFlags 
+QScriptDeclarativeClass::propertyFlags(const Object &object, const Identifier &name)
+{
+    Q_UNUSED(object);
+    Q_UNUSED(name);
+    return 0;
+}
+
+QStringList QScriptDeclarativeClass::propertyNames(const Object &object)
+{
+    Q_UNUSED(object);
+    return QStringList();
+}
+
+void QScriptDeclarativeClass::destroyed(const Object &object)
+{
+    Q_UNUSED(object);
+}
+
diff --git a/src/script/bridge/qscriptdeclarativeclass_p.h b/src/script/bridge/qscriptdeclarativeclass_p.h
new file mode 100644
index 0000000..5705a51
--- /dev/null
+++ b/src/script/bridge/qscriptdeclarativeclass_p.h
@@ -0,0 +1,127 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtScript module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QSCRIPTDECLARATIVECLASS_P_H
+#define QSCRIPTDECLARATIVECLASS_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtCore/qobjectdefs.h>
+#include <QtScript/qscriptvalue.h>
+#include <QtScript/qscriptclass.h>
+
+QT_BEGIN_NAMESPACE
+
+class QScriptDeclarativeClassPrivate;
+class PersistentIdentifierPrivate;
+class Q_SCRIPT_EXPORT QScriptDeclarativeClass
+{
+public:
+    typedef void* Identifier;
+    typedef void* Object;
+
+    static QScriptValue newObject(QScriptEngine *, QScriptDeclarativeClass *, Object);
+    static QScriptDeclarativeClass *scriptClass(const QScriptValue &);
+    static Object object(const QScriptValue &);
+
+    template<class T>
+    class PersistentIdentifier : public T {
+    public:
+        Identifier identifier;
+
+        ~PersistentIdentifier() { QScriptDeclarativeClass::destroyPersistentIdentifier(&d); }
+    private:
+        friend class QScriptDeclarativeClass;
+        PersistentIdentifier() : identifier(0), d(0) {}
+        void *d;
+    };
+
+    QScriptDeclarativeClass(QScriptEngine *engine);
+    virtual ~QScriptDeclarativeClass();
+
+    QScriptEngine *engine() const;
+
+    template<class T>
+    PersistentIdentifier<T> *createPersistentIdentifier(const QString &str) {
+        PersistentIdentifier<T> *rv = new PersistentIdentifier<T>;
+        initPersistentIdentifier(&rv->d, &rv->identifier, str);
+        return rv;
+    }
+    template<class T>
+    PersistentIdentifier<T> *createPersistentIdentifier(const Identifier &id) {
+        PersistentIdentifier<T> *rv = new PersistentIdentifier<T>;
+        initPersistentIdentifier(&rv->d, &rv->identifier, id);
+        return rv;
+    }
+
+    QString toString(const Identifier &);
+
+    virtual QScriptClass::QueryFlags queryProperty(const Object &, const Identifier &, 
+                                                   QScriptClass::QueryFlags flags);
+
+    virtual QScriptValue property(const Object &, const Identifier &);
+    virtual void setProperty(const Object &, const Identifier &name, const QScriptValue &);
+    virtual QScriptValue::PropertyFlags propertyFlags(const Object &, const Identifier &);
+
+    virtual QStringList propertyNames(const Object &);
+
+    virtual void destroyed(const Object &);
+
+    static void destroyPersistentIdentifier(void **);
+    void initPersistentIdentifier(void **, Identifier *, const QString &);
+    void initPersistentIdentifier(void **, Identifier *, const Identifier &);
+
+protected:
+    QScopedPointer<QScriptDeclarativeClassPrivate> d_ptr;
+};
+
+QT_END_NAMESPACE
+
+#endif
diff --git a/src/script/bridge/qscriptdeclarativeobject.cpp b/src/script/bridge/qscriptdeclarativeobject.cpp
new file mode 100644
index 0000000..62c2686
--- /dev/null
+++ b/src/script/bridge/qscriptdeclarativeobject.cpp
@@ -0,0 +1,186 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtScript module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "config.h"
+#include "qscriptdeclarativeobject_p.h"
+
+#include "../api/qscriptengine.h"
+#include "../api/qscriptengine_p.h"
+#include "../api/qscriptcontext.h"
+#include "../api/qscriptcontext_p.h"
+#include "../api/qscriptclass.h"
+#include "../api/qscriptclasspropertyiterator.h"
+
+#include "Error.h"
+#include "PropertyNameArray.h"
+
+#include <QtCore/qstringlist.h>
+
+Q_DECLARE_METATYPE(QScriptContext*)
+Q_DECLARE_METATYPE(QScriptValue)
+Q_DECLARE_METATYPE(QScriptValueList)
+
+QT_BEGIN_NAMESPACE
+
+namespace QScript
+{
+
+DeclarativeObjectDelegate::DeclarativeObjectDelegate(QScriptDeclarativeClass *c, 
+                                                     QScriptDeclarativeClass::Object &o)
+: m_class(c), m_object(o)
+{
+}
+
+DeclarativeObjectDelegate::~DeclarativeObjectDelegate()
+{
+    m_class->destroyed(m_object);
+}
+
+QScriptObjectDelegate::Type DeclarativeObjectDelegate::type() const
+{
+    return DeclarativeClassObject;
+}
+
+bool DeclarativeObjectDelegate::getOwnPropertySlot(QScriptObject* object,
+                                                   JSC::ExecState *exec,
+                                                   const JSC::Identifier &propertyName,
+                                                   JSC::PropertySlot &slot)
+{
+    QScriptEnginePrivate *engine = scriptEngineFromExec(exec);
+    QScriptDeclarativeClass::Identifier identifier = (void *)propertyName.ustring().rep();
+
+    QScriptClass::QueryFlags flags = 
+        m_class->queryProperty(m_object, identifier, QScriptClass::HandlesReadAccess);
+    if (flags & QScriptClass::HandlesReadAccess) {
+        QScriptValue value = m_class->property(m_object, identifier);
+        slot.setValue(engine->scriptValueToJSCValue(value));
+        return true;
+    }
+
+    return QScriptObjectDelegate::getOwnPropertySlot(object, exec, propertyName, slot);
+}
+
+void DeclarativeObjectDelegate::put(QScriptObject* object, JSC::ExecState *exec,
+                                    const JSC::Identifier &propertyName,
+                                    JSC::JSValue value, JSC::PutPropertySlot &slot)
+{
+    QScriptEnginePrivate *engine = scriptEngineFromExec(exec);
+    QScriptDeclarativeClass::Identifier identifier = (void *)propertyName.ustring().rep();
+
+    QScriptClass::QueryFlags flags = 
+        m_class->queryProperty(m_object, identifier, QScriptClass::HandlesWriteAccess);
+    if (flags & QScriptClass::HandlesWriteAccess) {
+        m_class->setProperty(m_object, identifier, engine->scriptValueFromJSCValue(value));
+        return;
+    }
+    QScriptObjectDelegate::put(object, exec, propertyName, value, slot);
+}
+
+bool DeclarativeObjectDelegate::deleteProperty(QScriptObject* object, JSC::ExecState *exec,
+                                               const JSC::Identifier &propertyName,
+                                               bool checkDontDelete)
+{
+    return QScriptObjectDelegate::deleteProperty(object, exec, propertyName, checkDontDelete);
+}
+
+bool DeclarativeObjectDelegate::getPropertyAttributes(const QScriptObject* object, 
+                                                      JSC::ExecState *exec,
+                                                      const JSC::Identifier &propertyName,
+                                                      unsigned &attribs) const
+{
+    QScriptEnginePrivate *engine = scriptEngineFromExec(exec);
+    QScriptDeclarativeClass::Identifier identifier = (void *)propertyName.ustring().rep();
+
+    QScriptClass::QueryFlags flags = 
+        m_class->queryProperty(m_object, identifier, QScriptClass::HandlesReadAccess);
+    if (flags & QScriptClass::HandlesReadAccess) {
+        QScriptValue::PropertyFlags flags = m_class->propertyFlags(m_object, identifier);
+        attribs = 0;
+        if (flags & QScriptValue::ReadOnly)
+            attribs |= JSC::ReadOnly;
+        if (flags & QScriptValue::SkipInEnumeration)
+            attribs |= JSC::DontEnum;
+        if (flags & QScriptValue::Undeletable)
+            attribs |= JSC::DontDelete;
+        if (flags & QScriptValue::PropertyGetter)
+            attribs |= JSC::Getter;
+        if (flags & QScriptValue::PropertySetter)
+            attribs |= JSC::Setter;
+        attribs |= flags & QScriptValue::UserRange;
+        return true;
+    }
+    return QScriptObjectDelegate::getPropertyAttributes(object, exec, propertyName, attribs);
+}
+
+void DeclarativeObjectDelegate::getPropertyNames(QScriptObject* object, JSC::ExecState *exec,
+                                                 JSC::PropertyNameArray &propertyNames,
+                                                 unsigned listedAttributes)
+{
+    QScriptEnginePrivate *engine = scriptEngineFromExec(exec);
+
+    QStringList properties = m_class->propertyNames(m_object);
+    for (int ii = 0; ii < properties.count(); ++ii) {
+        const QString &name = properties.at(ii);
+        propertyNames.add(JSC::Identifier(exec, name));
+    }
+
+    QScriptObjectDelegate::getPropertyNames(object, exec, propertyNames, listedAttributes);
+}
+
+JSC::CallType DeclarativeObjectDelegate::getCallData(QScriptObject *object, JSC::CallData &callData)
+{
+    return QScriptObjectDelegate::getCallData(object, callData);
+}
+
+JSC::ConstructType DeclarativeObjectDelegate::getConstructData(QScriptObject* object, JSC::ConstructData &constructData)
+{
+    return QScriptObjectDelegate::getConstructData(object, constructData);
+}
+
+bool DeclarativeObjectDelegate::hasInstance(QScriptObject* object, JSC::ExecState *exec,
+                                            JSC::JSValue value, JSC::JSValue proto)
+{
+    return QScriptObjectDelegate::hasInstance(object, exec, value, proto);
+}
+
+} // namespace QScript
+
+QT_END_NAMESPACE
diff --git a/src/script/bridge/qscriptdeclarativeobject_p.h b/src/script/bridge/qscriptdeclarativeobject_p.h
new file mode 100644
index 0000000..87375d8
--- /dev/null
+++ b/src/script/bridge/qscriptdeclarativeobject_p.h
@@ -0,0 +1,110 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtScript module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QSCRIPTDECLARATIVEOBJECT_P_H
+#define QSCRIPTDECLARATIVEOBJECT_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtCore/qobjectdefs.h>
+
+#include "qscriptobject_p.h"
+#include "qscriptdeclarativeclass_p.h"
+
+QT_BEGIN_NAMESPACE
+
+class QScriptClass;
+
+namespace QScript
+{
+
+class DeclarativeObjectDelegate : public QScriptObjectDelegate
+{
+public:
+    DeclarativeObjectDelegate(QScriptDeclarativeClass *c, QScriptDeclarativeClass::Object &o);
+    ~DeclarativeObjectDelegate();
+
+    virtual Type type() const;
+
+    QScriptDeclarativeClass *scriptClass() const { return m_class; }
+    QScriptDeclarativeClass::Object object() const { return m_object; }
+
+    virtual bool getOwnPropertySlot(QScriptObject*, JSC::ExecState*,
+                                    const JSC::Identifier& propertyName,
+                                    JSC::PropertySlot&);
+    virtual void put(QScriptObject*, JSC::ExecState* exec,
+                     const JSC::Identifier& propertyName,
+                     JSC::JSValue, JSC::PutPropertySlot&);
+    virtual bool deleteProperty(QScriptObject*, JSC::ExecState*,
+                                const JSC::Identifier& propertyName,
+                                bool checkDontDelete = true);
+    virtual bool getPropertyAttributes(const QScriptObject*, JSC::ExecState*,
+                                       const JSC::Identifier&,
+                                       unsigned&) const;
+    virtual void getPropertyNames(QScriptObject*, JSC::ExecState*,
+                                  JSC::PropertyNameArray&, 
+                                  unsigned listedAttributes = JSC::Structure::Prototype);
+
+    virtual JSC::CallType getCallData(QScriptObject*, JSC::CallData&);
+    virtual JSC::ConstructType getConstructData(QScriptObject*, JSC::ConstructData&);
+
+    virtual bool hasInstance(QScriptObject*, JSC::ExecState*,
+                             JSC::JSValue value, JSC::JSValue proto);
+
+private:
+    QScriptDeclarativeClass *m_class;
+    QScriptDeclarativeClass::Object m_object;
+};
+
+} // namespace QScript
+
+QT_END_NAMESPACE
+
+#endif
diff --git a/src/script/bridge/qscriptobject_p.h b/src/script/bridge/qscriptobject_p.h
index c1cee31..a5858ac 100644
--- a/src/script/bridge/qscriptobject_p.h
+++ b/src/script/bridge/qscriptobject_p.h
@@ -127,7 +127,8 @@ public:
     enum Type {
         QtObject,
         Variant,
-        ClassObject
+        ClassObject,
+        DeclarativeClassObject
     };
 
     QScriptObjectDelegate();