diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-08 15:48:17 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-12-09 10:07:19 +0100 |
| commit | 3228864f7b9ea20f307beedd1fd7e56fb3216654 (patch) | |
| tree | 3e5402c22c32a73411bc8a1ff72fdfced9f4efcf /src/qml/qml/qqmlcomponent.cpp | |
| parent | 3adcf75c6c2585d643bd30a23da11912410f80d7 (diff) | |
Cleanup: Merge QQmlDataLoader and QQmlTypeLoader
There exists only one sub-class of QQmlDataLoader and there are no virtual
functions.
This also clears up a confusion reported in Jira that suggested QQmlDataLoader
should get a virtual destructor as it is being subclassed and somebody might
have a pointer only to a QQmlDataLoader and deleting that would not do proper
polymorphic destruction.
Change-Id: I34611be5a95522bc85a87fb7df97b6d1de7a3d37
Reviewed-by: Michael Brasser <michael.brasser@live.com>
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
Diffstat (limited to 'src/qml/qml/qqmlcomponent.cpp')
| -rw-r--r-- | src/qml/qml/qqmlcomponent.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp index 5b6db65a6c..b4461e32fa 100644 --- a/src/qml/qml/qqmlcomponent.cpp +++ b/src/qml/qml/qqmlcomponent.cpp @@ -675,9 +675,9 @@ void QQmlComponentPrivate::loadUrl(const QUrl &newUrl, QQmlComponent::Compilatio emit q->progressChanged(progress); } - QQmlDataLoader::Mode loaderMode = (mode == QQmlComponent::Asynchronous) - ? QQmlDataLoader::Asynchronous - : QQmlDataLoader::PreferSynchronous; + QQmlTypeLoader::Mode loaderMode = (mode == QQmlComponent::Asynchronous) + ? QQmlTypeLoader::Asynchronous + : QQmlTypeLoader::PreferSynchronous; QQmlTypeData *data = QQmlEnginePrivate::get(engine)->typeLoader.getType(url, loaderMode); |