Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

1 files changed, 8 insertions, 15 deletions

diff --git a/src/declarative/qml/parser/javascriptast_p.h b/src/declarative/qml/parser/javascriptast_p.h
index 571fdff..134f3cc 100644
--- a/src/declarative/qml/parser/javascriptast_p.h
+++ b/src/declarative/qml/parser/javascriptast_p.h
@@ -2345,28 +2345,22 @@ class UiObjectDefinition: public UiObjectMember
 public:
     JAVASCRIPT_DECLARE_AST_NODE(UiObjectDefinition)
 
-    UiObjectDefinition(NameId *name,
+    UiObjectDefinition(UiQualifiedId *qualifiedTypeNameId,
                        UiObjectInitializer *initializer)
-        : name(name), initializer(initializer)
+        : qualifiedTypeNameId(qualifiedTypeNameId), initializer(initializer)
     { kind = K; }
 
     virtual SourceLocation firstSourceLocation() const
-    { return identifierToken; }
+    { return qualifiedTypeNameId->identifierToken; }
 
     virtual SourceLocation lastSourceLocation() const
-    {
-      if (initializer)
-	return initializer->rbraceToken;
-
-      return identifierToken;
-    }
+    { return initializer->rbraceToken; }
 
     virtual void accept0(Visitor *visitor);
 
 // attributes
-    NameId *name;
+    UiQualifiedId *qualifiedTypeNameId;
     UiObjectInitializer *initializer;
-    SourceLocation identifierToken;
 };
 
 class UiSourceElement: public UiObjectMember
@@ -2411,10 +2405,10 @@ public:
     JAVASCRIPT_DECLARE_AST_NODE(UiObjectBinding)
 
     UiObjectBinding(UiQualifiedId *qualifiedId,
-                    NameId *name,
+                    UiQualifiedId *qualifiedTypeNameId,
                     UiObjectInitializer *initializer)
         : qualifiedId(qualifiedId),
-          name(name),
+          qualifiedTypeNameId(qualifiedTypeNameId),
           initializer(initializer)
     { kind = K; }
 
@@ -2428,10 +2422,9 @@ public:
 
 // attributes
     UiQualifiedId *qualifiedId;
-    NameId *name;
+    UiQualifiedId *qualifiedTypeNameId;
     UiObjectInitializer *initializer;
     SourceLocation colonToken;
-    SourceLocation identifierToken;
 };
 
 class UiScriptBinding: public UiObjectMember