Reduce size of QQmlNotifierEndpoint

Change-Id: I4d4a22f5f3d88d4ad2fcd738753fd8da2d8a9263
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>

2 files changed, 10 insertions, 5 deletions

diff --git a/src/qml/qml/v4/qv4bindings.cpp b/src/qml/qml/v4/qv4bindings.cpp
index 95eb0b9984..39b571f336 100644
--- a/src/qml/qml/v4/qv4bindings.cpp
+++ b/src/qml/qml/v4/qv4bindings.cpp
@@ -349,9 +349,15 @@ void QV4Bindings::Binding::retargetBinding(QObject *t, int i)
     target.value().targetProperty = i;
 }
 
-void QV4Bindings::Subscription::subscriptionCallback(QQmlNotifierEndpoint *e, void **)
+QV4Bindings::Subscription::Subscription()
+: bindings(0), method(-1)
 {
-    Subscription *s = static_cast<Subscription *>(e);
+    setCallback(QQmlNotifierEndpoint::QV4BindingsSubscription);
+}
+
+void QV4BindingsSubscription_callback(QQmlNotifierEndpoint *e, void **)
+{
+    QV4Bindings::Subscription *s = static_cast<QV4Bindings::Subscription *>(e);
     s->bindings->subscriptionNotify(s->method);
 }
 
diff --git a/src/qml/qml/v4/qv4bindings_p.h b/src/qml/qml/v4/qv4bindings_p.h
index be58e02358..d2d8520a83 100644
--- a/src/qml/qml/v4/qv4bindings_p.h
+++ b/src/qml/qml/v4/qv4bindings_p.h
@@ -117,12 +117,11 @@ private:
     class Subscription : public QQmlNotifierEndpoint
     {
     public:
-        Subscription() : bindings(0), method(-1) { callback = &subscriptionCallback; }
-        static void subscriptionCallback(QQmlNotifierEndpoint *e, void**);
+        inline Subscription();
         QV4Bindings *bindings;
         int method;
     };
-    friend class Subscription;
+    friend void QV4BindingsSubscription_callback(QQmlNotifierEndpoint *e, void **);
 
     Subscription *subscriptions;