Cleanup and reduce the number of overloads for QQmlBinding::create()

Change-Id: Ibcd277bc434638e5c6e8e9ccea634aa25cde1643
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

2 files changed, 2 insertions, 31 deletions

diff --git a/src/qml/qml/qqmlbinding.cpp b/src/qml/qml/qqmlbinding.cpp
index c150b1ee29..57fbe2dbc6 100644
--- a/src/qml/qml/qqmlbinding.cpp
+++ b/src/qml/qml/qqmlbinding.cpp
@@ -57,18 +57,6 @@
 
 QT_BEGIN_NAMESPACE
 
-QQmlBinding *QQmlBinding::create(const QQmlPropertyData *property, const QString &str, QObject *obj, QQmlContext *ctxt)
-{
-    QQmlBinding *b = newBinding(QQmlEnginePrivate::get(ctxt), property);
-    b->setNotifyOnValueChanged(true);
-    b->QQmlJavaScriptExpression::setContext(QQmlContextData::get(ctxt));
-    b->setScopeObject(obj);
-
-    b->createQmlBinding(b->context(), obj, str, QString(), 0);
-
-    return b;
-}
-
 QQmlBinding *QQmlBinding::create(const QQmlPropertyData *property, const QQmlScriptString &script, QObject *obj, QQmlContext *ctxt)
 {
     QQmlBinding *b = newBinding(QQmlEnginePrivate::get(ctxt), property);
@@ -106,26 +94,11 @@ QQmlBinding *QQmlBinding::create(const QQmlPropertyData *property, const QQmlScr
     return b;
 }
 
-QQmlBinding *QQmlBinding::create(const QQmlPropertyData *property, const QString &str, QObject *obj, QQmlContextData *ctxt)
-{
-    QQmlBinding *b = newBinding(QQmlEnginePrivate::get(ctxt), property);
-
-    b->setNotifyOnValueChanged(true);
-    b->QQmlJavaScriptExpression::setContext(ctxt);
-    b->setScopeObject(obj);
-
-    b->createQmlBinding(ctxt, obj, str, QString(), 0);
-
-    return b;
-}
-
 QQmlBinding *QQmlBinding::create(const QQmlPropertyData *property, const QString &str, QObject *obj,
-                                 QQmlContextData *ctxt, const QString &url, quint16 lineNumber,
-                                 quint16 columnNumber)
+                                 QQmlContextData *ctxt, const QString &url, quint16 lineNumber)
 {
     QQmlBinding *b = newBinding(QQmlEnginePrivate::get(ctxt), property);
 
-    Q_UNUSED(columnNumber);
     b->setNotifyOnValueChanged(true);
     b->QQmlJavaScriptExpression::setContext(ctxt);
     b->setScopeObject(obj);
diff --git a/src/qml/qml/qqmlbinding_p.h b/src/qml/qml/qqmlbinding_p.h
index 6d42a8ea8a..3454adaf50 100644
--- a/src/qml/qml/qqmlbinding_p.h
+++ b/src/qml/qml/qqmlbinding_p.h
@@ -72,11 +72,9 @@ class Q_QML_PRIVATE_EXPORT QQmlBinding : public QQmlJavaScriptExpression,
 {
     friend class QQmlAbstractBinding;
 public:
-    static QQmlBinding *create(const QQmlPropertyData *, const QString &, QObject *, QQmlContext *);
     static QQmlBinding *create(const QQmlPropertyData *, const QQmlScriptString &, QObject *, QQmlContext *);
-    static QQmlBinding *create(const QQmlPropertyData *, const QString &, QObject *, QQmlContextData *);
     static QQmlBinding *create(const QQmlPropertyData *, const QString &, QObject *, QQmlContextData *,
-                               const QString &url, quint16 lineNumber, quint16 columnNumber);
+                               const QString &url = QString(), quint16 lineNumber = 0);
     static QQmlBinding *create(const QQmlPropertyData *, const QV4::Value &, QObject *, QQmlContextData *);
     ~QQmlBinding();