Showing the changes to libraries/script-engine/src/qtscript/ScriptObjectQtProxy.h (1 of 35 files). Show all
Unified · Split
| @@ -63,7 +63,7 @@ private: // implementation · 62 unmodified lines | |||
| 63 | 63 | ||
| 64 | public: // construction | 64 | public: // construction |
| 65 | inline ScriptObjectQtProxy(ScriptEngineQtScript* engine, QObject* object, bool ownsObject, const ScriptEngine::QObjectWrapOptions& options) : | 65 | inline ScriptObjectQtProxy(ScriptEngineQtScript* engine, QObject* object, bool ownsObject, const ScriptEngine::QObjectWrapOptions& options) : |
| 66 | QScriptClass(engine), _engine(engine), _object(object), _wrapOptions(options), _ownsObject(ownsObject) { | 66 | QScriptClass(engine), _engine(engine), _wrapOptions(options), _ownsObject(ownsObject), _object(object) { |
| 67 | investigate(); | 67 | investigate(); |
| 68 | } | 68 | } |
| 69 | virtual ~ScriptObjectQtProxy(); | 69 | virtual ~ScriptObjectQtProxy(); |
| @@ -144,7 +144,7 @@ public: // construction · 74 unmodified lines | |||
| 144 | inline ScriptMethodQtProxy(ScriptEngineQtScript* engine, QObject* object, QScriptValue lifetime, | 144 | inline ScriptMethodQtProxy(ScriptEngineQtScript* engine, QObject* object, QScriptValue lifetime, |
| 145 | const QList<QMetaMethod>& metas, int numMaxParms) : | 145 | const QList<QMetaMethod>& metas, int numMaxParms) : |
| 146 | QScriptClass(engine), | 146 | QScriptClass(engine), |
| 147 | _engine(engine), _object(object), _objectLifetime(lifetime), _metas(metas), _numMaxParms(numMaxParms) {} | 147 | _numMaxParms(numMaxParms), _engine(engine), _object(object), _objectLifetime(lifetime), _metas(metas) {} |
| 148 | 148 | ||
| 149 | public: // QScriptClass implementation | 149 | public: // QScriptClass implementation |
| 150 | virtual QString name() const override { return fullName(); } | 150 | virtual QString name() const override { return fullName(); } |
| @@ -187,7 +187,7 @@ public: // construction · 36 unmodified lines | |||
| 187 | _engine(engine), _object(object), _objectLifetime(lifetime), _meta(meta), _metaCallId(discoverMetaCallIdx()) {} | 187 | _engine(engine), _object(object), _objectLifetime(lifetime), _meta(meta), _metaCallId(discoverMetaCallIdx()) {} |
| 188 | 188 | ||
| 189 | private: // implementation | 189 | private: // implementation |
| 190 | virtual int qt_metacall(QMetaObject::Call call, int id, void** arguments); | 190 | virtual int qt_metacall(QMetaObject::Call call, int id, void** arguments) override; |
| 191 | int discoverMetaCallIdx(); | 191 | int discoverMetaCallIdx(); |
| 192 | ConnectionList::iterator findConnection(QScriptValue thisObject, QScriptValue callback); | 192 | ConnectionList::iterator findConnection(QScriptValue thisObject, QScriptValue callback); |
| 193 | QString fullName() const; | 193 | QString fullName() const; |