FCL/sf/mw/qt: comparison src/declarative/qml/qdeclarativecomponent.cpp

equal deleted inserted replaced

-:ef0373b55136
+:758a864f9613
 #include "qdeclarativecomponent.h"
 #include "private/qdeclarativecomponent_p.h"
 #include "private/qdeclarativecompiler_p.h"
 #include "private/qdeclarativecontext_p.h"
-#include "private/qdeclarativecompositetypedata_p.h"
 #include "private/qdeclarativeengine_p.h"
 #include "private/qdeclarativevme_p.h"
 #include "qdeclarative.h"
 #include "qdeclarativeengine.h"
 #include "private/qdeclarativebinding_p.h"
 #include "private/qdeclarativebinding_p_p.h"
 #include "private/qdeclarativeglobal_p.h"
 #include "private/qdeclarativescriptparser_p.h"
 #include "private/qdeclarativedebugtrace_p.h"
+#include "private/qdeclarativeenginedebug_p.h"
 #include <QStack>
 #include <QStringList>
 #include <QFileInfo>
 #include <QtCore/qdebug.h>
 \sa {Using QML in C++ Applications}, {Integrating QML with existing Qt UI code}
 */
 /*!
 \qmlclass Component QDeclarativeComponent
+\ingroup qml-utility-elements
 \since 4.7
 \brief The Component element encapsulates a QML component definition.
 Components are reusable, encapsulated QML elements with well-defined interfaces.
 that is, \c .qml files. The \e Component element allows components to be defined
 within QML items rather than in a separate file. This may be useful for reusing
 a small component within a QML file, or for defining a component that logically
 belongs with other QML components within a file.
-For example, here is a component that is used by multiple \l Loader objects:
+For example, here is a component that is used by multiple \l Loader objects.
+It contains a top level \l Rectangle item:
-\qml
-Item {
+\snippet doc/src/snippets/declarative/component.qml 0
-Component {
-id: redSquare
-Rectangle {
-color: "red"
-width: 10
-height: 10
-}
-}
-Loader { sourceComponent: redSquare }
-Loader { sourceComponent: redSquare; x: 20 }
-}
-\endqml
 Notice that while a \l Rectangle by itself would be automatically
 rendered and displayed, this is not the case for the above rectangle
 because it is defined inside a \c Component. The component encapsulates the
 QML elements within, as if they were defined in a separate \c .qml
 file, and is not loaded until requested (in this case, by the
 two \l Loader objects).
+A Component cannot contain anything other
+than an \c id and a single top level item. While the \c id is optional,
+the top level item is not; you cannot define an empty component.
 The Component element is commonly used to provide graphical components
 for views. For example, the ListView::delegate property requires a Component
 to specify how each list item is to be displayed.
-Component objects can also be dynamically generated using
+Component objects can also be dynamically created using
-\l{Qt::createComponent}{Qt.createComponent()}.
+\l{QML:Qt::createComponent()}{Qt.createComponent()}.
 */
 /*!
 \qmlattachedsignal Component::onCompleted()
 Specifies the loading status of the QDeclarativeComponent.
 \value Null This QDeclarativeComponent has no data.  Call loadUrl() or setData() to add QML content.
 \value Ready This QDeclarativeComponent is ready and create() may be called.
 \value Loading This QDeclarativeComponent is loading network data.
-\value Error An error has occured.  Call errors() to retrieve a list of \{QDeclarativeError}{errors}.
+\value Error An error has occurred.  Call errors() to retrieve a list of \{QDeclarativeError}{errors}.
 */
-void QDeclarativeComponentPrivate::typeDataReady()
+void QDeclarativeComponentPrivate::typeDataReady(QDeclarativeTypeData *)
 {
 Q_Q(QDeclarativeComponent);
 Q_ASSERT(typeData);
 typeData = 0;
 emit q->statusChanged(q->status());
 }
-void QDeclarativeComponentPrivate::updateProgress(qreal p)
+void QDeclarativeComponentPrivate::typeDataProgress(QDeclarativeTypeData *, qreal p)
 {
 Q_Q(QDeclarativeComponent);
 progress = p;
 emit q->progressChanged(p);
 }
-void QDeclarativeComponentPrivate::fromTypeData(QDeclarativeCompositeTypeData *data)
+void QDeclarativeComponentPrivate::fromTypeData(QDeclarativeTypeData *data)
 {
-url = data->imports.baseUrl();
+url = data->finalUrl();
-QDeclarativeCompiledData *c = data->toCompiledComponent(engine);
+QDeclarativeCompiledData *c = data->compiledData();
 if (!c) {
-Q_ASSERT(data->status == QDeclarativeCompositeTypeData::Error);
+Q_ASSERT(data->isError());
+state.errors = data->errors();
-state.errors = data->errors;
 } else {
 cc = c;
 }
 data->release();
 }
 void QDeclarativeComponentPrivate::clear()
 {
 if (typeData) {
-typeData->remWaiter(this);
+typeData->unregisterCallback(this);
 typeData->release();
 typeData = 0;
 }
 if (cc) {
 qWarning("QDeclarativeComponent: Component destroyed while completion pending");
 d->completeCreate();
 }
 if (d->typeData) {
-d->typeData->remWaiter(d);
+d->typeData->unregisterCallback(d);
 d->typeData->release();
 }
 if (d->cc)
 d->cc->release();
 }
 d->clear();
 d->url = url;
