From f9ddf690c7b0219cc6a1a4649de5a9c7e529e032 Mon Sep 17 00:00:00 2001
From: Evgeniy Alekseev <i@arcanis.me>
Date: Thu, 15 Sep 2016 07:26:00 +0300
Subject: [PATCH] drop semicolon from qml files, update CONTRIBUTING guide
 accordingly

---
 CONTRIBUTING.md                                           | 1 +
 sources/awesome-widget/package/contents/ui/about.qml      | 6 +++---
 sources/awesome-widget/package/contents/ui/advanced.qml   | 2 +-
 sources/awesome-widget/package/contents/ui/appearance.qml | 4 ++--
 sources/awesome-widget/package/contents/ui/dataengine.qml | 6 +++---
 sources/awesome-widget/package/contents/ui/main.qml       | 6 ++++++
 sources/awesome-widget/package/contents/ui/widget.qml     | 7 +++++--
 sources/desktop-panel/package/contents/ui/about.qml       | 6 +++---
 sources/desktop-panel/package/contents/ui/activeapp.qml   | 4 ++--
 sources/desktop-panel/package/contents/ui/advanced.qml    | 2 +-
 sources/desktop-panel/package/contents/ui/inactiveapp.qml | 4 ++--
 sources/desktop-panel/package/contents/ui/main.qml        | 2 +-
 sources/desktop-panel/package/contents/ui/widget.qml      | 2 +-
 13 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ce76a8d..3ace2e4 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -91,6 +91,7 @@ for more details. To avoid manual labor there is automatic cmake target named
 * 'true ? foo : bar' construction is allowed and recommended for one-line assignment.
 * Any global pointer should be assign to `nullptr` after deletion and before
   initialization. Exception: if object is deleted into class destructor.
+* Do not use semicolon in qml files unless it is required.
 
 Comments
 --------
diff --git a/sources/awesome-widget/package/contents/ui/about.qml b/sources/awesome-widget/package/contents/ui/about.qml
index 6cde341..e33237d 100644
--- a/sources/awesome-widget/package/contents/ui/about.qml
+++ b/sources/awesome-widget/package/contents/ui/about.qml
@@ -70,7 +70,7 @@ Item {
                         horizontalAlignment: Text.AlignLeft
                         textFormat: Text.RichText
                         text: awActions.getAboutText("links")
-                        onLinkActivated: Qt.openUrlExternally(link);
+                        onLinkActivated: Qt.openUrlExternally(link)
                     }
 
                     QtControls.Label {
@@ -103,7 +103,7 @@ Item {
                         horizontalAlignment: Text.AlignJustify
                         textFormat: Text.RichText
                         text: awActions.getAboutText("3rdparty")
-                        onLinkActivated: Qt.openUrlExternally(link);
+                        onLinkActivated: Qt.openUrlExternally(link)
                     }
 
                     QtControls.Label {
@@ -114,7 +114,7 @@ Item {
                         verticalAlignment: Text.AlignTop
                         textFormat: Text.RichText
                         text: awActions.getAboutText("thanks")
-                        onLinkActivated: Qt.openUrlExternally(link);
+                        onLinkActivated: Qt.openUrlExternally(link)
                     }
                 }
             }
diff --git a/sources/awesome-widget/package/contents/ui/advanced.qml b/sources/awesome-widget/package/contents/ui/advanced.qml
index d3e2549..d70eddb 100644
--- a/sources/awesome-widget/package/contents/ui/advanced.qml
+++ b/sources/awesome-widget/package/contents/ui/advanced.qml
@@ -288,7 +288,7 @@ Item {
                     for (var i = 0; i < model.length; i++) {
                         if (model[i]["name"] == plasmoid.configuration.tempUnits) {
                             if (debug) console.info("Found", model[i]["name"], "on", i)
-                            tempUnits.currentIndex = i;
+                            tempUnits.currentIndex = i
                         }
                     }
                 }
diff --git a/sources/awesome-widget/package/contents/ui/appearance.qml b/sources/awesome-widget/package/contents/ui/appearance.qml
index c0bf432..6acfa72 100644
--- a/sources/awesome-widget/package/contents/ui/appearance.qml
+++ b/sources/awesome-widget/package/contents/ui/appearance.qml
@@ -138,7 +138,7 @@ Item {
                     for (var i = 0; i < model.length; i++) {
                         if (model[i]["name"] == plasmoid.configuration.fontWeight) {
                             if (debug) console.info("Found", model[i]["name"], "on", i)
-                            fontWeight.currentIndex = i;
+                            fontWeight.currentIndex = i
                         }
                     }
                 }
