diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-09-05 10:57:38 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-07 11:40:35 +0200 |
| commit | dea991ec5b6e1e8546dfd3695c12425ee27d2ef3 (patch) | |
| tree | ffa3ba14ed0af5da2978f93ad2f24e61506b29a0 /src/qml/qml/qqmltypeloader_p.h | |
| parent | aa4ecdaaad6303f26cd99be3248aff510cca1e4e (diff) | |
Remove unused script parser options
Change-Id: Ie3aafe924011466ce2677e10cc69ece61a563db3
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/qqmltypeloader_p.h')
| -rw-r--r-- | src/qml/qml/qqmltypeloader_p.h | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/qml/qml/qqmltypeloader_p.h b/src/qml/qml/qqmltypeloader_p.h index 88bca702db..abe545fc8f 100644 --- a/src/qml/qml/qqmltypeloader_p.h +++ b/src/qml/qml/qqmltypeloader_p.h @@ -323,16 +323,10 @@ public: QQmlTypeLoader(QQmlEngine *); ~QQmlTypeLoader(); - enum Option { - None, - PreserveParser - }; - Q_DECLARE_FLAGS(Options, Option) - QQmlImportDatabase *importDatabase(); QQmlTypeData *getType(const QUrl &url, Mode mode = PreferSynchronous); - QQmlTypeData *getType(const QByteArray &, const QUrl &url, Options = None); + QQmlTypeData *getType(const QByteArray &, const QUrl &url); QQmlScriptBlob *getScript(const QUrl &); QQmlQmldirData *getQmldir(const QUrl &); @@ -391,8 +385,6 @@ private: QmldirBundleIdCache m_qmldirBundleIdCache; }; -Q_DECLARE_OPERATORS_FOR_FLAGS(QQmlTypeLoader::Options) - class Q_AUTOTEST_EXPORT QQmlTypeData : public QQmlTypeLoader::Blob { public: @@ -419,7 +411,7 @@ public: private: friend class QQmlTypeLoader; - QQmlTypeData(const QUrl &, QQmlTypeLoader::Options, QQmlTypeLoader *); + QQmlTypeData(const QUrl &, QQmlTypeLoader *); public: ~QQmlTypeData(); @@ -454,8 +446,6 @@ private: virtual void scriptImported(QQmlScriptBlob *blob, const QQmlScript::Location &location, const QString &qualifier, const QString &nameSpace); - QQmlTypeLoader::Options m_options; - QQmlScript::Parser scriptParser; QList<ScriptReference> m_scripts; |