aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/v8/qv8qobjectwrapper_p.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/qml/qml/v8/qv8qobjectwrapper_p.h')
-rw-r--r--src/qml/qml/v8/qv8qobjectwrapper_p.h12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/qml/qml/v8/qv8qobjectwrapper_p.h b/src/qml/qml/v8/qv8qobjectwrapper_p.h
index 18c0c26ca1..e06ce4980a 100644
--- a/src/qml/qml/v8/qv8qobjectwrapper_p.h
+++ b/src/qml/qml/v8/qv8qobjectwrapper_p.h
@@ -73,7 +73,6 @@ class QObject;
class QV8Engine;
class QQmlData;
class QV8ObjectResource;
-class QV8QObjectConnectionList;
class QQmlPropertyCache;
namespace QV4 {
@@ -87,6 +86,8 @@ struct Q_QML_EXPORT QObjectWrapper : public QV4::Object
~QObjectWrapper();
+ static void initializeBindings(ExecutionEngine *engine);
+
QObject *object() const { return m_object.data(); }
void deleteQObject(bool deleteInstantly = false);
@@ -114,6 +115,9 @@ private:
{
static_cast<QObjectWrapper *>(that)->~QObjectWrapper();
}
+
+ static Value method_connect(SimpleCallContext *ctx);
+ static Value method_disconnect(SimpleCallContext *ctx);
};
struct QObjectMethod : public QV4::FunctionObject
@@ -204,7 +208,6 @@ public:
private:
friend class QQmlPropertyCache;
- friend class QV8QObjectConnectionList;
friend struct QV4::QObjectWrapper;
friend struct QV4::QObjectSlotDispatcher;
@@ -212,13 +215,8 @@ private:
const QHashedV4String &, QQmlContextData *, QV4::QObjectWrapper::RevisionMode);
static bool SetProperty(QV8Engine *, QObject *, const QHashedV4String &, QQmlContextData *,
v8::Handle<v8::Value>, QV4::QObjectWrapper::RevisionMode);
- static QV4::Value Connect(QV4::SimpleCallContext *ctx);
- static QV4::Value Disconnect(QV4::SimpleCallContext *ctx);
- static QPair<QObject *, int> ExtractQtMethod(QV8Engine *, QV4::FunctionObject *);
- static QPair<QObject *, int> ExtractQtSignal(QV8Engine *, const QV4::Value &value);
QV8Engine *m_engine;
- QHash<QObject *, QV8QObjectConnectionList *> m_connections;
};
v8::Handle<v8::Value> QV8QObjectWrapper::getProperty(QObject *object, const QHashedV4String &string,