From 57881a95bf730dec7dd010bc086a5c42003840d4 Mon Sep 17 00:00:00 2001 From: Li Xiaoming Date: Sun, 22 Sep 2019 20:56:19 +0800 Subject: fix: Remove qml M126 warning Message: == and != may perform type coercion, use === or !== to avoid it. Description: The non-strict equality comparison is allowed to convert its arguments to a common type. That can lead to unexpected results such as ' \t\r\n' == 0 being true. Use the strict equality operators === and !== and be explicit about conversions you require. Bug-AGL: SPEC-2814 Change-Id: I4dd5848797f445d082242a5c5e2a0148ea790dc0 Signed-off-by: Li Xiaoming --- app/api/GPS.qml | 2 +- app/api/GeoFence.qml | 2 +- app/forms/RouteList.qml | 4 ++-- app/map/MapComponent.qml | 12 ++++++------ app/map/Marker.qml | 2 +- app/mapviewer.qml | 10 +++++----- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/api/GPS.qml b/app/api/GPS.qml index 679c66e..95c7712 100644 --- a/app/api/GPS.qml +++ b/app/api/GPS.qml @@ -55,7 +55,7 @@ WebSocket { case msgid.event: var payload = JSON.parse(JSON.stringify(json[2])) var event = payload.event - if (event == "gps/location") { + if (event === "gps/location") { var data = json[2].data var latitude = data.latitude var longitude = data.longitude diff --git a/app/api/GeoFence.qml b/app/api/GeoFence.qml index 7061984..a39eecb 100644 --- a/app/api/GeoFence.qml +++ b/app/api/GeoFence.qml @@ -55,7 +55,7 @@ WebSocket { case msgid.event: var payload = JSON.parse(JSON.stringify(json[2])) var event = payload.event - if (event == "geofence/fence") { + if (event === "geofence/fence") { var data = json[2].data console.log("geofence event - name: " + data.name + " state: " + data.state) } diff --git a/app/forms/RouteList.qml b/app/forms/RouteList.qml index 27fa572..e37b581 100644 --- a/app/forms/RouteList.qml +++ b/app/forms/RouteList.qml @@ -79,8 +79,8 @@ ListView { } } //! [routeinfomodel2] - totalTravelTime = routeModel.count == 0 ? "" : Helper.formatTime(routeModel.get(0).travelTime) - totalDistance = routeModel.count == 0 ? "" : Helper.formatDistance(routeModel.get(0).distance) + totalTravelTime = routeModel.count === 0 ? "" : Helper.formatTime(routeModel.get(0).travelTime) + totalDistance = routeModel.count === 0 ? "" : Helper.formatDistance(routeModel.get(0).distance) } //! [routeinfomodel3] } diff --git a/app/map/MapComponent.qml b/app/map/MapComponent.qml index 161038c..87ad74a 100644 --- a/app/map/MapComponent.qml +++ b/app/map/MapComponent.qml @@ -181,7 +181,7 @@ Map { { var count = map.mapItems.length var co = Qt.createComponent(item+'.qml') - if (co.status == Component.Ready) { + if (co.status === Component.Ready) { var o = co.createObject(map) o.setGeometry(map.markers, currentMarker) map.addMapItem(o) @@ -204,13 +204,13 @@ Map { var myArray = new Array() var count = map.markers.length for (var i = 0; i 1) { stackView.showMessage(qsTr("Ambiguous geocode"), map.geocodeModel.count + " " + @@ -458,7 +458,7 @@ ApplicationWindow { } else { stackView.showMessage(qsTr("Location"), geocodeMessage(),page) } - } else if (map.geocodeModel.status == GeocodeModel.Error) { + } else if (map.geocodeModel.status === GeocodeModel.Error) { stackView.showMessage(qsTr("Geocode Error"),qsTr("Unsuccessful geocode")) } } @@ -467,10 +467,10 @@ ApplicationWindow { onShowGeocodeInfo: stackView.showMessage(qsTr("Location"),geocodeMessage(),page) onErrorChanged: { - if (map.error != Map.NoError) { + if (map.error !== Map.NoError) { var title = qsTr("ProviderError") var message = map.errorString + "

" + qsTr("Try to select other provider") + "" - if (map.error == Map.MissingRequiredParameterError) + if (map.error === Map.MissingRequiredParameterError) message += "
" + qsTr("or see") + " \'mapviewer --help\' " + qsTr("how to pass plugin parameters.") stackView.showMessage(title,message); -- cgit 1.2.3-korg