aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/qml/jsruntime/qv4executablecompilationunit_p.h78
-rw-r--r--src/qml/qml/qqmltypedata.cpp5
-rw-r--r--src/qml/qml/qqmltypedata_p.h2
3 files changed, 1 insertions, 84 deletions
diff --git a/src/qml/jsruntime/qv4executablecompilationunit_p.h b/src/qml/jsruntime/qv4executablecompilationunit_p.h
index 014bb5e5e5..58d252c36c 100644
--- a/src/qml/jsruntime/qv4executablecompilationunit_p.h
+++ b/src/qml/jsruntime/qv4executablecompilationunit_p.h
@@ -84,16 +84,6 @@ public:
return m_compilationUnit->typeNameCache;
}
- void setTypeNameCache(const QQmlRefPointer<QQmlTypeNameCache> &typeNameCache)
- {
- m_compilationUnit->typeNameCache = typeNameCache;
- }
-
- const QQmlPropertyCacheVector *propertyCachesPtr() const
- {
- return &m_compilationUnit->propertyCaches;
- }
-
QQmlPropertyCacheVector *propertyCachesPtr()
{
return &m_compilationUnit->propertyCaches;
@@ -109,13 +99,6 @@ public:
QHash<int, IdentifierHash> namedObjectsPerComponentCache;
inline IdentifierHash namedObjectsPerComponent(int componentObjectIndex);
- const QString *icRootName() const { return m_compilationUnit->icRootName.get(); }
- QString *icRootName() { return m_compilationUnit->icRootName.get(); }
- void setIcRootName(std::unique_ptr<QString> &&icRootName)
- {
- m_compilationUnit->icRootName = std::move(icRootName);
- }
-
int totalBindingsCount() const { return m_compilationUnit->totalBindingsCount(); }
int totalParserStatusCount() const { return m_compilationUnit->totalParserStatusCount(); }
int totalObjectCount() const { return m_compilationUnit->totalObjectCount(); }
@@ -125,29 +108,12 @@ public:
return m_compilationUnit->resolvedType(id);
}
- ResolvedTypeReference *resolvedType(QMetaType type) const
- {
- return m_compilationUnit->resolvedType(type);
- }
-
- void setResolvedTypes(const CompiledData::ResolvedTypeReferenceMap &resolvedTypes)
- {
- m_compilationUnit->resolvedTypes = resolvedTypes;
- }
-
- bool verifyChecksum(const CompiledData::DependentTypesHasher &dependencyHasher) const
- {
- return m_compilationUnit->verifyChecksum(dependencyHasher);
- }
-
QQmlType qmlTypeForComponent(const QString &inlineComponentName = QString()) const
{
return m_compilationUnit->qmlTypeForComponent(inlineComponentName);
}
- QQmlType qmlType() const { return m_compilationUnit->qmlType; }
-
- QMetaType metaType() const { return qmlType().typeId(); }
+ QMetaType metaType() const { return m_compilationUnit->qmlType.typeId(); }
int inlineComponentId(const QString &inlineComponentName) const
{
@@ -160,12 +126,6 @@ public:
using CompiledBinding = CompiledData::CompilationUnit::CompiledBinding;
using IdToObjectMap = CompiledData::CompilationUnit::IdToObjectMap;
- using ListPropertyAssignBehavior = CompiledData::CompilationUnit::ListPropertyAssignBehavior;
- ListPropertyAssignBehavior listPropertyAssignBehavior() const
- {
- return m_compilationUnit->listPropertyAssignBehavior();
- }
-
bool nativeMethodsAcceptThisObjects() const
{
return m_compilationUnit->nativeMethodsAcceptThisObjects();
@@ -176,7 +136,6 @@ public:
bool valueTypesAreAddressable() const { return m_compilationUnit->valueTypesAreAddressable(); }
bool componentsAreBound() const { return m_compilationUnit->componentsAreBound(); }
bool isESModule() const { return m_compilationUnit->isESModule(); }
- bool isSharedLibrary() const { return m_compilationUnit->isSharedLibrary(); }
int objectCount() const { return m_compilationUnit->objectCount(); }
const CompiledObject *objectAt(int index) const
@@ -184,26 +143,8 @@ public:
return m_compilationUnit->objectAt(index);
}
- int importCount() const { return m_compilationUnit->importCount(); }
- const CompiledData::Import *importAt(int index) const
- {
- return m_compilationUnit->importAt(index);
- }
-
Heap::Object *templateObjectAt(int index) const;
- using FunctionIterator = CompiledData::CompilationUnit::FunctionIterator;
- FunctionIterator objectFunctionsBegin(const CompiledObject *object) const
- {
- return m_compilationUnit->objectFunctionsBegin(object);
- }
-
- FunctionIterator objectFunctionsEnd(const CompiledObject *object) const
- {
- return m_compilationUnit->objectFunctionsEnd(object);
- }
-
-
Heap::Module *instantiate();
const Value *resolveExport(QV4::String *exportName)
{
@@ -252,7 +193,6 @@ public:
void setModule(Heap::Module *module) { m_module = module; }
const CompiledData::Unit *unitData() const { return m_compilationUnit->data; }
- const CompiledData::QmlUnit *qmlData() const { return m_compilationUnit->qmlData; }
QString stringAt(uint index) const { return m_compilationUnit->stringAt(index); }
@@ -261,11 +201,6 @@ public:
return &m_compilationUnit->dependentScripts;
}
- QVector<QQmlRefPointer<QQmlScriptData>> *dependentScriptsPtr()
- {
- return &m_compilationUnit->dependentScripts;
- }
-
const CompiledData::BindingPropertyData *bindingPropertyDataPerObjectAt(
qsizetype objectIndex) const
{
@@ -288,17 +223,6 @@ public:
: nullptr;
}
- const QHash<QString, CompiledData::InlineComponentData> &inlineComponentData() const
- {
- return m_compilationUnit->inlineComponentData;
- }
-
- void setInlineComponentData(
- const QHash<QString, CompiledData::InlineComponentData> &inlineComponentData)
- {
- m_compilationUnit->inlineComponentData = inlineComponentData;
- }
-
void populate();
void clear();
diff --git a/src/qml/qml/qqmltypedata.cpp b/src/qml/qml/qqmltypedata.cpp
index b17a48568c..bc456d5a7e 100644
--- a/src/qml/qml/qqmltypedata.cpp
+++ b/src/qml/qml/qqmltypedata.cpp
@@ -51,11 +51,6 @@ QQmlTypeData::~QQmlTypeData()
m_resolvedTypes.clear();
}
-const QList<QQmlTypeData::ScriptReference> &QQmlTypeData::resolvedScripts() const
-{
- return m_scripts;
-}
-
QV4::CompiledData::CompilationUnit *QQmlTypeData::compilationUnit() const
{
return m_compiledData.data();
diff --git a/src/qml/qml/qqmltypedata_p.h b/src/qml/qml/qqmltypedata_p.h
index a0443f80c9..97419b916b 100644
--- a/src/qml/qml/qqmltypedata_p.h
+++ b/src/qml/qml/qqmltypedata_p.h
@@ -55,8 +55,6 @@ private:
public:
~QQmlTypeData() override;
- const QList<ScriptReference> &resolvedScripts() const;
-
QV4::CompiledData::CompilationUnit *compilationUnit() const;
// Used by QQmlComponent to get notifications