Remove some more default values + cosmetic changes

sailfishos · May 9, 2016 · 9b00eb6 · 9b00eb6
1 parent 8975041
commit 9b00eb6
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 15 deletions.
diff --git a/qml/Button.qml b/qml/Button.qml
@@ -21,20 +21,21 @@ import QtQuick 2.0
 
 Rectangle {
     id: button
-    property string text: ""
+
+    property string text
     property string textColor: "#ffffff"
     property bool enabled: true
-    property bool highlighted: false
-    signal clicked();
+    property bool highlighted
 
     // for custom user menu actions
-    property bool isShellCommand: false
+    property bool isShellCommand
+
+    signal clicked();
 
     color: highlighted ? "#606060" : "#202020"
     border.color: "#303030"
     border.width: 1
     radius: window.radiusSmall
-    z: 0
     clip: true
 
     width: window.buttonWidthLarge

diff --git a/qml/Key.qml b/qml/Key.qml
@@ -186,18 +186,14 @@ Rectangle {
 
     Timer {
         id: keyRepeatStarter
-        running: false
-        repeat: false
         interval: 400
-        triggeredOnStart: false
         onTriggered: {
             keyRepeatTimer.start();
         }
     }
 
     Timer {
         id: keyRepeatTimer
-        running: false
         repeat: true
         triggeredOnStart: true
         interval: 80

diff --git a/qml/LayoutWindow.qml b/qml/LayoutWindow.qml
@@ -21,13 +21,14 @@ import QtQuick 2.0
 
 Rectangle {
     id: layoutWindow
+
     property string currentLayout: util.settingsValue("ui/keyboardLayout");
+    property variant layouts: [""]
 
     width: window.width-1
     height: window.height-1
     color: "#000000"
     z: 100
-    property variant layouts: [""]
     state: ""
     y: -(height+1)
     border.color: "#c0c0c0"

diff --git a/qml/Main.qml b/qml/Main.qml
@@ -308,8 +308,7 @@ Item {
 
         Timer {
             id: fadeTimer
-            running: false
-            repeat: false
+
             interval: menu.keyboardFadeOutDelay
             onTriggered: {
                 window.sleepVKB();
@@ -318,8 +317,7 @@ Item {
 
         Timer {
             id: bellTimer
-            running: false
-            repeat: false
+
             interval: 80
             onTriggered: {
                 window.color = window.bgcolor;

diff --git a/textrender.cpp b/textrender.cpp
@@ -321,5 +321,5 @@ QPoint TextRender::charsToPixels(QPoint pos)
 
 QSize TextRender::cursorPixelSize()
 {
-    return (QSize(iFontWidth, iFontHeight));
+    return QSize(iFontWidth, iFontHeight);
 }