Merge pull request qmlbook#122 from qmlbook/bug/fix-qmllint/ch08

Fixed qmllint warnings for code samples of chapter 08.
sammy621 · Oct 21, 2021 · 9591b8e · 9591b8e
2 parents 3f86d92 + acc1f4e
commit 9591b8e
Showing 1 changed file with 39 additions and 31 deletions.
diff --git a/docs/ch08-canvas/src/canvas/paint.qml b/docs/ch08-canvas/src/canvas/paint.qml
@@ -1,29 +1,32 @@
 /*
- * Copyright (c) 2013, Juergen Bocklage-Ryannel, Johan Thelin
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the editors nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+Copyright (c) 2012-2021, Juergen Bocklage Ryannel and Johan Thelin
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, 
+   this list of conditions and the following disclaimer in the documentation 
+   and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors
+   may be used to endorse or promote products derived from this software 
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
 
 import QtQuick
 
@@ -34,20 +37,23 @@ Rectangle {
 // #region M1
     Row {
         id: colorTools
+
+        property color paintColor: "#33B5E5"
+
         anchors {
             horizontalCenter: parent.horizontalCenter
             top: parent.top
             topMargin: 8
         }
-        property color paintColor: "#33B5E5"
         spacing: 4
         Repeater {
             model: ["#33B5E5", "#99CC00", "#FFBB33", "#FF4444"]
             ColorSquare {
+                required property var modelData
                 color: modelData
-                active: parent.paintColor == color
+                active: colorTools.paintColor == color
                 onClicked: {
-                    parent.paintColor = color
+                    colorTools.paintColor = color
                 }
             }
         }
@@ -63,16 +69,18 @@ Rectangle {
 // #region M2
     Canvas {
         id: canvas
+
+        property real lastX: 0
+        property real lastY: 0
+        property color color: colorTools.paintColor
+
         anchors {
             left: parent.left
             right: parent.right
             top: colorTools.bottom
             bottom: parent.bottom
             margins: 8
         }
-        property real lastX
-        property real lastY
-        property color color: colorTools.paintColor
 
         onPaint: {
             var ctx = getContext('2d')