diff options
author | Kent Hansen <kent.hansen@nokia.com> | 2012-02-20 21:59:59 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-22 16:18:58 +0100 |
commit | 093031257da7d72572bcee3ead931d83fcdd69d2 (patch) | |
tree | 5be0b656ca3ce7683038d9baac9deaad6f22c6ff /src/script/bridge/qscriptqobject.cpp | |
parent | fb9cd04b67ee725c37459316fec8fcbc833b7db1 (diff) | |
download | qtscript-093031257da7d72572bcee3ead931d83fcdd69d2.tar.gz |
Update QObjectConnectionManager meta-object to revision 6
Support for old meta-object revisions will be removed in Qt 5.
This commit brings the QObjectConnectionManager meta-object in
sync with current moc output.
Change-Id: Iaee8bf68cc9d0568092f7692b3422145fed91c93
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Diffstat (limited to 'src/script/bridge/qscriptqobject.cpp')
-rw-r--r-- | src/script/bridge/qscriptqobject.cpp | 39 |
1 files changed, 28 insertions, 11 deletions
diff --git a/src/script/bridge/qscriptqobject.cpp b/src/script/bridge/qscriptqobject.cpp index 89828f9..ffc0ba7 100644 --- a/src/script/bridge/qscriptqobject.cpp +++ b/src/script/bridge/qscriptqobject.cpp @@ -121,6 +121,7 @@ public: class QObjectConnectionManager: public QObject { + Q_OBJECT_FAKE public: QObjectConnectionManager(QScriptEnginePrivate *engine); ~QObjectConnectionManager(); @@ -134,11 +135,6 @@ public: JSC::JSValue receiver, JSC::JSValue slot); - static const QMetaObject staticMetaObject; - virtual const QMetaObject *metaObject() const; - virtual void *qt_metacast(const char *); - virtual int qt_metacall(QMetaObject::Call, int, void **argv); - void execute(int slotIndex, void **argv); void mark(JSC::MarkStack&); @@ -1997,15 +1993,19 @@ QMetaObjectPrototype::QMetaObjectPrototype( putDirectFunction(exec, new (exec) JSC::NativeFunctionWrapper(exec, prototypeFunctionStructure, /*length=*/0, JSC::Identifier(exec, "className"), qmetaobjectProtoFuncClassName), JSC::DontEnum); } +// Begin moc-generated code -- modify with care! Check "HAND EDIT" parts static const uint qt_meta_data_QObjectConnectionManager[] = { // content: - 1, // revision + 6, // revision 0, // classname 0, 0, // classinfo - 1, 10, // methods + 1, 14, // methods 0, 0, // properties 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount // slots: signature, parameters, type, tag, flags 35, 34, 34, 34, 0x0a, @@ -2014,12 +2014,27 @@ static const uint qt_meta_data_QObjectConnectionManager[] = { }; static const char qt_meta_stringdata_QObjectConnectionManager[] = { - "QScript::QObjectConnectionManager\0\0execute()\0" + "QScript::QObjectConnectionManager\0\0" + "execute()\0" +}; + +void QObjectConnectionManager::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + QObjectConnectionManager *_t = static_cast<QObjectConnectionManager *>(_o); + // HAND EDIT: remove switch (_id), add the _id and _a parameters + _t->execute(_id, _a); + } +} + +const QMetaObjectExtraData QObjectConnectionManager::staticMetaObjectExtraData = { + 0, qt_static_metacall }; const QMetaObject QObjectConnectionManager::staticMetaObject = { { &QObject::staticMetaObject, qt_meta_stringdata_QObjectConnectionManager, - qt_meta_data_QObjectConnectionManager, 0 } + qt_meta_data_QObjectConnectionManager, &staticMetaObjectExtraData } }; const QMetaObject *QObjectConnectionManager::metaObject() const @@ -2041,11 +2056,13 @@ int QObjectConnectionManager::qt_metacall(QMetaObject::Call _c, int _id, void ** if (_id < 0) return _id; if (_c == QMetaObject::InvokeMetaMethod) { - execute(_id, _a); - _id -= slotCounter; + if (_id < slotCounter) // HAND EDIT + qt_static_metacall(this, _c, _id, _a); + _id -= slotCounter; // HAND EDIT } return _id; } +// End moc-generated code void QObjectConnectionManager::execute(int slotIndex, void **argv) { |