summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qmlscriptparser_p.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/declarative/qml/qmlscriptparser_p.h')
-rw-r--r--src/declarative/qml/qmlscriptparser_p.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/declarative/qml/qmlscriptparser_p.h b/src/declarative/qml/qmlscriptparser_p.h
index 0d89268..4155bba 100644
--- a/src/declarative/qml/qmlscriptparser_p.h
+++ b/src/declarative/qml/qmlscriptparser_p.h
@@ -3,6 +3,7 @@
#include <QtCore/QList>
#include <QtCore/QUrl>
+#include <QtDeclarative/qmlerror.h>
#include <qml.h>
QT_BEGIN_HEADER
@@ -23,8 +24,6 @@ public:
~QmlScriptParser();
bool parse(const QByteArray &data, const QUrl &url = QUrl());
- QString errorDescription() const;
- int errorLine() const;
QMap<QString,QString> nameSpacePaths() const;
QStringList types() const;
@@ -33,6 +32,8 @@ public:
void clear();
+ QList<QmlError> errors() const;
+
// ### private:
int findOrCreateTypeId(const QString &name);
void setTree(QmlParser::Object *tree);
@@ -42,12 +43,12 @@ public:
void addNamespacePath(const QString &path);
-private:
+// ### private:
+ QList<QmlError> _errors;
+
QMap<QString,QString> _nameSpacePaths;
QmlParser::Object *root;
QStringList _typeNames;
- QString _error;
- int _errorLine;
QString _scriptFile;
};