@@ -175,7 +175,7 @@ Item {
                     for (var i = 0; i < model.length; i++) {
                         if (model[i]["name"] == plasmoid.configuration.fontStyle) {
                             if (debug) console.info("Found", model[i]["name"], "on", i)
-                            fontStyle.currentIndex = i;
+                            fontStyle.currentIndex = i
                         }
                     }
                 }
diff --git a/sources/awesome-widget/package/contents/ui/dataengine.qml b/sources/awesome-widget/package/contents/ui/dataengine.qml
index a3b7c98..a536dee 100644
--- a/sources/awesome-widget/package/contents/ui/dataengine.qml
+++ b/sources/awesome-widget/package/contents/ui/dataengine.qml
@@ -93,7 +93,7 @@ Item {
                         for (var i=0; i<model.length; i++) {
                             if (model[i] == cfg_dataengine["GPUDEV"]) {
                                 if (debug) console.info("Found", model[i], "on", i)
-                                currentIndex = i;
+                                currentIndex = i
                             }
                         }
                     }
@@ -189,7 +189,7 @@ Item {
                             for (var i=0; i<model.length; i++) {
                                 if (model[i] == cfg_dataengine["PLAYER"]) {
                                     if (debug) console.info("Found", model[i], "on", i)
-                                    player.currentIndex = i;
+                                    player.currentIndex = i
                                 }
                             }
                         }
@@ -345,7 +345,7 @@ Item {
         for (var i=0; i<hdd.model.length; i++) {
             if (hdd.model[i] == cfg_dataengine["HDDDEV"]) {
                 if (debug) console.info("Found", hdd.model[i], "on", i)
-                hdd.currentIndex = i;
+                hdd.currentIndex = i
             }
         }
     }
