QmlCompiler: Move ScopeType and JavaScriptIdentifier into QQmlJSScope

They don't begin with 'Q' and they are not very useful outside of
QQmlJSScope.

Change-Id: I3363ac4d29be7a9cb5c9f7f3af1727c99e886825
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

1 files changed, 22 insertions, 21 deletions

diff --git a/src/qmlcompiler/qqmljsscope_p.h b/src/qmlcompiler/qqmljsscope_p.h
index 9e0cfcd079..0de0a58401 100644
--- a/src/qmlcompiler/qqmljsscope_p.h
+++ b/src/qmlcompiler/qqmljsscope_p.h
@@ -52,25 +52,6 @@
 
 QT_BEGIN_NAMESPACE
 
-enum class ScopeType
-{
-    JSFunctionScope,
-    JSLexicalScope,
-    QMLScope
-};
-
-struct JavaScriptIdentifier
-{
-    enum Kind {
-        Parameter,
-        FunctionScoped,
-        LexicalScoped,
-        Injected
-    };
-
-    Kind kind = FunctionScoped;
-    QQmlJS::SourceLocation location;
-};
 
 class QQmlJSScope
 {
@@ -81,6 +62,13 @@ public:
     using ConstPtr = QSharedPointer<const QQmlJSScope>;
     using WeakConstPtr = QWeakPointer<const QQmlJSScope>;
 
+    enum ScopeType
+    {
+        JSFunctionScope,
+        JSLexicalScope,
+        QMLScope
+    };
+
     enum class AccessSemantics {
         Reference,
         Value,
@@ -119,7 +107,20 @@ public:
         int m_metaObjectRevision = 0;
     };
 
-    static QQmlJSScope::Ptr create(ScopeType type = ScopeType::QMLScope,
+    struct JavaScriptIdentifier
+    {
+        enum Kind {
+            Parameter,
+            FunctionScoped,
+            LexicalScoped,
+            Injected
+        };
+
+        Kind kind = FunctionScoped;
+        QQmlJS::SourceLocation location;
+    };
+
+    static QQmlJSScope::Ptr create(ScopeType type = QQmlJSScope::QMLScope,
                                  const QQmlJSScope::Ptr &parentScope = QQmlJSScope::Ptr());
     static QQmlJSScope::ConstPtr findCurrentQMLScope(const QQmlJSScope::ConstPtr &scope);
 
@@ -209,7 +210,7 @@ private:
     QString m_baseTypeName;
     QQmlJSScope::WeakConstPtr m_baseType;
 
-    ScopeType m_scopeType = ScopeType::QMLScope;
+    ScopeType m_scopeType = QMLScope;
     QList<Export> m_exports;
 
     QString m_defaultPropertyName;