aboutsummaryrefslogtreecommitdiffstats
path: root/src/qmlcompiler/qqmljsscope_p.h
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2020-10-01 14:28:08 +0200
committerUlf Hermann <ulf.hermann@qt.io>2020-10-05 14:58:42 +0200
commit2059c8be904541a31e75c1de9d3b5afa37c6954d (patch)
tree38cf8eb8876f31581c87e506248d5a4610db4a1d /src/qmlcompiler/qqmljsscope_p.h
parentd200ccf92017ebc10a4ccdb5d944e1d803b87c1d (diff)
QmlCompiler: Rename metatypes_p.h
Those are specific to QML/JS. Change-Id: I45a5d4eb6c53bd5ca4026e042af83c4afaa4953c Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qmlcompiler/qqmljsscope_p.h')
-rw-r--r--src/qmlcompiler/qqmljsscope_p.h24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/qmlcompiler/qqmljsscope_p.h b/src/qmlcompiler/qqmljsscope_p.h
index 9d38ee7047..3fb501f976 100644
--- a/src/qmlcompiler/qqmljsscope_p.h
+++ b/src/qmlcompiler/qqmljsscope_p.h
@@ -39,7 +39,7 @@
//
// We mean it.
-#include "metatypes_p.h"
+#include "qqmljsmetatypes_p.h"
#include <QtQml/private/qqmljssourcelocation_p.h>
@@ -126,18 +126,18 @@ public:
void insertJSIdentifier(const QString &name, const JavaScriptIdentifier &identifier);
// inserts property as qml identifier as well as the corresponding
- void insertPropertyIdentifier(const MetaProperty &prop);
+ void insertPropertyIdentifier(const QQmlJSMetaProperty &prop);
bool isIdInCurrentScope(const QString &id) const;
ScopeType scopeType() const { return m_scopeType; }
- void addMethods(const QMultiHash<QString, MetaMethod> &methods) { m_methods.unite(methods); }
- void addMethod(const MetaMethod &method) { m_methods.insert(method.methodName(), method); }
- QMultiHash<QString, MetaMethod> methods() const { return m_methods; }
+ void addMethods(const QMultiHash<QString, QQmlJSMetaMethod> &methods) { m_methods.unite(methods); }
+ void addMethod(const QQmlJSMetaMethod &method) { m_methods.insert(method.methodName(), method); }
+ QMultiHash<QString, QQmlJSMetaMethod> methods() const { return m_methods; }
- void addEnum(const MetaEnum &fakeEnum) { m_enums.insert(fakeEnum.name(), fakeEnum); }
- QHash<QString, MetaEnum> enums() const { return m_enums; }
+ void addEnum(const QQmlJSMetaEnum &fakeEnum) { m_enums.insert(fakeEnum.name(), fakeEnum); }
+ QHash<QString, QQmlJSMetaEnum> enums() const { return m_enums; }
QString fileName() const { return m_fileName; }
void setFileName(const QString &file) { m_fileName = file; }
@@ -157,8 +157,8 @@ public:
QString baseTypeName() const { return m_baseTypeName; }
QQmlJSScope::ConstPtr baseType() const { return m_baseType; }
- void addProperty(const MetaProperty &prop) { m_properties.insert(prop.propertyName(), prop); }
- QHash<QString, MetaProperty> properties() const { return m_properties; }
+ void addProperty(const QQmlJSMetaProperty &prop) { m_properties.insert(prop.propertyName(), prop); }
+ QHash<QString, QQmlJSMetaProperty> properties() const { return m_properties; }
QString defaultPropertyName() const { return m_defaultPropertyName; }
void setDefaultPropertyName(const QString &name) { m_defaultPropertyName = name; }
@@ -195,9 +195,9 @@ private:
QHash<QString, JavaScriptIdentifier> m_jsIdentifiers;
- QMultiHash<QString, MetaMethod> m_methods;
- QHash<QString, MetaProperty> m_properties;
- QHash<QString, MetaEnum> m_enums;
+ QMultiHash<QString, QQmlJSMetaMethod> m_methods;
+ QHash<QString, QQmlJSMetaProperty> m_properties;
+ QHash<QString, QQmlJSMetaEnum> m_enums;
QVector<QQmlJSScope::Ptr> m_childScopes;
QQmlJSScope::WeakPtr m_parentScope;