QmlJS: Improve tests/tools/qml-ast2dot.

[qt-creator-jp/qt-creator-jp.git] / src / libs / qmljs / qmljsdocument.h

diff --git a/src/libs/qmljs/qmljsdocument.h b/src/libs/qmljs/qmljsdocument.h
index 5361246..65c500c 100644 (file)
--- a/src/libs/qmljs/qmljsdocument.h
+++ b/src/libs/qmljs/qmljsdocument.h
@@ -33,7 +33,6 @@
 #define QMLDOCUMENT_H
 
 #include <QtCore/QList>
-#include <QtCore/QMap>
 #include <QtCore/QPair>
 #include <QtCore/QSharedPointer>
 #include <QtCore/QString>
@@ -56,11 +55,13 @@ class QMLJS_EXPORT Document
 public:
     typedef QSharedPointer<Document> Ptr;
 
+    // used in a 3-bit bitfield
     enum Language
     {
         QmlLanguage = 0,
         JavaScriptLanguage = 1,
-        UnknownLanguage = 2
+        JsonLanguage = 2,
+        UnknownLanguage = 3
     };
 
 protected:
@@ -70,11 +71,11 @@ public:
     ~Document();
 
     static Document::Ptr create(const QString &fileName, Language language);
+    static Language guessLanguageFromSuffix(const QString &fileName);
 
     Document::Ptr ptr() const;
 
     bool isQmlDocument() const;
-    bool isJSDocument() const;
     Language language() const;
 
     AST::UiProgram *qmlProgram() const;
@@ -108,7 +109,6 @@ public:
 
 private:
     bool parse_helper(int kind);
-    static void extractPragmas(QString *source);
 
 private:
     QmlJS::Engine *_engine;
@@ -121,7 +121,7 @@ private:
     QString _source;
     QWeakPointer<Document> _ptr;
     int _editorRevision;
-    Language _language : 2;
+    Language _language : 3;
     bool _parsedCorrectly : 1;
 
     // for documentFromSource