lowercase ids

11 files changed, 202 insertions, 201 deletions

diff --git a/demos/declarative/minehunt/Description.qml b/demos/declarative/minehunt/Description.qml
index df4881c..440dd2e 100644
--- a/demos/declarative/minehunt/Description.qml
+++ b/demos/declarative/minehunt/Description.qml
@@ -1,12 +1,12 @@
 import Qt 4.6
 
 Item {
-    id: Page
-    height: MyText.height + 20
+    id: page
+    height: myText.height + 20
     property var text
     MouseRegion {
         anchors.fill: parent
-        drag.target: Page
+        drag.target: page
         drag.axis: "XandYAxis"
         drag.minimumX: 0
         drag.maximumX: 1000
@@ -24,8 +24,8 @@ Item {
         width: parent.width - 20
         height: parent.height - 20
         Text {
-            id: MyText
-            text: Page.text
+            id: myText
+            text: page.text
             width: parent.width
             clip: true
             wrap: true
diff --git a/demos/declarative/samegame/content/Button.qml b/demos/declarative/samegame/content/Button.qml
index 2354218..301124e 100644
--- a/demos/declarative/samegame/content/Button.qml
+++ b/demos/declarative/samegame/content/Button.qml
@@ -1,7 +1,7 @@
 import Qt 4.6
 
 Rectangle {
-    id: Container
+    id: container
 
     signal clicked
     property string text: "Button"
@@ -17,9 +17,9 @@ Rectangle {
         GradientStop { position: 1.0; color: activePalette.button }
     }
 
-    MouseRegion { id: mr; anchors.fill: parent; onClicked: Container.clicked() }
+    MouseRegion { id: mr; anchors.fill: parent; onClicked: container.clicked() }
 
     Text {
-        id: txtItem; text: Container.text; anchors.centerIn: Container; color: activePalette.buttonText
+        id: txtItem; text: container.text; anchors.centerIn: container; color: activePalette.buttonText
     }
 }
diff --git a/demos/declarative/samegame/content/Dialog.qml b/demos/declarative/samegame/content/Dialog.qml
index 401d211..661257b 100644
--- a/demos/declarative/samegame/content/Dialog.qml
+++ b/demos/declarative/samegame/content/Dialog.qml
@@ -7,15 +7,15 @@ Rectangle {
         page.opacity = 0;
     }
     function show(txt) {
-        MyText.text = txt;
+        myText.text = txt;
         page.opacity = 1;
     }
     signal closed();
-    color: "white"; border.width: 1; width: MyText.width + 20; height: 60;
+    color: "white"; border.width: 1; width: myText.width + 20; height: 60;
     opacity: 0
-    opacity: Behavior { 
+    opacity: Behavior {
         NumberAnimation { duration: 1000 }
     }
-    Text { id: MyText; anchors.centerIn: parent; text: "Hello World!" }
+    Text { id: myText; anchors.centerIn: parent; text: "Hello World!" }
     MouseRegion { id: mr; anchors.fill: parent; onClicked: forceClose(); }
 }
diff --git a/demos/declarative/samegame/samegame.qml b/demos/declarative/samegame/samegame.qml
index ede4362..92d85f3 100644
--- a/demos/declarative/samegame/samegame.qml
+++ b/demos/declarative/samegame/samegame.qml
@@ -2,7 +2,7 @@ import Qt 4.6
 import "content"
 
 Rectangle {
-    id: Screen
+    id: screen
     width: 490; height: 720
 
     Script { source: "content/samegame.js" }
@@ -10,7 +10,7 @@ Rectangle {
     SystemPalette { id: activePalette; colorGroup: Qt.Active }
 
     Item {
-        width: parent.width; anchors.top: parent.top; anchors.bottom: ToolBar.top
+        width: parent.width; anchors.top: parent.top; anchors.bottom: toolBar.top
 
         Image {
             id: background
@@ -34,14 +34,14 @@ Rectangle {
     }
 
     Dialog { id: dialog; anchors.centerIn: parent; z: 21 }
-    Dialog { 
-        id: scoreName; anchors.centerIn: parent; z: 22; 
+    Dialog {
+        id: scoreName; anchors.centerIn: parent; z: 22;
         TextInput {
-            id: Editor
-            onAccepted: { 
-                if(scoreName.opacity==1&&Editor.text!="")
-                    sendHighScore(Editor.text);
-                scoreName.forceClose(); 
+            id: editor
+            onAccepted: {
+                if(scoreName.opacity==1&&editor.text!="")
+                    sendHighScore(editor.text);
+                scoreName.forceClose();
             }
             anchors.verticalCenter: parent.verticalCenter
             width: 72; focus: true
@@ -50,10 +50,10 @@ Rectangle {
     }
 
     Rectangle {
-        id: ToolBar
+        id: toolBar
         color: activePalette.window
         height: 32; width: parent.width
-        anchors.bottom: Screen.bottom
+        anchors.bottom: screen.bottom
 
         Button {
             id: btnA; text: "New Game"; onClicked: {initBoard();}
@@ -62,7 +62,7 @@ Rectangle {
         }
 
         Text {
-            id: Score
+            id: score
             text: "Score: " + gameCanvas.score; font.bold: true
             anchors.right: parent.right; anchors.rightMargin: 3
             anchors.verticalCenter: parent.verticalCenter
diff --git a/demos/declarative/twitter/content/AuthView.qml b/demos/declarative/twitter/content/AuthView.qml
index 3fe7e7e..73ce308 100644
--- a/demos/declarative/twitter/content/AuthView.qml
+++ b/demos/declarative/twitter/content/AuthView.qml
@@ -1,6 +1,6 @@
 import Qt 4.6
 import "../../flickr/common"
-import "../../flickr/mobile" 
+import "../../flickr/mobile"
 
 Item {
     id: wrapper
@@ -9,7 +9,7 @@ Item {
         spacing: 20
         Row{
             spacing: 4
-            Text { 
+            Text {
                 width: 100
                 text: "Screen name:"
                 font.pointSize: 10; font.bold: true; color: "white"; style: "Raised"; styleColor: "black"
@@ -29,7 +29,7 @@ Item {
                     font.bold: true
                     color: "#151515"; selectionColor: "green"
                     Keys.forwardTo: [(tabber), (nameIn)]
-                    Item { 
+                    Item {
                         id: tabber
                         //Note: it's not working yet
                         Keys.onPressed: {if(event.key == Qt.Key_Tab){print('Tab works!'); passIn.focus = true; accept(); }}
@@ -39,7 +39,7 @@ Item {
         }
         Row{
             spacing: 4
-            Text { 
+            Text {
                 width: 100
                 text: "Password:"
                 font.pointSize: 10; font.bold: true; color: "white"; style: "Raised"; styleColor: "black"
@@ -71,7 +71,7 @@ Item {
                 height: 32
                 id: login
                 text: "Log in"
-                onClicked: {RssModel.authName=nameIn.text; RssModel.authPass=passIn.text; RssModel.tags='my timeline';}
+                onClicked: {rssModel.authName=nameIn.text; rssModel.authPass=passIn.text; rssModel.tags='my timeline';}
             }
             Button {
                 x: 120
@@ -79,7 +79,7 @@ Item {
                 height: 32
                 id: guest
                 text: "Guest"
-                onClicked: {RssModel.authName='-'; Screen.setMode(true);}
+                onClicked: {rssModel.authName='-'; screen.setMode(true);}
             }
         }
     }
diff --git a/demos/declarative/twitter/content/FatDelegate.qml b/demos/declarative/twitter/content/FatDelegate.qml
index a2e9c39..32a921e 100644
--- a/demos/declarative/twitter/content/FatDelegate.qml
+++ b/demos/declarative/twitter/content/FatDelegate.qml
@@ -4,12 +4,12 @@ import "../../flickr/common"
 Component {
     id: ListDelegate
     Item {
-        id: Wrapper; width: Wrapper.ListView.view.width; height: if(txt.height > 58){txt.height+8}else{58}//50+4+4
+        id: wrapper; width: wrapper.ListView.view.width; height: if(txt.height > 58){txt.height+8}else{58}//50+4+4
         Script {
             function handleLink(link){
                 if(link.slice(0,3) == 'app'){
                     setUser(link.slice(7));
-                    Screen.setMode(true);
+                    screen.setMode(true);
                 }else if(link.slice(0,4) == 'http'){
                     Qt.DesktopServices.openUrl(link);
                 }
@@ -21,17 +21,17 @@ Component {
             }
         }
         Item {
-            id: MoveMe; height: parent.height
-            Rectangle { 
-                id: BlackRect
-                color: "black"; opacity: Wrapper.ListView.index % 2 ? 0.2 : 0.3; height: Wrapper.height-2; width: Wrapper.width; y: 1 
+            id: moveMe; height: parent.height
+            Rectangle {
+                id: blackRect
+                color: "black"; opacity: wrapper.ListView.index % 2 ? 0.2 : 0.3; height: wrapper.height-2; width: wrapper.width; y: 1
             }
             Rectangle {
-                id: WhiteRect; x: 6; width: 50; height: 50; color: "white"; smooth: true
+                id: whiteRect; x: 6; width: 50; height: 50; color: "white"; smooth: true
                 anchors.verticalCenter: parent.verticalCenter
 
-                Loading { x: 1; y: 1; width: 48; height: 48; visible: RealImage.status != 1 } 
-                Image { id: RealImage; source: userImage; x: 1; y: 1; width:48; height:48 }
+                Loading { x: 1; y: 1; width: 48; height: 48; visible: realImage.status != 1 }
+                Image { id: realImage; source: userImage; x: 1; y: 1; width:48; height:48 }
             }
             Text { id:txt; y:4; x: 56
                 text: '<html><style type="text/css">a:link {color:"#aaccaa"}; a:visited {color:"#336633"}</style>'
@@ -39,7 +39,7 @@ Component {
                     + "<br /><b>" + addTags(statusText) + "</b></html>";
                 textFormat: Qt.RichText
                 color: "white"; color: "#cccccc"; style: "Raised"; styleColor: "black"; wrap: true
-                anchors.left: WhiteRect.right; anchors.right: BlackRect.right; anchors.leftMargin: 6; anchors.rightMargin: 6
+                anchors.left: whiteRect.right; anchors.right: blackRect.right; anchors.leftMargin: 6; anchors.rightMargin: 6
                 onLinkActivated: handleLink(link)
             }
         }
diff --git a/demos/declarative/twitter/content/HomeTitleBar.qml b/demos/declarative/twitter/content/HomeTitleBar.qml
index bd3bc2c..3108a9b 100644
--- a/demos/declarative/twitter/content/HomeTitleBar.qml
+++ b/demos/declarative/twitter/content/HomeTitleBar.qml
@@ -10,80 +10,80 @@ Item {
 
     BorderImage { source: "../../flickr/mobile/images/titlebar.sci"; width: parent.width; height: parent.height + 14; y: -7 }
     Item {
-        id: Container
+        id: container
         width: (parent.width * 2) - 55 ; height: parent.height
 
         Script {
             function accept() {
-                if(RssModel.authName == '' || RssModel.authPass == '')
+                if(rssModel.authName == '' || rssModel.authPass == '')
                     return false;//Can't login like that
 
-                var postData = "status=" + Editor.text;
+                var postData = "status=" + editor.text;
                 var postman = new XMLHttpRequest();
-                postman.open("POST", "http://twitter.com/statuses/update.xml", true, RssModel.authName,  RssModel.authPass);
-                postman.onreadystatechange = function() { 
+                postman.open("POST", "http://twitter.com/statuses/update.xml", true, rssModel.authName,  rssModel.authPass);
+                postman.onreadystatechange = function() {
                     if (postman.readyState == postman.DONE) {
                         titleBar.update();
                     }
                 }
                 postman.send(postData);
 
-                Editor.text = ""
+                editor.text = ""
                 titleBar.state = ""
             }
         }
 
         Rectangle {
-            id: WhiteRect; x: 6; width: 50; height: 50; color: "white"; smooth: true
+            x: 6; width: 50; height: 50; color: "white"; smooth: true
             anchors.verticalCenter: parent.verticalCenter
 
-            UserModel { user: RssModel.authName; id: userModel }
-            Component { id: imgDelegate; 
-                Item { id: Wrapper
-                    Loading { width:48; height:48; visible: realImage.status != 1 } 
-                    Image { source: image; width:48; height:48; id: realImage } 
+            UserModel { user: rssModel.authName; id: userModel }
+            Component { id: imgDelegate;
+                Item {
+                    Loading { width:48; height:48; visible: realImage.status != 1 }
+                    Image { source: image; width:48; height:48; id: realImage }
                 }
-            } 
+            }
             ListView { model: userModel.model; x:1; y:1; delegate: imgDelegate }
         }
 
         Text {
-            id: CategoryText
-            anchors.left: parent.left; anchors.right: TagButton.left
+            id: categoryText
+            anchors.left: parent.left; anchors.right: tagButton.left
             anchors.leftMargin: 58; anchors.rightMargin: 10
             anchors.verticalCenter: parent.verticalCenter
             elide: "ElideLeft"
-            text: "Timeline for " + RssModel.authName
+            text: "Timeline for " + rssModel.authName
             font.pointSize: 10; font.bold: true; color: "white"; style: "Raised"; styleColor: "black"
         }
 
         Button {
-            id: TagButton; x: titleBar.width - 90; width: 85; height: 32; text: "New Post..."
+            id: tagButton; x: titleBar.width - 90; width: 85; height: 32; text: "New Post..."
             anchors.verticalCenter: parent.verticalCenter;
             onClicked: if (titleBar.state == "Posting") accept(); else titleBar.state = "Posting"
         }
 
         Text {
-            id: charsLeftText; anchors.horizontalCenter: TagButton.horizontalCenter;
-            anchors.top: TagButton.bottom; anchors.topMargin: 2
-            text: {140 - Editor.text.length;} visible: titleBar.state == "Posting"
+            id: charsLeftText; anchors.horizontalCenter: tagButton.horizontalCenter;
+            anchors.top: tagButton.bottom; anchors.topMargin: 2
+            text: {140 - editor.text.length;} visible: titleBar.state == "Posting"
             font.pointSize: 10; font.bold: true; color: "white"; style: "Raised"; styleColor: "black"
         }
         Item {
             id: txtEdit;
-            anchors.left: TagButton.right; anchors.leftMargin: 5; y: 4
+            anchors.left: tagButton.right; anchors.leftMargin: 5; y: 4
             anchors.right: parent.right; anchors.rightMargin: 40; height: parent.height - 9
             BorderImage { source: "../../flickr/mobile/images/lineedit.sci"; anchors.fill: parent }
 
             Binding {//TODO: Can this be a function, which also resets the cursor? And flashes?
-                when: Editor.text.length > 140
-                target: Editor
+                when: editor.text.length > 140
+                target: editor
                 property: "text"
-                value: Editor.text.slice(0,140)
+                value: editor.text.slice(0,140)
             }
             TextEdit {
-                id: Editor
-                anchors.left: parent.left; 
+                id: editor
+                anchors.left: parent.left;
                 anchors.leftMargin: 8;
                 anchors.bottom: parent.bottom
                 anchors.bottomMargin: 4;
@@ -94,9 +94,9 @@ Item {
                 wrap:true
                 color: "#151515"; selectionColor: "green"
             }
-            Keys.forwardTo: [(ReturnKey), (Editor)]
+            Keys.forwardTo: [(returnKey), (editor)]
             Item {
-                id: ReturnKey
+                id: returnKey
                 Keys.onReturnPressed: accept()
                 Keys.onEscapePressed: titleBar.state = ""
             }
@@ -105,11 +105,11 @@ Item {
     states: [
         State {
             name: "Posting"
-            PropertyChanges { target: Container; x: -TagButton.x + 5 }
+            PropertyChanges { target: container; x: -tagButton.x + 5 }
             PropertyChanges { target: titleBar; height: 80 }
-            PropertyChanges { target: TagButton; text: "OK" }
-            PropertyChanges { target: TagButton; width: 28 }
-            PropertyChanges { target: TagButton; height: 24 }
+            PropertyChanges { target: tagButton; text: "OK" }
+            PropertyChanges { target: tagButton; width: 28 }
+            PropertyChanges { target: tagButton; height: 24 }
             PropertyChanges { target: txtEdit; focus: true }
         }
     ]
diff --git a/demos/declarative/twitter/content/MultiTitleBar.qml b/demos/declarative/twitter/content/MultiTitleBar.qml
index 6a6a28f..da0794d 100644
--- a/demos/declarative/twitter/content/MultiTitleBar.qml
+++ b/demos/declarative/twitter/content/MultiTitleBar.qml
@@ -2,20 +2,20 @@ import Qt 4.6
 import "../../flickr/mobile"
 
 Item {
-    height: HomeBar.height
-    HomeTitleBar { id: HomeBar; width: parent.width; height: 60; 
-        onUpdate: RssModel.reload()
+    height: homeBar.height
+    HomeTitleBar { id: homeBar; width: parent.width; height: 60;
+        onUpdate: rssModel.reload()
     }
-    TitleBar { id: TitleBar; width: parent.width; height: 60;
+    TitleBar { id: titleBar; width: parent.width; height: 60;
         y: -80
         untaggedString: "Latest tweets from everyone"
         taggedString: "Latest tweets from "
     }
     states: [
         State {
-            name: "search"; when: Screen.userView
-            PropertyChanges { target: TitleBar; y: 0 }
-            PropertyChanges { target: HomeBar; y: -80 }
+            name: "search"; when: screen.userView
+            PropertyChanges { target: titleBar; y: 0 }
+            PropertyChanges { target: homeBar; y: -80 }
         }
     ]
     transitions: [
diff --git a/demos/declarative/twitter/twitter.qml b/demos/declarative/twitter/twitter.qml
index eb9f5d6..e9752ff 100644
--- a/demos/declarative/twitter/twitter.qml
+++ b/demos/declarative/twitter/twitter.qml
@@ -4,43 +4,44 @@ import "../flickr/common" as Common
 import "../flickr/mobile" as Mobile
 
 Item {
-    id: Screen; width: 320; height: 480
-    property bool userView : false 
+    id: screen; width: 320; height: 480
+    property bool userView : false
+    property var tmpStr
     function setMode(m){
-        Screen.userView = m;
-        if(m == false){ 
-            RssModel.tags='my timeline';
-            RssModel.reload();
-            ToolBar.button2Label = "View others";
+        screen.userView = m;
+        if(m == false){
+            rssModel.tags='my timeline';
+            rssModel.reload();
+            toolBar.button2Label = "View others";
         } else {
-            ToolBar.button2Label = "Return home";
+            toolBar.button2Label = "Return home";
         }
     }
     //Workaround for bug 260266
     Timer{ interval: 1; running: false; repeat: false; onTriggered: reallySetUser(); id:hack }
-    Script{
-        var tmpStr;
+    Script {
+//        var tmpStr;
         function setUser(str){hack.running = true; tmpStr = str}
-        function reallySetUser(){RssModel.tags = tmpStr;}
+        function reallySetUser(){rssModel.tags = tmpStr;}
     }
 
     Rectangle {
-        id: Background
+        id: background
         anchors.fill: parent; color: "#343434";
 
         Image { source: "mobile/images/stripes.png"; fillMode: "Tile"; anchors.fill: parent; opacity: 0.3 }
 
-        Twitter.RssModel { id: RssModel }
-        Common.Loading { anchors.centerIn: parent; visible: RssModel.status==XmlListModel.Loading && state!='unauthed'}
-        Text { 
+        Twitter.RssModel { id: rssModel }
+        Common.Loading { anchors.centerIn: parent; visible: rssModel.status==XmlListModel.Loading && state!='unauthed'}
+        Text {
             width: 180
-            text: "Could not access twitter using this screen name and password pair."; 
+            text: "Could not access twitter using this screen name and password pair.";
             color: "white"; color: "#cccccc"; style: "Raised"; styleColor: "black"; wrap: true
-            visible: RssModel.status==XmlListModel.Error; anchors.centerIn: parent
+            visible: rssModel.status==XmlListModel.Error; anchors.centerIn: parent
         }
 
         Item {
-            id: Views
+            id: views
             x: 2; width: parent.width - 4
             y:60 //Below the title bars
             height: 380
@@ -48,44 +49,44 @@ Item {
             Twitter.AuthView{
                 id: authView
                 anchors.verticalCenter: parent.verticalCenter
-                width: parent.width; height: parent.height-60; 
-                x: -(Screen.width * 1.5)
+                width: parent.width; height: parent.height-60;
+                x: -(screen.width * 1.5)
             }
 
-            Twitter.FatDelegate { id: FatDelegate }
+            Twitter.FatDelegate { id: fatDelegate }
             ListView {
-                id: MainView; model: RssModel.model; delegate: FatDelegate;
+                id: mainView; model: rssModel.model; delegate: fatDelegate;
                 width: parent.width; height: parent.height; x: 0; cacheBuffer: 100;
             }
         }
 
-        Twitter.MultiTitleBar { id: TitleBar; width: parent.width }
-        Mobile.ToolBar { id: ToolBar; height: 40; 
-            //anchors.bottom: parent.bottom; 
+        Twitter.MultiTitleBar { id: titleBar; width: parent.width }
+        Mobile.ToolBar { id: toolBar; height: 40;
+            //anchors.bottom: parent.bottom;
             //TODO: Use anchor changes instead of hard coding
             y: 440
-            width: parent.width; opacity: 0.9 
+            width: parent.width; opacity: 0.9
             button1Label: "Update"
             button2Label: "View others"
-            onButton1Clicked: RssModel.reload();
-            onButton2Clicked: 
+            onButton1Clicked: rssModel.reload();
+            onButton2Clicked:
             {
-                if(Screen.userView == true){
-                    Screen.setMode(false);
+                if(screen.userView == true){
+                    screen.setMode(false);
                 }else{
-                    RssModel.tags='';
-                    Screen.setMode(true);
+                    rssModel.tags='';
+                    screen.setMode(true);
                 }
             }
         }
 
         states: [
             State {
-                name: "unauthed"; when: RssModel.authName==""
+                name: "unauthed"; when: rssModel.authName==""
                 PropertyChanges { target: authView; x: 0 }
-                PropertyChanges { target: MainView; x: -(parent.width * 1.5) }
-                PropertyChanges { target: TitleBar; y: -80 }
-                PropertyChanges { target: ToolBar; y: Screen.height + 80 }
+                PropertyChanges { target: mainView; x: -(parent.width * 1.5) }
+                PropertyChanges { target: titleBar; y: -80 }
+                PropertyChanges { target: toolBar; y: screen.height + 80 }
             }
         ]
         transitions: [
diff --git a/demos/declarative/webbrowser/content/RectSoftShadow.qml b/demos/declarative/webbrowser/content/RectSoftShadow.qml
index 5b278ac..6bba98e 100644
--- a/demos/declarative/webbrowser/content/RectSoftShadow.qml
+++ b/demos/declarative/webbrowser/content/RectSoftShadow.qml
@@ -26,7 +26,7 @@ Item {
         source: "pics/softshadow-bottom.png"
         x: 0
         y: parent.height
-        width: WebView.width*WebView.scale
+        width: webView.width*webView.scale
         height: 16
     }
 }
diff --git a/demos/declarative/webbrowser/webbrowser.qml b/demos/declarative/webbrowser/webbrowser.qml
index 3f23d83..53ac214 100644
--- a/demos/declarative/webbrowser/webbrowser.qml
+++ b/demos/declarative/webbrowser/webbrowser.qml
@@ -4,7 +4,7 @@ import "content"
 import "fieldtext"
 
 Item {
-    id: WebBrowser
+    id: webBrowser
 
     property string urlString : "http://qt.nokia.com/"
 
@@ -14,7 +14,7 @@ Item {
     height: 480
 
     Item {
-        id: WebPanel
+        id: webPanel
         anchors.fill: parent
         clip: true
         Rectangle {
@@ -23,48 +23,48 @@ Item {
         }
         Image {
             source: "content/pics/softshadow-bottom.png"
-            width: WebPanel.width
+            width: webPanel.width
             height: 16
         }
         Image {
             source: "content/pics/softshadow-top.png"
-            width: WebPanel.width
+            width: webPanel.width
             height: 16
-            anchors.bottom: Footer.top
+            anchors.bottom: footer.top
         }
         RectSoftShadow {
-            x: -Flick.viewportX
-            y: -Flick.viewportY
-            width: MyWebView.width*MyWebView.scale
-            height: Flick.y+MyWebView.height*MyWebView.scale
+            x: -flickable.viewportX
+            y: -flickable.viewportY
+            width: webView.width*webView.scale
+            height: flickable.y+webView.height*webView.scale
         }
         Item {
-            id: HeaderSpace
+            id: headerSpace
             width: parent.width
             height: 60
             z: 1
 
             Rectangle {
-                id: HeaderSpaceTint
+                id: headerSpaceTint
                 color: "black"
                 opacity: 0
                 anchors.fill: parent
              }
 
             Image {
-                id: Header
+                id: header
                 source: "content/pics/header.png"
                 width: parent.width
                 height: 60
                 state: "Normal"
-                x: Flick.viewportX < 0 ? -Flick.viewportX : Flick.viewportX > Flick.viewportWidth-Flick.width
-                                         ? -Flick.viewportX+Flick.viewportWidth-Flick.width : 0
-                y: Flick.viewportY < 0 ? -Flick.viewportY : progressOff*
-                                        (Flick.viewportY>height?-height:-Flick.viewportY)
+                x: flickable.viewportX < 0 ? -flickable.viewportX : flickable.viewportX > flickable.viewportWidth-flickable.width
+                                         ? -flickable.viewportX+flickable.viewportWidth-flickable.width : 0
+                y: flickable.viewportY < 0 ? -flickable.viewportY : progressOff*
+                                        (flickable.viewportY>height?-height:-flickable.viewportY)
                 Text {
-                    id: HeaderText
+                    id: headerText
 
-                    text: MyWebView.title!='' || MyWebView.progress == 1.0 ? MyWebView.title : 'Loading...'
+                    text: webView.title!='' || webView.progress == 1.0 ? webView.title : 'Loading...'
                     elide: "ElideRight"
 
                     color: "white"
@@ -75,22 +75,22 @@ Item {
                     font.pointSize: 10
                     font.bold: true
 
-                    anchors.left: Header.left
-                    anchors.right: Header.right
+                    anchors.left: header.left
+                    anchors.right: header.right
                     anchors.leftMargin: 4
                     anchors.rightMargin: 4
-                    anchors.top: Header.top
+                    anchors.top: header.top
                     anchors.topMargin: 4
                     horizontalAlignment: "AlignHCenter"
                 }
                 Item {
                     width: parent.width
-                    anchors.top: HeaderText.bottom
+                    anchors.top: headerText.bottom
                     anchors.topMargin: 2
                     anchors.bottom: parent.bottom
 
                     Item {
-                        id: UrlBox
+                        id: urlBox
                         height: 31
                         anchors.left: parent.left
                         anchors.leftMargin: 12
@@ -102,32 +102,32 @@ Item {
 
                         BorderImage {
                             source: "content/pics/addressbar.sci"
-                            anchors.fill: UrlBox
+                            anchors.fill: urlBox
                         }
-                                                
+
                         BorderImage {
-                            id: UrlBoxhl
+                            id: urlBoxhl
                             source: "content/pics/addressbar-filled.sci"
-                            width: parent.width*MyWebView.progress
+                            width: parent.width*webView.progress
                             height: parent.height
-                            opacity: 1-Header.progressOff
+                            opacity: 1-header.progressOff
                             clip: true
                         }
 
                         FieldText {
-                            id: EditUrl
+                            id: editUrl
                             mouseGrabbed: parent.mouseGrabbed
 
-                            text: WebBrowser.urlString
+                            text: webBrowser.urlString
                             label: "url:"
-                            onConfirmed: { WebBrowser.urlString = EditUrl.text; MyWebView.focus=true }
-                            onCancelled: { MyWebView.focus=true }
-                            onStartEdit: { MyWebView.focus=false }
+                            onConfirmed: { webBrowser.urlString = editUrl.text; webView.focus=true }
+                            onCancelled: { webView.focus=true }
+                            onStartEdit: { webView.focus=false }
 
-                            anchors.left: UrlBox.left
-                            anchors.right: UrlBox.right
+                            anchors.left: urlBox.left
+                            anchors.right: urlBox.right
                             anchors.leftMargin: 6
-                            anchors.verticalCenter: UrlBox.verticalCenter
+                            anchors.verticalCenter: urlBox.verticalCenter
                             anchors.verticalCenterOffset: 1
                         }
                     }
@@ -137,19 +137,19 @@ Item {
                 states: [
                     State {
                         name: "Normal"
-                        when: MyWebView.progress == 1.0
-                        PropertyChanges { target: Header; progressOff: 1 }
+                        when: webView.progress == 1.0
+                        PropertyChanges { target: header; progressOff: 1 }
                     },
                     State {
                         name: "ProgressShown"
-                        when: MyWebView.progress < 1.0
-                        PropertyChanges { target: Header; progressOff: 0; }
+                        when: webView.progress < 1.0
+                        PropertyChanges { target: header; progressOff: 0; }
                     }
                 ]
                 transitions: [
                     Transition {
                         NumberAnimation {
-                            target: Header
+                            target: header
                             properties: "progressOff"
                             easing: "easeInOutQuad"
                             duration: 300
@@ -159,18 +159,18 @@ Item {
             }
         }
         Flickable {
-            id: Flick
+            id: flickable
             width: parent.width
-            viewportWidth: Math.max(parent.width,MyWebView.width*MyWebView.scale)
-            viewportHeight: Math.max(parent.height,MyWebView.height*MyWebView.scale)
-            anchors.top: HeaderSpace.bottom
-            anchors.bottom: Footer.top
+            viewportWidth: Math.max(parent.width,webView.width*webView.scale)
+            viewportHeight: Math.max(parent.height,webView.height*webView.scale)
+            anchors.top: headerSpace.bottom
+            anchors.bottom: footer.top
             anchors.left: parent.left
             anchors.right: parent.right
             pressDelay: 200
 
             WebView {
-                id: MyWebView
+                id: webView
                 pixelCacheSize: 4000000
 
                 Script {
@@ -190,29 +190,29 @@ Item {
                     }
                 }
 
-                url: fixUrl(WebBrowser.urlString)
+                url: fixUrl(webBrowser.urlString)
                 smooth: true
                 fillColor: "white"
                 focus: true
 
-                preferredWidth: Flick.width
+                preferredWidth: flickable.width
                 webPageWidth: 980
 
-                onUrlChanged: { if (url != null) { WebBrowser.urlString = url.toString(); } }
+                onUrlChanged: { if (url != null) { webBrowser.urlString = url.toString(); } }
                 onDoubleClick: { heuristicZoom(clickX,clickY) }
 
                 SequentialAnimation {
-                    id: QuickZoom
+                    id: quickZoom
 
                     PropertyAction {
-                        target: MyWebView
+                        target: webView
                         property: "renderingEnabled"
                         value: false
                     }
                     ParallelAnimation {
                         NumberAnimation {
-                            id: ScaleAnim
-                            target: MyWebView
+                            id: scaleAnim
+                            target: webView
                             property: "scale"
                             from: 1
                             to: 0 // set before calling
@@ -220,8 +220,8 @@ Item {
                             duration: 200
                         }
                         NumberAnimation {
-                            id: FlickVX
-                            target: Flick
+                            id: flickVX
+                            target: flickable
                             property: "viewportX"
                             easing: "easeLinear"
                             duration: 200
@@ -229,8 +229,8 @@ Item {
                             to: 0 // set before calling
                         }
                         NumberAnimation {
-                            id: FlickVY
-                            target: Flick
+                            id: flickVY
+                            target: flickable
                             property: "viewportY"
                             easing: "easeLinear"
                             duration: 200
@@ -239,12 +239,12 @@ Item {
                         }
                     }
                     PropertyAction {
-                        id: FinalZoom
-                        target: MyWebView
+                        id: finalZoom
+                        target: webView
                         property: "zoomFactor"
                     }
                     PropertyAction {
-                        target: MyWebView
+                        target: webView
                         property: "scale"
                         value: 1.0
                     }
@@ -252,19 +252,19 @@ Item {
                     // size changes may have started a correction if
                     // zoomFactor < 1.0.
                     PropertyAction {
-                        id: FinalX
-                        target: Flick
+                        id: finalX
+                        target: flickable
                         property: "viewportX"
                         value: 0 // set before calling
                     }
                     PropertyAction {
-                        id: FinalY
-                        target: Flick
+                        id: finalY
+                        target: flickable
                         property: "viewportY"
                         value: 0 // set before calling
                     }
                     PropertyAction {
-                        target: MyWebView
+                        target: webView
                         property: "renderingEnabled"
                         value: true
                     }
@@ -272,23 +272,23 @@ Item {
                 onZooming: {
                     if (centerX) {
                         sc = zoom/zoomFactor;
-                        ScaleAnim.to = sc;
-                        FlickVX.from = Flick.viewportX
-                        FlickVX.to = Math.min(Math.max(0,centerX-Flick.width/2),MyWebView.width*sc-Flick.width)
-                        FinalX.value = Math.min(Math.max(0,centerX-Flick.width/2),MyWebView.width*sc-Flick.width)
-                        FlickVY.from = Flick.viewportY
-                        FlickVY.to = Math.min(Math.max(0,centerY-Flick.height/2),MyWebView.height*sc-Flick.height)
-                        FinalY.value = Math.min(Math.max(0,centerY-Flick.height/2),MyWebView.height*sc-Flick.height)
-                        FinalZoom.value = zoom
-                        QuickZoom.start()
+                        scaleAnim.to = sc;
+                        flickVX.from = flickable.viewportX
+                        flickVX.to = Math.min(Math.max(0,centerX-flickable.width/2),webView.width*sc-flickable.width)
+                        finalX.value = Math.min(Math.max(0,centerX-flickable.width/2),webView.width*sc-flickable.width)
+                        flickVY.from = flickable.viewportY
+                        flickVY.to = Math.min(Math.max(0,centerY-flickable.height/2),webView.height*sc-flickable.height)
+                        finalY.value = Math.min(Math.max(0,centerY-flickable.height/2),webView.height*sc-flickable.height)
+                        finalZoom.value = zoom
+                        quickZoom.start()
                     }
                 }
             }
             Rectangle {
-                id: WebViewTint
+                id: webViewTint
                 color: "black"
                 opacity: 0
-                anchors.fill: MyWebView
+                anchors.fill: webView
                 /*MouseRegion {
                     anchors.fill: WebViewTint
                     onClicked: { proxy.focus=false }
@@ -296,7 +296,7 @@ Item {
             }
         }
         BorderImage {
-            id: Footer
+            id: footer
             source: "content/pics/footer.sci"
             width: parent.width
             height: 43
@@ -327,13 +327,13 @@ Item {
                 states: [
                     State {
                         name: "Enabled"
-                        when: MyWebView.back.enabled==true
+                        when: webView.back.enabled==true
                         PropertyChanges { target: back_e; opacity: 1 }
                         PropertyChanges { target: back_d; opacity: 0 }
                     },
                     State {
                         name: "Disabled"
-                        when: MyWebView.back.enabled==false
+                        when: webView.back.enabled==false
                         PropertyChanges { target: back_e; opacity: 0 }
                         PropertyChanges { target: back_d; opacity: 1 }
                     }
@@ -349,7 +349,7 @@ Item {
                 ]
                 MouseRegion {
                     anchors.fill: back_e
-                    onClicked: { if (MyWebView.back.enabled) MyWebView.back.trigger() }
+                    onClicked: { if (webView.back.enabled) webView.back.trigger() }
                 }
             }
             Image {
@@ -360,7 +360,7 @@ Item {
             }
             MouseRegion {
                 anchors.fill: reload
-                onClicked: { MyWebView.reload.trigger() }
+                onClicked: { webView.reload.trigger() }
             }
             Item {
                 id: forwardbutton
@@ -383,13 +383,13 @@ Item {
                 states: [
                     State {
                         name: "Enabled"
-                        when: MyWebView.forward.enabled==true
+                        when: webView.forward.enabled==true
                         PropertyChanges { target: forward_e; opacity: 1 }
                         PropertyChanges { target: forward_d; opacity: 0 }
                     },
                     State {
                         name: "Disabled"
-                        when: MyWebView.forward.enabled==false
+                        when: webView.forward.enabled==false
                         PropertyChanges { target: forward_e; opacity: 0 }
                         PropertyChanges { target: forward_d; opacity: 1 }
                     }
@@ -405,7 +405,7 @@ Item {
                 ]
                 MouseRegion {
                     anchors.fill: parent
-                    onClicked: { if (MyWebView.forward.enabled) MyWebView.forward.trigger() }
+                    onClicked: { if (webView.forward.enabled) webView.forward.trigger() }
                 }
             }
         }