diff --git a/sources/awesome-widget/package/contents/ui/main.qml b/sources/awesome-widget/package/contents/ui/main.qml
index 41abc9a..2e9af73 100644
--- a/sources/awesome-widget/package/contents/ui/main.qml
+++ b/sources/awesome-widget/package/contents/ui/main.qml
@@ -36,6 +36,9 @@ Item {
     AWActions {
         id: awActions
     }
+    AWTelemetryHandler {
+        id: awTelemetryHandler
+    }
     BugReport {
         id: bugReport
     }
@@ -204,6 +207,9 @@ Item {
         awKeys.setAggregatorProperty("customUptime", plasmoid.configuration.customUptime)
         awKeys.setAggregatorProperty("tempUnits", plasmoid.configuration.tempUnits)
         awKeys.setAggregatorProperty("translate", plasmoid.configuration.translateStrings)
+        // save telemetry
+        if (awTelemetryHandler.put("awwidgetconfig", plasmoid.configuration.text))
+            awTelemetryHandler.uploadTelemetry("awwidgetconfig", plasmoid.configuration.text)
     }
 
 
diff --git a/sources/awesome-widget/package/contents/ui/widget.qml b/sources/awesome-widget/package/contents/ui/widget.qml
index 9b522ad..ed78a89 100644
--- a/sources/awesome-widget/package/contents/ui/widget.qml
+++ b/sources/awesome-widget/package/contents/ui/widget.qml
@@ -34,6 +34,9 @@ Item {
     AWFormatterConfigFactory {
         id: awFormatter
     }
+    AWTelemetryHandler {
+        id: awTelemetryHandler
+    }
 
     width: childrenRect.width
     height: childrenRect.height
@@ -57,7 +60,7 @@ Item {
           verticalAlignment: Text.AlignVCenter
           wrapMode: Text.WordWrap
           text: i18n("Detailed information may be found on <a href=\"https://arcanis.me/projects/awesome-widgets/\">project homepage</a>")
-          onLinkActivated: Qt.openUrlExternally(link);
+          onLinkActivated: Qt.openUrlExternally(link)
         }
 
         Row {
@@ -380,6 +383,6 @@ Item {
 
         compiledText.text = newText.replace(/&nbsp;/g, " ")
         compiledText.open()
-        lock = true;
+        lock = true
     }
 }
diff --git a/sources/desktop-panel/package/contents/ui/about.qml b/sources/desktop-panel/package/contents/ui/about.qml
index ba648f7..723dea3 100644
--- a/sources/desktop-panel/package/contents/ui/about.qml
+++ b/sources/desktop-panel/package/contents/ui/about.qml
@@ -71,7 +71,7 @@ Item {
                         horizontalAlignment: Text.AlignLeft
                         textFormat: Text.RichText
                         text: dpAdds.getAboutText("links")
-                        onLinkActivated: Qt.openUrlExternally(link);
+                        onLinkActivated: Qt.openUrlExternally(link)
                     }
 
                     QtControls.Label {
@@ -104,7 +104,7 @@ Item {
                         horizontalAlignment: Text.AlignJustify
                         textFormat: Text.RichText
                         text: dpAdds.getAboutText("3rdparty")
-                        onLinkActivated: Qt.openUrlExternally(link);
+                        onLinkActivated: Qt.openUrlExternally(link)
                     }
 
                     QtControls.Label {
@@ -115,7 +115,7 @@ Item {
                         verticalAlignment: Text.AlignTop
                         textFormat: Text.RichText
                         text: dpAdds.getAboutText("thanks")
-                        onLinkActivated: Qt.openUrlExternally(link);
+                        onLinkActivated: Qt.openUrlExternally(link)
                     }
                 }
             }
diff --git a/sources/desktop-panel/package/contents/ui/activeapp.qml b/sources/desktop-panel/package/contents/ui/activeapp.qml
index 64009c7..865352d 100644
--- a/sources/desktop-panel/package/contents/ui/activeapp.qml
+++ b/sources/desktop-panel/package/contents/ui/activeapp.qml
@@ -138,7 +138,7 @@ Item {
                     for (var i = 0; i < model.length; i++) {
                         if (model[i]["name"] == plasmoid.configuration.currentFontWeight) {
                             if (debug) console.info("Found", model[i]["name"], "on", i)
-                            fontWeight.currentIndex = i;
+                            fontWeight.currentIndex = i
                         }
                     }
                 }
@@ -175,7 +175,7 @@ Item {
                     for (var i = 0; i < model.length; i++) {
                         if (model[i]["name"] == plasmoid.configuration.currentFontStyle) {
                             if (debug) console.info("Found", model[i]["name"], "on", i)
-                            fontStyle.currentIndex = i;
+                            fontStyle.currentIndex = i
                         }
                     }
                 }
diff --git a/sources/desktop-panel/package/contents/ui/advanced.qml b/sources/desktop-panel/package/contents/ui/advanced.qml
index 684fd15..256281f 100644
--- a/sources/desktop-panel/package/contents/ui/advanced.qml
+++ b/sources/desktop-panel/package/contents/ui/advanced.qml
@@ -188,7 +188,7 @@ Item {
                             for (var i = 0; i < model.length; i++) {
                                 if (model[i]["name"] == plasmoid.configuration.tooltipType) {
                                     if (debug) console.info("Found", model[i]["name"], "on", i)
-                                    tooltipType.currentIndex = i;
+                                    tooltipType.currentIndex = i
                                 }
                             }
                         }
diff --git a/sources/desktop-panel/package/contents/ui/inactiveapp.qml b/sources/desktop-panel/package/contents/ui/inactiveapp.qml
index 09ad20d..391240a 100644
--- a/sources/desktop-panel/package/contents/ui/inactiveapp.qml
+++ b/sources/desktop-panel/package/contents/ui/inactiveapp.qml
@@ -138,7 +138,7 @@ Item {
                     for (var i = 0; i < model.length; i++) {
                         if (model[i]["name"] == plasmoid.configuration.fontWeight) {
                             if (debug) console.info("Found", model[i]["name"], "on", i)
-                            fontWeight.currentIndex = i;
+                            fontWeight.currentIndex = i
                         }
                     }
                 }
@@ -175,7 +175,7 @@ Item {
                     for (var i = 0; i < model.length; i++) {
                         if (model[i]["name"] == plasmoid.configuration.fontStyle) {
                             if (debug) console.info("Found", model[i]["name"], "on", i)
-                            fontStyle.currentIndex = i;
+                            fontStyle.currentIndex = i
                         }
                     }
                 }
diff --git a/sources/desktop-panel/package/contents/ui/main.qml b/sources/desktop-panel/package/contents/ui/main.qml
index 20f8732..40efb02 100644
--- a/sources/desktop-panel/package/contents/ui/main.qml
+++ b/sources/desktop-panel/package/contents/ui/main.qml
@@ -83,7 +83,7 @@ Item {
                 MouseArea {
                     hoverEnabled: true
                     anchors.fill: parent
-                    onClicked: dpAdds.setCurrentDesktop(index + 1);
+                    onClicked: dpAdds.setCurrentDesktop(index + 1)
                     onEntered: needTooltipUpdate()
                 }
 
diff --git a/sources/desktop-panel/package/contents/ui/widget.qml b/sources/desktop-panel/package/contents/ui/widget.qml
index 77cd05c..5f235ce 100644
--- a/sources/desktop-panel/package/contents/ui/widget.qml
+++ b/sources/desktop-panel/package/contents/ui/widget.qml
@@ -48,7 +48,7 @@ Item {
           verticalAlignment: Text.AlignVCenter
           wrapMode: Text.WordWrap
           text: i18n("Detailed information may be found on <a href=\"https://arcanis.me/projects/awesome-widgets/\">project homepage</a>")
-          onLinkActivated: Qt.openUrlExternally(link);
+          onLinkActivated: Qt.openUrlExternally(link)
         }
 
         Row {