Fix some function signatures and remove an unused function

The returned value of these methods is never used, so save
some cycles and return void.

Change-Id: I7e2430130853af12de9685c4383197c80c151175
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>

4 files changed, 19 insertions, 46 deletions

diff --git a/src/qml/qml/qqmlboundsignal.cpp b/src/qml/qml/qqmlboundsignal.cpp
index 8b97720093..8b6f8afdce 100644
--- a/src/qml/qml/qqmlboundsignal.cpp
+++ b/src/qml/qml/qqmlboundsignal.cpp
@@ -301,33 +301,15 @@ QQmlBoundSignalExpression *QQmlBoundSignal::expression() const
 }
 
 /*!
-    Sets the signal expression to \a e.  Returns the current signal expression,
-    or null if there is no signal expression.
+    Sets the signal expression to \a e.
 
-    The QQmlBoundSignal instance adds a reference to \a e.  The caller
-    assumes ownership of the returned QQmlBoundSignalExpression reference.
+    The QQmlBoundSignal instance takes ownership of \a e (and does not add a reference).
 */
-QQmlBoundSignalExpressionPointer QQmlBoundSignal::setExpression(QQmlBoundSignalExpression *e)
+void QQmlBoundSignal::takeExpression(QQmlBoundSignalExpression *e)
 {
-    QQmlBoundSignalExpressionPointer rv = m_expression;
-    m_expression = e;
-    if (m_expression) m_expression->setNotifyOnValueChanged(false);
-    return rv;
-}
-
-/*!
-    Sets the signal expression to \a e.  Returns the current signal expression,
-    or null if there is no signal expression.
-
-    The QQmlBoundSignal instance takes ownership of \a e (and does not add a reference).  The caller
-    assumes ownership of the returned QQmlBoundSignalExpression reference.
-*/
-QQmlBoundSignalExpressionPointer QQmlBoundSignal::takeExpression(QQmlBoundSignalExpression *e)
-{
-    QQmlBoundSignalExpressionPointer rv = m_expression;
     m_expression.take(e);
-    if (m_expression) m_expression->setNotifyOnValueChanged(false);
-    return rv;
+    if (m_expression)
+        m_expression->setNotifyOnValueChanged(false);
 }
 
 void QQmlBoundSignal_callback(QQmlNotifierEndpoint *e, void **a)
diff --git a/src/qml/qml/qqmlboundsignal_p.h b/src/qml/qml/qqmlboundsignal_p.h
index 8e47d5bc62..3742317484 100644
--- a/src/qml/qml/qqmlboundsignal_p.h
+++ b/src/qml/qml/qqmlboundsignal_p.h
@@ -106,8 +106,7 @@ public:
     void removeFromObject();
 
     QQmlBoundSignalExpression *expression() const;
-    QQmlBoundSignalExpressionPointer setExpression(QQmlBoundSignalExpression *);
-    QQmlBoundSignalExpressionPointer takeExpression(QQmlBoundSignalExpression *);
+    void takeExpression(QQmlBoundSignalExpression *);
 
 private:
     friend void QQmlBoundSignal_callback(QQmlNotifierEndpoint *, void **);
diff --git a/src/qml/qml/qqmlproperty.cpp b/src/qml/qml/qqmlproperty.cpp
index f59d7060d2..414bf8fe0f 100644
--- a/src/qml/qml/qqmlproperty.cpp
+++ b/src/qml/qml/qqmlproperty.cpp
@@ -901,48 +901,41 @@ QQmlPropertyPrivate::signalExpression(const QQmlProperty &that)
 
 /*!
     Set the signal expression associated with this signal property to \a expr.
-    Returns the existing signal expression (if any), otherwise null.
-
-    A reference to \a expr will be added by QML.  Ownership of the return value
-    reference is assumed by the caller.
+    A reference to \a expr will be added by QML.
 */
-QQmlBoundSignalExpressionPointer
-QQmlPropertyPrivate::setSignalExpression(const QQmlProperty &that,
-                                         QQmlBoundSignalExpression *expr)
+void QQmlPropertyPrivate::setSignalExpression(const QQmlProperty &that, QQmlBoundSignalExpression *expr)
 {
     if (expr)
         expr->addref();
-    return QQmlPropertyPrivate::takeSignalExpression(that, expr);
+    QQmlPropertyPrivate::takeSignalExpression(that, expr);
 }
 
 /*!
     Set the signal expression associated with this signal property to \a expr.
-    Returns the existing signal expression (if any), otherwise null.
-
-    Ownership of \a expr transfers to QML.  Ownership of the return value
-    reference is assumed by the caller.
+    Ownership of \a expr transfers to QML.
 */
-QQmlBoundSignalExpressionPointer
-QQmlPropertyPrivate::takeSignalExpression(const QQmlProperty &that,
+void QQmlPropertyPrivate::takeSignalExpression(const QQmlProperty &that,
                                          QQmlBoundSignalExpression *expr)
 {
     if (!(that.type() & QQmlProperty::SignalProperty)) {
         if (expr)
             expr->release();
-        return 0;
+        return;
     }
 
     QQmlData *data = QQmlData::get(that.d->object, 0 != expr);
     if (!data)
-        return 0;
+        return;
 
     QQmlBoundSignal *signalHandler = data->signalHandlers;
 
     while (signalHandler && signalHandler->signalIndex() != QQmlPropertyPrivate::get(that)->signalIndex())
         signalHandler = signalHandler->m_nextSignal;
 
-    if (signalHandler)
-        return signalHandler->takeExpression(expr);
+    if (signalHandler) {
+        signalHandler->takeExpression(expr);
+        return;
+    }
 
     if (expr) {
         int signalIndex = QQmlPropertyPrivate::get(that)->signalIndex();
@@ -950,7 +943,6 @@ QQmlPropertyPrivate::takeSignalExpression(const QQmlProperty &that,
                                                       expr->context()->engine);
         signal->takeExpression(expr);
     }
-    return 0;
 }
 
 /*!
diff --git a/src/qml/qml/qqmlproperty_p.h b/src/qml/qml/qqmlproperty_p.h
index 4a8399a9ab..51a1db7b90 100644
--- a/src/qml/qml/qqmlproperty_p.h
+++ b/src/qml/qml/qqmlproperty_p.h
@@ -134,9 +134,9 @@ public:
     static QQmlAbstractBinding *binding(const QQmlProperty &that);
     static void setBinding(const QQmlProperty &that, QQmlAbstractBinding *);
     static QQmlBoundSignalExpression *signalExpression(const QQmlProperty &that);
-    static QQmlBoundSignalExpressionPointer setSignalExpression(const QQmlProperty &that,
+    static void setSignalExpression(const QQmlProperty &that,
                                                                 QQmlBoundSignalExpression *);
-    static QQmlBoundSignalExpressionPointer takeSignalExpression(const QQmlProperty &that,
+    static void takeSignalExpression(const QQmlProperty &that,
                                                                  QQmlBoundSignalExpression *);
     static bool write(const QQmlProperty &that, const QVariant &, WriteFlags);
     static int valueTypeCoreIndex(const QQmlProperty &that);