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>

1 files changed, 11 insertions, 19 deletions

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;
 }
 
 /*!