diff options
| -rw-r--r-- | src/qml/qml/qqmlboundsignal.cpp | 4 | ||||
| -rw-r--r-- | src/qml/qml/qqmljavascriptexpression_p.h | 4 | ||||
| -rw-r--r-- | src/qml/qml/qqmlnotifier_p.h | 10 | ||||
| -rw-r--r-- | src/qml/qml/qqmlvmemetaobject.cpp | 2 |
4 files changed, 9 insertions, 11 deletions
diff --git a/src/qml/qml/qqmlboundsignal.cpp b/src/qml/qml/qqmlboundsignal.cpp index 0cf09024e6..8b97720093 100644 --- a/src/qml/qml/qqmlboundsignal.cpp +++ b/src/qml/qml/qqmlboundsignal.cpp @@ -247,11 +247,11 @@ void QQmlBoundSignalExpression::evaluate(void **a) */ QQmlBoundSignal::QQmlBoundSignal(QObject *target, int signal, QObject *owner, QQmlEngine *engine) - : m_prevSignal(0), m_nextSignal(0), + : QQmlNotifierEndpoint(QQmlNotifierEndpoint::QQmlBoundSignal), + m_prevSignal(0), m_nextSignal(0), m_expression(0) { addToObject(owner); - setCallback(QQmlNotifierEndpoint::QQmlBoundSignal); /* If this is a cloned method, connect to the 'original'. For example, diff --git a/src/qml/qml/qqmljavascriptexpression_p.h b/src/qml/qml/qqmljavascriptexpression_p.h index c6028d86dc..ce490ee170 100644 --- a/src/qml/qml/qqmljavascriptexpression_p.h +++ b/src/qml/qml/qqmljavascriptexpression_p.h @@ -236,9 +236,9 @@ bool QQmlJavaScriptExpression::hasDelayedError() const } QQmlJavaScriptExpressionGuard::QQmlJavaScriptExpressionGuard(QQmlJavaScriptExpression *e) -: expression(e), next(0) + : QQmlNotifierEndpoint(QQmlNotifierEndpoint::QQmlJavaScriptExpressionGuard), + expression(e), next(0) { - setCallback(QQmlNotifierEndpoint::QQmlJavaScriptExpressionGuard); } QQmlJavaScriptExpressionGuard * diff --git a/src/qml/qml/qqmlnotifier_p.h b/src/qml/qml/qqmlnotifier_p.h index 009ffb7107..bd2c0e6506 100644 --- a/src/qml/qml/qqmlnotifier_p.h +++ b/src/qml/qml/qqmlnotifier_p.h @@ -61,9 +61,6 @@ class QQmlEngine; class QQmlNotifierEndpoint { public: - inline QQmlNotifierEndpoint(); - inline ~QQmlNotifierEndpoint(); - // QQmlNotifierEndpoint can only invoke one of a set of pre-defined callbacks. // To add another callback, extend this enum and add the callback to the top // of qqmlnotifier.cpp. Four bits are reserved for the callback, so there can @@ -75,7 +72,8 @@ public: QQmlVMEMetaObjectEndpoint = 3 }; - inline void setCallback(Callback c) { callback = c; } + inline QQmlNotifierEndpoint(Callback callback); + inline ~QQmlNotifierEndpoint(); inline bool isConnected(); inline bool isConnected(QObject *source, int sourceSignal); @@ -138,8 +136,8 @@ void QQmlNotifier::notify() if (endpoints) emitNotify(endpoints, args); } -QQmlNotifierEndpoint::QQmlNotifierEndpoint() -: senderPtr(0), callback(None), sourceSignal(-1), next(0), prev(0) +QQmlNotifierEndpoint::QQmlNotifierEndpoint(Callback callback) +: senderPtr(0), callback(callback), sourceSignal(-1), next(0), prev(0) { } diff --git a/src/qml/qml/qqmlvmemetaobject.cpp b/src/qml/qml/qqmlvmemetaobject.cpp index d617ee18b4..cae4bfa196 100644 --- a/src/qml/qml/qqmlvmemetaobject.cpp +++ b/src/qml/qml/qqmlvmemetaobject.cpp @@ -500,8 +500,8 @@ void QQmlVMEVariant::ensureValueType(int t) } QQmlVMEMetaObjectEndpoint::QQmlVMEMetaObjectEndpoint() + : QQmlNotifierEndpoint(QQmlNotifierEndpoint::QQmlVMEMetaObjectEndpoint) { - setCallback(QQmlNotifierEndpoint::QQmlVMEMetaObjectEndpoint); } void QQmlVMEMetaObjectEndpoint_callback(QQmlNotifierEndpoint *e, void **) |