Combine the source file, line and column number triplet in a common structure

This avoids unnecessary function calls when all of the three pieces need
to be retrieved from a QQmlBoundSignalExpression.

Change-Id: Ibcd498c907ea723baf6439cf32ca5fc704f204b5
Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

1 files changed, 2 insertions, 6 deletions

diff --git a/src/qml/qml/qqmlboundsignal_p.h b/src/qml/qml/qqmlboundsignal_p.h
index 93cff745e2..6df6da4214 100644
--- a/src/qml/qml/qqmlboundsignal_p.h
+++ b/src/qml/qml/qqmlboundsignal_p.h
@@ -86,9 +86,7 @@ public:
     // evaluation of a bound signal expression doesn't return any value
     void evaluate(void **a);
 
-    QString sourceFile() const;
-    quint16 lineNumber() const;
-    quint16 columnNumber() const;
+    QQmlSourceLocation sourceLocation() const;
     QString expression() const;
     QV4::Function *function() const;
     QObject *target() const { return m_target; }
@@ -120,9 +118,7 @@ private:
         QString m_handlerName;
         QString m_parameterString;
         QString m_expression;
-        QString m_fileName;
-        quint16 m_line;
-        quint16 m_column;
+        QQmlSourceLocation m_sourceLocation;
     };
 
     // We store some flag bits in the following flag pointers.