summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/declarative/qml/parser/javascriptast.cpp4
-rw-r--r--src/declarative/qml/parser/javascriptast_p.h14
-rw-r--r--src/declarative/qml/qmlscriptparser.cpp6
3 files changed, 12 insertions, 12 deletions
diff --git a/src/declarative/qml/parser/javascriptast.cpp b/src/declarative/qml/parser/javascriptast.cpp
index de06503..083dd28 100644
--- a/src/declarative/qml/parser/javascriptast.cpp
+++ b/src/declarative/qml/parser/javascriptast.cpp
@@ -813,7 +813,7 @@ void UiPublicMember::accept0(Visitor *visitor)
void UiObjectDefinition::accept0(Visitor *visitor)
{
if (visitor->visit(this)) {
- acceptChild(qualifiedObjectNameId, visitor);
+ acceptChild(qualifiedTypeNameId, visitor);
acceptChild(initializer, visitor);
}
@@ -834,7 +834,7 @@ void UiObjectBinding::accept0(Visitor *visitor)
{
if (visitor->visit(this)) {
acceptChild(qualifiedId, visitor);
- acceptChild(qualifiedObjectNameId, visitor);
+ acceptChild(qualifiedTypeNameId, visitor);
acceptChild(initializer, visitor);
}
diff --git a/src/declarative/qml/parser/javascriptast_p.h b/src/declarative/qml/parser/javascriptast_p.h
index e446e89..134f3cc 100644
--- a/src/declarative/qml/parser/javascriptast_p.h
+++ b/src/declarative/qml/parser/javascriptast_p.h
@@ -2345,13 +2345,13 @@ class UiObjectDefinition: public UiObjectMember
public:
JAVASCRIPT_DECLARE_AST_NODE(UiObjectDefinition)
- UiObjectDefinition(UiQualifiedId *qualifiedObjectNameId,
+ UiObjectDefinition(UiQualifiedId *qualifiedTypeNameId,
UiObjectInitializer *initializer)
- : qualifiedObjectNameId(qualifiedObjectNameId), initializer(initializer)
+ : qualifiedTypeNameId(qualifiedTypeNameId), initializer(initializer)
{ kind = K; }
virtual SourceLocation firstSourceLocation() const
- { return qualifiedObjectNameId->identifierToken; }
+ { return qualifiedTypeNameId->identifierToken; }
virtual SourceLocation lastSourceLocation() const
{ return initializer->rbraceToken; }
@@ -2359,7 +2359,7 @@ public:
virtual void accept0(Visitor *visitor);
// attributes
- UiQualifiedId *qualifiedObjectNameId;
+ UiQualifiedId *qualifiedTypeNameId;
UiObjectInitializer *initializer;
};
@@ -2405,10 +2405,10 @@ public:
JAVASCRIPT_DECLARE_AST_NODE(UiObjectBinding)
UiObjectBinding(UiQualifiedId *qualifiedId,
- UiQualifiedId *qualifiedObjectNameId,
+ UiQualifiedId *qualifiedTypeNameId,
UiObjectInitializer *initializer)
: qualifiedId(qualifiedId),
- qualifiedObjectNameId(qualifiedObjectNameId),
+ qualifiedTypeNameId(qualifiedTypeNameId),
initializer(initializer)
{ kind = K; }
@@ -2422,7 +2422,7 @@ public:
// attributes
UiQualifiedId *qualifiedId;
- UiQualifiedId *qualifiedObjectNameId;
+ UiQualifiedId *qualifiedTypeNameId;
UiObjectInitializer *initializer;
SourceLocation colonToken;
};
diff --git a/src/declarative/qml/qmlscriptparser.cpp b/src/declarative/qml/qmlscriptparser.cpp
index e0265c7..ead7ee5 100644
--- a/src/declarative/qml/qmlscriptparser.cpp
+++ b/src/declarative/qml/qmlscriptparser.cpp
@@ -451,7 +451,7 @@ bool ProcessAST::visit(AST::UiObjectDefinition *node)
node->lastSourceLocation());
defineObjectBinding(/*propertyName = */ 0,
- node->qualifiedObjectNameId,
+ node->qualifiedTypeNameId,
l,
node->initializer);
@@ -462,11 +462,11 @@ bool ProcessAST::visit(AST::UiObjectDefinition *node)
// UiObjectMember: UiQualifiedId T_COLON UiQualifiedId UiObjectInitializer ;
bool ProcessAST::visit(AST::UiObjectBinding *node)
{
- LocationSpan l = location(node->qualifiedObjectNameId->identifierToken,
+ LocationSpan l = location(node->qualifiedTypeNameId->identifierToken,
node->initializer->rbraceToken);
defineObjectBinding(node->qualifiedId,
- node->qualifiedObjectNameId,
+ node->qualifiedTypeNameId,
l,
node->initializer);