Encapsulate QQmlContextData

This class is not a private detail of QQmlContext. And it is incredibly
hard to see who owns what in there. Let's add some civilization ...

We enforce refcounting for QQmlContextData across the code base, with
two exceptions:

1. QQmlContextPrivate may or may not own its QQmlContextData.
2. We may request a QQmlContextData owned by its parent QQmlContextData.

For these two cases we keep flags in QQmlContextData and when the
respective field (m_parent or m_publicContext) is reset, we release()
once.

Furthermore, QQmlContextData and QQmlGuardedContextData are moved to
their own files, in order to de-spaghettify qqmlcontext_p.h and
qqmlcontext.cpp.

When the QQmlEngine is deleted, any QQmlComponents drop their object
creators now, in order to release any context data held by those.
Before, the context data would be deleted, but the object creators would
retain the dangling pointer.

[ChangeLog][QML][Important Behavior Changes] QQmlContext::baseUrl() does
what the documentation says now: It prefers explicitly set baseUrls over
compilation unit URLs. Only if no baseUrl is set, the CU's URL is
returned. It used to prefer the CU's URL.

Change-Id: Ieeb5dcb07b45d891526191321386d5443b8f5738
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

1 files changed, 11 insertions, 11 deletions

diff --git a/src/qml/qml/qqmlboundsignal.cpp b/src/qml/qml/qqmlboundsignal.cpp
index 6de4ef153e..6272979e92 100644
--- a/src/qml/qml/qqmlboundsignal.cpp
+++ b/src/qml/qml/qqmlboundsignal.cpp
@@ -64,11 +64,10 @@
 
 QT_BEGIN_NAMESPACE
 
-QQmlBoundSignalExpression::QQmlBoundSignalExpression(QObject *target, int index,
-                                                     QQmlContextData *ctxt, QObject *scope, const QString &expression,
-                                                     const QString &fileName, quint16 line, quint16 column,
-                                                     const QString &handlerName,
-                                                     const QString &parameterString)
+QQmlBoundSignalExpression::QQmlBoundSignalExpression(
+        QObject *target, int index, const QQmlRefPointer<QQmlContextData> &ctxt, QObject *scope,
+        const QString &expression, const QString &fileName, quint16 line, quint16 column,
+        const QString &handlerName, const QString &parameterString)
     : QQmlJavaScriptExpression(),
       m_index(index),
       m_target(target)
@@ -105,8 +104,9 @@ QQmlBoundSignalExpression::QQmlBoundSignalExpression(QObject *target, int index,
     setupFunction(context, f->function());
 }
 
-QQmlBoundSignalExpression::QQmlBoundSignalExpression(QObject *target, int index, QQmlContextData *ctxt, QObject *scopeObject,
-                                                     QV4::Function *function, QV4::ExecutionContext *scope)
+QQmlBoundSignalExpression::QQmlBoundSignalExpression(
+        QObject *target, int index, const QQmlRefPointer<QQmlContextData> &ctxt,
+        QObject *scopeObject, QV4::Function *function, QV4::ExecutionContext *scope)
     : QQmlJavaScriptExpression(),
       m_index(index),
       m_target(target)
@@ -114,7 +114,7 @@ QQmlBoundSignalExpression::QQmlBoundSignalExpression(QObject *target, int index,
     // It's important to call init first, because m_index gets remapped in case of cloned signals.
     init(ctxt, scopeObject);
 
-    QV4::ExecutionEngine *engine = ctxt->engine->handle();
+    QV4::ExecutionEngine *engine = ctxt->engine()->handle();
 
     // If the function is marked as having a nested function, then the user wrote:
     //   onSomeSignal: function() { /*....*/ }
@@ -141,7 +141,7 @@ QQmlBoundSignalExpression::QQmlBoundSignalExpression(QObject *target, int index,
     setupFunction(qmlContext, function);
 }
 
-void QQmlBoundSignalExpression::init(QQmlContextData *ctxt, QObject *scope)
+void QQmlBoundSignalExpression::init(const QQmlRefPointer<QQmlContextData> &ctxt, QObject *scope)
 {
     setNotifyOnValueChanged(false);
     setContext(ctxt);
@@ -177,7 +177,7 @@ QString QQmlBoundSignalExpression::expression() const
 // Changes made here may need to be made there and vice versa.
 void QQmlBoundSignalExpression::evaluate(void **a)
 {
-    Q_ASSERT (context() && engine());
+    Q_ASSERT (engine());
 
     if (!expressionFunctionValid())
         return;
@@ -225,7 +225,7 @@ void QQmlBoundSignalExpression::evaluate(void **a)
 
 void QQmlBoundSignalExpression::evaluate(const QList<QVariant> &args)
 {
-    Q_ASSERT (context() && engine());
+    Q_ASSERT (engine());
 
     if (!expressionFunctionValid())
         return;