summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qmlcomponent.cpp
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-07-15 09:22:42 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-07-15 09:22:42 (GMT)
commitf828db056642ac2373c8592c11039e1c7f1b1046 (patch)
tree53cd65d3e1f44778b608f711b37c0183023b34bb /src/declarative/qml/qmlcomponent.cpp
parentfa04625271c725deb669500a8196a07f0c1683b5 (diff)
downloadQt-f828db056642ac2373c8592c11039e1c7f1b1046.zip
Qt-f828db056642ac2373c8592c11039e1c7f1b1046.tar.gz
Qt-f828db056642ac2373c8592c11039e1c7f1b1046.tar.bz2
Remove pointless QmlCompiledComponent class
Diffstat (limited to 'src/declarative/qml/qmlcomponent.cpp')
-rw-r--r--src/declarative/qml/qmlcomponent.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/qml/qmlcomponent.cpp b/src/declarative/qml/qmlcomponent.cpp
index 52315f9..0e68f8a 100644
--- a/src/declarative/qml/qmlcomponent.cpp
+++ b/src/declarative/qml/qmlcomponent.cpp
@@ -41,6 +41,7 @@
#include "qmlcomponent.h"
#include "qmlcomponent_p.h"
+#include "qmlcompiler_p.h"
#include "private/qmlcontext_p.h"
#include "private/qmlengine_p.h"
#include "qmlvme_p.h"
@@ -51,7 +52,6 @@
#include <qmlengine.h>
#include <QFileInfo>
#include <qmlbindablevalue.h>
-#include "qmlcompiledcomponent_p.h"
#include <QtCore/qdebug.h>
#include <QApplication>
@@ -123,7 +123,7 @@ void QmlComponentPrivate::typeDataReady()
void QmlComponentPrivate::fromTypeData(QmlCompositeTypeData *data)
{
url = data->imports.baseUrl();
- QmlCompiledComponent *c = data->toCompiledComponent(engine);
+ QmlCompiledData *c = data->toCompiledComponent(engine);
if (!c) {
Q_ASSERT(data->status == QmlCompositeTypeData::Error);
@@ -303,7 +303,7 @@ QmlComponent::QmlComponent(QmlEngine *engine, const QByteArray &data, const QUrl
/*!
\internal
*/
-QmlComponent::QmlComponent(QmlEngine *engine, QmlCompiledComponent *cc, int start, int count, QObject *parent)
+QmlComponent::QmlComponent(QmlEngine *engine, QmlCompiledData *cc, int start, int count, QObject *parent)
: QObject(*(new QmlComponentPrivate), parent)
{
Q_D(QmlComponent);