-QDeclarativeCompositeTypeData *typeData =
+QDeclarativeTypeData *typeData = QDeclarativeEnginePrivate::get(d->engine)->typeLoader.get(data, url);
-QDeclarativeEnginePrivate::get(d->engine)->typeManager.getImmediate(data, url);
-if (typeData->status == QDeclarativeCompositeTypeData::Waiting
+if (typeData->isCompleteOrError()) {
-|| typeData->status == QDeclarativeCompositeTypeData::WaitingResources)
+d->fromTypeData(typeData);
-{
+} else {
 d->typeData = typeData;
-d->typeData->addWaiter(d);
+d->typeData->registerCallback(d);
-} else {
-d->fromTypeData(typeData);
 }
 d->progress = 1.0;
 emit statusChanged(status());
 emit progressChanged(d->progress);
 error.setDescription(tr("Invalid empty URL"));
 d->state.errors << error;
 return;
 }
-QDeclarativeCompositeTypeData *data =
+QDeclarativeTypeData *data = QDeclarativeEnginePrivate::get(d->engine)->typeLoader.get(d->url);
-QDeclarativeEnginePrivate::get(d->engine)->typeManager.get(d->url);
+if (data->isCompleteOrError()) {
-if (data->status == QDeclarativeCompositeTypeData::Waiting
-|| data->status == QDeclarativeCompositeTypeData::WaitingResources)
-{
-d->typeData = data;
-d->typeData->addWaiter(d);
-d->progress = data->progress;
-} else {
 d->fromTypeData(data);
 d->progress = 1.0;
+} else {
+d->typeData = data;
+d->typeData->registerCallback(d);
+d->progress = data->progress();
 }
 emit statusChanged(status());
 emit progressChanged(d->progress);
 }
 /*!
-Return the list of errors that occured during the last compile or create
+Return the list of errors that occurred during the last compile or create
 operation.  An empty list is returned if isError() is not set.
 */
 QList<QDeclarativeError> QDeclarativeComponent::errors() const
 {
 Q_D(const QDeclarativeComponent);
 If you wish to create an object without setting a parent, specify \c null for
 the \a parent value. Note that if the returned object is to be displayed, you
 must provide a valid \a parent value or set the returned object's \l{Item::parent}{parent}
 property, or else the object will not be visible.
+Dynamically created instances can be deleted with the \c destroy() method.
+See \l {Dynamic Object Management in QML} for more information.
 */
 /*!
 \internal
 A version of create which returns a scriptObject, for use in script.
 QDeclarativeContext* ctxt = creationContext();
 if(!ctxt && d->engine)
 ctxt = d->engine->rootContext();
 if (!ctxt)
 return QScriptValue(QScriptValue::NullValue);
-QObject* ret = create(ctxt);
+QObject* ret = beginCreate(ctxt);
-if (!ret)
+if (!ret) {
+completeCreate();
 return QScriptValue(QScriptValue::NullValue);
+}
 if (parent) {
 ret->setParent(parent);
 QList<QDeclarativePrivate::AutoParentFunction> functions = QDeclarativeMetaType::parentFunctions();
 }
 if (needParent)
 qWarning("QDeclarativeComponent: Created graphical object was not placed in the graphics scene.");
 }
+completeCreate();
 QDeclarativeEnginePrivate *priv = QDeclarativeEnginePrivate::get(d->engine);
 QDeclarativeData::get(ret, true)->setImplicitDestructible();
 return priv->objectClass->newQObject(ret, QMetaType::QObjectStar);
 }
 cc->importCache->addref();
 ctxt->setParent(context);
 QObject *rv = begin(ctxt, ep, cc, start, count, &state, bindings);
-if (rv && !context->isInternal && ep->isDebugging)
+if (ep->isDebugging && rv) {
-context->asQDeclarativeContextPrivate()->instances.append(rv);
+if  (!context->isInternal)
+context->asQDeclarativeContextPrivate()->instances.append(rv);
+QDeclarativeEngineDebugServer::instance()->objectCreated(engine, rv);
+}
 return rv;
 }
 QObject * QDeclarativeComponentPrivate::begin(QDeclarativeContextData *ctxt, QDeclarativeEnginePrivate *enginePriv,

changeset 37	758a864f9613
parent 33	3e2da88830cd