From 8048bd0c3bcdb1de33aa69d961402b355d6b07af Mon Sep 17 00:00:00 2001
From: Marcelo Lira <marcelo.lira@openbossa.org>
Date: Tue, 21 Sep 2010 09:32:02 -0300
Subject: Modified the type system files to make use of nested type
 declarations.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reviewed by Luciano Wolf <luciano.wolf@openbossa.org>
Reviewed by Renato Araújo <renato.filho@openbossa.org>
---
 PySide/QtDeclarative/typesystem_declarative.xml | 31 ++++++++++++++-----------
 1 file changed, 18 insertions(+), 13 deletions(-)

(limited to 'PySide/QtDeclarative')

diff --git a/PySide/QtDeclarative/typesystem_declarative.xml b/PySide/QtDeclarative/typesystem_declarative.xml
index 3d0f56cea..888ca6fd9 100644
--- a/PySide/QtDeclarative/typesystem_declarative.xml
+++ b/PySide/QtDeclarative/typesystem_declarative.xml
@@ -25,24 +25,27 @@
 
 
     <object-type name="QDeclarativeExtensionInterface"/>
-    <object-type name="QDeclarativeComponent" />
-    <enum-type name="QDeclarativeComponent::Status" />
+    <object-type name="QDeclarativeComponent">
+        <enum-type name="Status"/>
+    </object-type>
     <object-type name="QDeclarativeContext" />
     <object-type name="QDeclarativeEngine">
+        <enum-type name="ObjectOwnership" />
         <modify-function signature="setNetworkAccessManagerFactory(QDeclarativeNetworkAccessManagerFactory*)">
             <modify-argument index="1">
                 <parent index="this" action="add" />
             </modify-argument>
         </modify-function>
     </object-type>
-    <enum-type name="QDeclarativeEngine::ObjectOwnership" />
     <value-type name="QDeclarativeError" />
     <object-type name="QDeclarativeExpression" />
     <object-type name="QDeclarativeExtensionPlugin" />
-    <enum-type name="QDeclarativeImageProvider::ImageType" />
-    <object-type name="QDeclarativeImageProvider" />
-    <object-type name="QDeclarativeItem" />
-    <enum-type name="QDeclarativeItem::TransformOrigin" />
+    <object-type name="QDeclarativeImageProvider">
+        <enum-type name="ImageType" />
+    </object-type>
+    <object-type name="QDeclarativeItem">
+        <enum-type name="TransformOrigin" />
+    </object-type>
 
     <value-type name="QDeclarativeListReference" />
     <object-type name="QDeclarativeNetworkAccessManagerFactory" >
@@ -54,14 +57,16 @@
     </object-type>
     <object-type name="QDeclarativeParserStatus" />
 
-    <value-type name="QDeclarativeProperty" />
-    <enum-type name="QDeclarativeProperty::PropertyTypeCategory" />
-    <enum-type name="QDeclarativeProperty::Type" />
+    <value-type name="QDeclarativeProperty">
+        <enum-type name="PropertyTypeCategory" />
+        <enum-type name="Type" />
+    </value-type>
 
     <object-type name="QDeclarativePropertyMap" />
     <object-type name="QDeclarativePropertyValueSource" />
     <value-type name="QDeclarativeScriptString" />
-    <object-type name="QDeclarativeView" />
-    <enum-type name="QDeclarativeView::ResizeMode" />
-    <enum-type name="QDeclarativeView::Status" />
+    <object-type name="QDeclarativeView">
+        <enum-type name="ResizeMode" />
+        <enum-type name="Status" />
+    </object-type>
 </typesystem>
-- 
cgit v1.2.3