diff options
| author | Roberto Raggi <roberto.raggi@nokia.com> | 2009-06-11 11:22:26 +0200 |
|---|---|---|
| committer | Roberto Raggi <roberto.raggi@nokia.com> | 2009-06-11 11:33:25 +0200 |
| commit | 0f9b9b049414d263fc018ee625cfa5afa1c43f64 (patch) | |
| tree | 6a25237ca39beb355517dd1d8331dc14034cf205 /src/plugins/duieditor/duieditor.h | |
| parent | d08b90b49432198f921f115e541b81d1dccb2f53 (diff) | |
| download | qt-creator-0f9b9b049414d263fc018ee625cfa5afa1c43f64.tar.gz | |
Imported the QML front-end from Qt/Kinetic
Diffstat (limited to 'src/plugins/duieditor/duieditor.h')
| -rw-r--r-- | src/plugins/duieditor/duieditor.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/duieditor/duieditor.h b/src/plugins/duieditor/duieditor.h index 1b5ef03df2..6216468393 100644 --- a/src/plugins/duieditor/duieditor.h +++ b/src/plugins/duieditor/duieditor.h @@ -32,8 +32,8 @@ #include <texteditor/basetexteditor.h> -#include "javascriptastfwd_p.h" -#include "javascriptengine_p.h" +#include "qmljsastfwd_p.h" +#include "qmljsengine_p.h" #include "duidocument.h" QT_BEGIN_NAMESPACE @@ -101,7 +101,7 @@ public: QStringList words() const; QStringList keywords() const; - QList<JavaScript::DiagnosticMessage> diagnosticMessages() const + QList<QmlJS::DiagnosticMessage> diagnosticMessages() const { return m_diagnosticMessages; } virtual void unCommentSelection(); @@ -137,8 +137,8 @@ private: QComboBox *m_methodCombo; QList<Declaration> m_declarations; QStringList m_words; - QMap<QString, QList<JavaScript::AST::SourceLocation> > m_ids; // ### use QMultiMap - QList<JavaScript::DiagnosticMessage> m_diagnosticMessages; + QMap<QString, QList<QmlJS::AST::SourceLocation> > m_ids; // ### use QMultiMap + QList<QmlJS::DiagnosticMessage> m_diagnosticMessages; DuiDocument::Ptr m_document; }; |