3 files changed, 37 insertions, 33 deletions
diff --git a/doc/src/snippets/declarative/componentCreation.js b/doc/src/snippets/declarative/componentCreation.js
index 25bc10c..c29a1f9 100644
--- a/doc/src/snippets/declarative/componentCreation.js
+++ b/doc/src/snippets/declarative/componentCreation.js
@@ -1,7 +1,39 @@
-//![0]
+//![vars]
 var component;
 var sprite;
+//![vars]
 
+//![func]
+function createSpriteObjects() {
+//![func]
+
+//![remote]
+    component = Qt.createComponent("Sprite.qml");
+    if (component.status == Component.Ready)
+        finishCreation();
+    else
+        component.statusChanged.connect(finishCreation);
+//![remote]
+
+//![local]
+    component = Qt.createComponent("Sprite.qml");
+    sprite = component.createObject(appWindow);
+
+    if (sprite == null) {
+        // Error Handling
+        console.log("Error creating object");
+    } else {
+        sprite.x = 100;
+        sprite.y = 100;
+        // ...
+    }
+//![local]
+
+//![func-end]
+}
+//![func-end]
+
+//![finishCreation]
 function finishCreation() {
     if (component.status == Component.Ready) {
         sprite = component.createObject(appWindow);
@@ -17,31 +49,4 @@ function finishCreation() {
         console.log("Error loading component:", component.errorString());
     }
 }
-//![0]
-
-function createSpriteObjects() {
-
-//![1]
-component = Qt.createComponent("Sprite.qml");
-if (component.status == Component.Ready)
-    finishCreation();
-else
-    component.statusChanged.connect(finishCreation);
-//![1]
-
-//![2]
-component = Qt.createComponent("Sprite.qml");
-sprite = component.createObject(appWindow);
-
-if (sprite == null) {
-    // Error Handling
-    console.log("Error loading component:", component.errorString());
-} else {
-    sprite.x = 100;
-    sprite.y = 100;
-    // ...
-}
-//![2]
-
-}
-
+//![finishCreation]
diff --git a/doc/src/snippets/declarative/createComponent.qml b/doc/src/snippets/declarative/createComponent.qml
index 8bfed07..0f9fad5 100644
--- a/doc/src/snippets/declarative/createComponent.qml
+++ b/doc/src/snippets/declarative/createComponent.qml
@@ -40,12 +40,12 @@
 
 //![0]
 import Qt 4.7
-import "componentCreation.js" as MyModule
+import "componentCreation.js" as MyScript
 
 Rectangle {
     id: appWindow
     width: 300; height: 300
 
-    Component.onCompleted: MyModule.createSpriteObjects();
+    Component.onCompleted: MyScript.createSpriteObjects();
 }
 //![0]
diff --git a/doc/src/snippets/declarative/createQmlObject.qml b/doc/src/snippets/declarative/createQmlObject.qml
index 380f6f1..64dd21d 100644
--- a/doc/src/snippets/declarative/createQmlObject.qml
+++ b/doc/src/snippets/declarative/createQmlObject.qml
@@ -42,14 +42,13 @@ import Qt 4.7
 
 Rectangle {
     id: parentItem
-    property QtObject newObject
 
     width: 100
     height: 100
     
     function createIt() {
 //![0]
-newObject = Qt.createQmlObject('import Qt 4.7; Rectangle {color: "red"; width: 20; height: 20}',
+var newObject = Qt.createQmlObject('import Qt 4.7; Rectangle {color: "red"; width: 20; height: 20}',
     parentItem, "dynamicSnippet1");
 //![0]
     }