From b855240b782395f94315f43ea3e7e182299fac48 Mon Sep 17 00:00:00 2001
From: Matthew Vogt <matthew.vogt@nokia.com>
Date: Thu, 16 Feb 2012 14:43:03 +1000
Subject: Rename QDeclarative symbols to QQuick and QQml

Symbols beginning with QDeclarative are already exported
by the quick1 module.

Users can apply the bin/rename-qtdeclarative-symbols.sh
script to modify client code using the previous names of the
renamed symbols.

Task-number: QTBUG-23737
Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66
Reviewed-by: Martin Jones <martin.jones@nokia.com>
---
 src/qml/qml/qqmlcomponent.h | 138 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 138 insertions(+)
 create mode 100644 src/qml/qml/qqmlcomponent.h

(limited to 'src/qml/qml/qqmlcomponent.h')

diff --git a/src/qml/qml/qqmlcomponent.h b/src/qml/qml/qqmlcomponent.h
new file mode 100644
index 0000000000..1265fb1c7d
--- /dev/null
+++ b/src/qml/qml/qqmlcomponent.h
@@ -0,0 +1,138 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the QtQml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QQMLCOMPONENT_H
+#define QQMLCOMPONENT_H
+
+#include <QtQml/qqml.h>
+#include <QtQml/qqmlerror.h>
+
+#include <QtCore/qobject.h>
+#include <QtCore/qstring.h>
+#include <QtQml/qjsvalue.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+
+class QByteArray;
+class QQmlEngine;
+class QQmlComponent;
+class QQmlIncubator;
+class QQmlV8Function;
+class QQmlCompiledData;
+class QQmlComponentPrivate;
+class QQmlComponentAttached;
+
+class Q_QML_EXPORT QQmlComponent : public QObject
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(QQmlComponent)
+
+    Q_PROPERTY(qreal progress READ progress NOTIFY progressChanged)
+    Q_PROPERTY(Status status READ status NOTIFY statusChanged)
+    Q_PROPERTY(QUrl url READ url CONSTANT)
+
+public:
+    QQmlComponent(QObject *parent = 0);
+    QQmlComponent(QQmlEngine *, QObject *parent=0);
+    QQmlComponent(QQmlEngine *, const QString &fileName, QObject *parent = 0);
+    QQmlComponent(QQmlEngine *, const QUrl &url, QObject *parent = 0);
+    virtual ~QQmlComponent();
+
+    Q_ENUMS(Status)
+    enum Status { Null, Ready, Loading, Error };
+    Status status() const;
+
+    bool isNull() const;
+    bool isReady() const;
+    bool isError() const;
+    bool isLoading() const;
+
+    QList<QQmlError> errors() const;
+    Q_INVOKABLE QString errorString() const;
+
+    qreal progress() const;
+
+    QUrl url() const;
+
+    virtual QObject *create(QQmlContext *context = 0);
+    virtual QObject *beginCreate(QQmlContext *);
+    virtual void completeCreate();
+
+    void create(QQmlIncubator &, QQmlContext *context = 0,
+                QQmlContext *forContext = 0);
+
+    QQmlContext *creationContext() const;
+
+    static QQmlComponentAttached *qmlAttachedProperties(QObject *);
+
+public Q_SLOTS:
+    void loadUrl(const QUrl &url);
+    void setData(const QByteArray &, const QUrl &baseUrl);
+
+Q_SIGNALS:
+    void statusChanged(QQmlComponent::Status);
+    void progressChanged(qreal);
+
+protected:
+    QQmlComponent(QQmlComponentPrivate &dd, QObject* parent);
+    Q_INVOKABLE void createObject(QQmlV8Function *);
+    Q_INVOKABLE void incubateObject(QQmlV8Function *);
+
+private:
+    QQmlComponent(QQmlEngine *, QQmlCompiledData *, int, QObject *parent);
+
+    Q_DISABLE_COPY(QQmlComponent)
+    friend class QQmlVME;
+    friend class QQmlTypeData;
+};
+
+QT_END_NAMESPACE
+
+Q_DECLARE_METATYPE(QQmlComponent::Status)
+QML_DECLARE_TYPE(QQmlComponent)
+QML_DECLARE_TYPEINFO(QQmlComponent, QML_HAS_ATTACHED_PROPERTIES)
+
+QT_END_HEADER
+
+#endif // QQMLCOMPONENT_H
-- 
cgit v1.2.3