zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix implicitly defined properties in Connections 

Implicitly defined properties are deprecated in newer Qt versions.
This changes the syntax of the property functions to the new style.
QGC4.4
Philipp Borgers 4 years ago committed by Don Gagne
parent
07259f7f02
commit
80645327ae
17 changed files with 54 additions and 50 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/FlightDisplay/FlightDisplayViewVideo.qml
  2. 18
      src/FlightDisplay/FlyViewMap.qml
  3. 12
      src/FlightDisplay/GuidedActionsController.qml
  4. 4
      src/FlightMap/FlightMap.qml
  5. 6
      src/FlightMap/MapScale.qml
  6. 2
      src/MissionManager/QGCMapCircleVisuals.qml
  7. 2
      src/PlanView/MissionSettingsEditor.qml
  8. 12
      src/PlanView/PlanView.qml
  9. 8
      src/PlanView/SimpleItemMapVisual.qml
  10. 2
      src/QmlControls/FlightModeMenu.qml
  11. 6
      src/QmlControls/InstrumentValueLabel.qml
  12. 12
      src/QmlControls/MainWindowSavedState.qml
  13. 6
      src/QmlControls/QGCFlickableHorizontalIndicator.qml
  14. 6
      src/QmlControls/QGCFlickableVerticalIndicator.qml
  15. 2
      src/QmlControls/QGCPipOverlay.qml
  16. 2
      src/QmlControls/ScreenTools.qml
  17. 2
      src/ui/toolbar/MainToolBar.qml

2
src/FlightDisplay/FlightDisplayViewVideo.qml
Unescape View File

@ -79,7 +79,7 @@ Item { @@ -79,7 +79,7 @@ Item {
Connections {
target: QGroundControl.videoManager
onImageFileChanged: {
function onImageFileChanged() {
videoContent.grabToImage(function(result) {
if (!result.saveToFile(QGroundControl.videoManager.imageFile)) {
console.error('Error capturing video frame');

18
src/FlightDisplay/FlyViewMap.qml
Unescape View File

@ -108,10 +108,10 @@ FlightMap { @@ -108,10 +108,10 @@ FlightMap {
Connections {
target: gesture
onPanStarted: _disableVehicleTracking = true
onFlickStarted: _disableVehicleTracking = true
onPanFinished: panRecenterTimer.restart()
onFlickFinished: panRecenterTimer.restart()
function onPanStarted() { _disableVehicleTracking = true }
function onFlickStarted() { _disableVehicleTracking = true }
function onPanFinished() { panRecenterTimer.restart() }
function onFlickFinished() { panRecenterTimer.restart() }
}
function pointInRect(point, rect) {
@ -207,7 +207,7 @@ FlightMap { @@ -207,7 +207,7 @@ FlightMap {
Connections {
target: _missionController
ignoreUnknownSignals: true
onNewItemsFromVehicle: {
function onNewItemsFromVehicle() {
var visualItems = _missionController.visualItems
if (visualItems && visualItems.count !== 1) {
mapFitFunctions.fitMapViewportToMissionItems()
@ -238,7 +238,9 @@ FlightMap { @@ -238,7 +238,9 @@ FlightMap {
Connections {
target: QGroundControl.multiVehicleManager
onActiveVehicleChanged: trajectoryPolyline.path = _activeVehicle ? _activeVehicle.trajectoryPoints.list() : []
function onActiveVehicleChanged() {
trajectoryPolyline.path = _activeVehicle ? _activeVehicle.trajectoryPoints.list() : []
}
}
Connections {
@ -380,7 +382,7 @@ FlightMap { @@ -380,7 +382,7 @@ FlightMap {
Connections {
target: QGroundControl.multiVehicleManager
onActiveVehicleChanged: {
function onActiveVehicleChanged() {
if (!activeVehicle) {
gotoLocationItem.visible = false
}
@ -418,7 +420,7 @@ FlightMap { @@ -418,7 +420,7 @@ FlightMap {
Connections {
target: QGroundControl.multiVehicleManager
onActiveVehicleChanged: {
function onActiveVehicleChanged() {
if (!activeVehicle) {
orbitMapCircle.visible = false
}

12
src/FlightDisplay/GuidedActionsController.qml
Unescape View File

@ -268,16 +268,16 @@ Item { @@ -268,16 +268,16 @@ Item {
Connections {
target: missionController
onResumeMissionUploadFail: confirmAction(actionResumeMissionUploadFail)
function onResumeMissionUploadFail() { confirmAction(actionResumeMissionUploadFail) }
}
Connections {
target: mainWindow
onArmVehicleRequest: armVehicleRequest()
onForceArmVehicleRequest: forceArmVehicleRequest()
onDisarmVehicleRequest: disarmVehicleRequest()
onVtolTransitionToFwdFlightRequest: vtolTransitionToFwdFlightRequest()
onVtolTransitionToMRFlightRequest: vtolTransitionToMRFlightRequest()
function onArmVehicleRequest() { armVehicleRequest() }
function onForceArmVehicleRequest() { forceArmVehicleRequest() }
function onDisarmVehicleRequest() { disarmVehicleRequest() }
function onVtolTransitionToFwdFlightRequest() { vtolTransitionToFwdFlightRequest() }
function onVtolTransitionToMRFlightRequest() { vtolTransitionToMRFlightRequest() }
}
function armVehicleRequest() {

4
src/FlightMap/FlightMap.qml
Unescape View File

@ -109,12 +109,12 @@ Map { @@ -109,12 +109,12 @@ Map {
Connections {
target: QGroundControl.settingsManager.flightMapSettings.mapType
onRawValueChanged: updateActiveMapType()
function onRawValueChanged() { updateActiveMapType() }
}
Connections {
target: QGroundControl.settingsManager.flightMapSettings.mapProvider
onRawValueChanged: updateActiveMapType()
function onRawValueChanged() { updateActiveMapType() }
}
/// Ground Station location

6
src/FlightMap/MapScale.qml
Unescape View File

@ -131,9 +131,9 @@ Item { @@ -131,9 +131,9 @@ Item {
Connections {
target: mapControl
onWidthChanged: scaleTimer.restart()
onHeightChanged: scaleTimer.restart()
onZoomLevelChanged: scaleTimer.restart()
function onWidthChanged() { scaleTimer.restart() }
function onHeightChanged() { scaleTimer.restart() }
function onZoomLevelChanged() { scaleTimer.restart() }
}
Timer {

2
src/MissionManager/QGCMapCircleVisuals.qml
Unescape View File

@ -122,7 +122,7 @@ Item { @@ -122,7 +122,7 @@ Item {
Connections {
target: mapCircle
onCenterChanged: updateCoordinate()
function onCenterChanged() { updateCoordinate() }
}
sourceItem: Shape {

2
src/PlanView/MissionSettingsEditor.qml
Unescape View File

@ -49,7 +49,7 @@ Rectangle { @@ -49,7 +49,7 @@ Rectangle {
Connections {
target: _controllerVehicle
onSupportsTerrainFrameChanged: {
function onSupportsTerrainFrameChanged() {
if (!_controllerVehicle.supportsTerrainFrame && _missionController.globalAltitudeMode === QGroundControl.AltitudeModeTerrainFrame) {
_missionController.globalAltitudeMode = QGroundControl.AltitudeModeCalcAboveTerrain
}

12
src/PlanView/PlanView.qml
Unescape View File

@ -116,7 +116,7 @@ Item { @@ -116,7 +116,7 @@ Item {
Connections {
target: _appSettings ? _appSettings.defaultMissionItemAltitude : null
onRawValueChanged: {
function onRawValueChanged() {
if (_visualItems.count > 1) {
mainWindow.showComponentDialog(applyNewAltitude, qsTr("Apply new altitude"), mainWindow.showDialogDefaultWidth, StandardButton.Yes | StandardButton.No)
}
@ -198,7 +198,7 @@ Item { @@ -198,7 +198,7 @@ Item {
Connections {
target: QGroundControl.airspaceManager
onAirspaceVisibleChanged: {
function onAirspaceVisibleChanged() {
planControlColapsed = QGroundControl.airspaceManager.airspaceVisible
}
}
@ -303,7 +303,7 @@ Item { @@ -303,7 +303,7 @@ Item {
Connections {
target: _missionController
onNewItemsFromVehicle: {
function onNewItemsFromVehicle() {
if (_visualItems && _visualItems.count !== 1) {
mapFitFunctions.fitMapViewportToMissionItems()
}
@ -545,13 +545,13 @@ Item { @@ -545,13 +545,13 @@ Item {
Connections {
target: _missionController
onSplitSegmentChanged: splitSegmentItem._updateSplitCoord()
function onSplitSegmentChanged() { splitSegmentItem._updateSplitCoord() }
}
Connections {
target: _missionController.splitSegment
onCoordinate1Changed: splitSegmentItem._updateSplitCoord()
onCoordinate2Changed: splitSegmentItem._updateSplitCoord()
function onCoordinate1Changed() { splitSegmentItem._updateSplitCoord() }
function onCoordinate2Changed() { splitSegmentItem._updateSplitCoord() }
}
}

8
src/PlanView/SimpleItemMapVisual.qml
Unescape View File

@ -89,8 +89,8 @@ Item { @@ -89,8 +89,8 @@ Item {
Connections {
target: _missionItem
onIsCurrentItemChanged: updateDragArea()
onSpecifiesCoordinateChanged: updateDragArea()
function onIsCurrentItemChanged() { updateDragArea() }
function onSpecifiesCoordinateChanged() { updateDragArea() }
}
Connections {
@ -172,7 +172,9 @@ Item { @@ -172,7 +172,9 @@ Item {
Connections {
target: _mapCircle.radius
onRawValueChanged: if(!blockSignals) loiterMapCircleVisuals.updateMissionItem()
function onRawValueChanged() {
if(!blockSignals) loiterMapCircleVisuals.updateMissionItem()
}
}
}
}

2
src/QmlControls/FlightModeMenu.qml
Unescape View File

@ -58,7 +58,7 @@ QGCLabel { @@ -58,7 +58,7 @@ QGCLabel {
Connections {
target: QGroundControl.multiVehicleManager
onActiveVehicleChanged: _root.updateFlightModesMenu()
function onActiveVehicleChanged() { _root.updateFlightModesMenu() }
}
MouseArea {

6
src/QmlControls/InstrumentValueLabel.qml
Unescape View File

@ -59,9 +59,9 @@ ColumnLayout { @@ -59,9 +59,9 @@ ColumnLayout {
Connections {
target: instrumentValueData
onRangeTypeChanged: valueIcon.updateIcon()
onCurrentIconChanged: valueIcon.updateIcon()
onIconChanged: valueIcon.updateIcon()
function onRangeTypeChanged() { valueIcon.updateIcon() }
function onCurrentIconChanged() { valueIcon.updateIcon() }
function onIconChanged() { valueIcon.updateIcon() }
}
Component.onCompleted: updateIcon();

12
src/QmlControls/MainWindowSavedState.qml
Unescape View File

@ -42,12 +42,12 @@ Item { @@ -42,12 +42,12 @@ Item {
}
Connections {
target: window
onXChanged: if(_enabled) saveSettingsTimer.restart()
onYChanged: if(_enabled) saveSettingsTimer.restart()
onWidthChanged: if(_enabled) saveSettingsTimer.restart()
onHeightChanged: if(_enabled) saveSettingsTimer.restart()
onVisibilityChanged: if(_enabled) saveSettingsTimer.restart()
target: window
function onXChanged() { if(_enabled) saveSettingsTimer.restart() }
function onYChanged() { if(_enabled) saveSettingsTimer.restart() }
function onWidthChanged() { if(_enabled) saveSettingsTimer.restart() }
function onHeightChanged() { if(_enabled) saveSettingsTimer.restart() }
function onVisibilityChanged() { if(_enabled) saveSettingsTimer.restart() }
}
Timer {

6
src/QmlControls/QGCFlickableHorizontalIndicator.qml
Unescape View File

@ -22,9 +22,9 @@ Rectangle { @@ -22,9 +22,9 @@ Rectangle {
Connections {
target: horizontalIndicator.parent
onMovementStarted: horizontalIndicator.opacity = 1.0
onMovementEnded: animateOpacity.restart()
onContentHeightChanged: animateOpacity.restart()
function onMovementStarted() { horizontalIndicator.opacity = 1.0 }
function onMovementEnded() { animateOpacity.restart() }
function onContentHeightChanged() { animateOpacity.restart() }
}
NumberAnimation {

6
src/QmlControls/QGCFlickableVerticalIndicator.qml
Unescape View File

@ -22,9 +22,9 @@ Rectangle { @@ -22,9 +22,9 @@ Rectangle {
Connections {
target: verticalIndicator.parent
onMovementStarted: verticalIndicator.opacity = 1.0
onMovementEnded: animateOpacity.restart()
onContentHeightChanged: animateOpacity.restart()
function onMovementStarted() { verticalIndicator.opacity = 1.0 }
function onMovementEnded() { animateOpacity.restart() }
function onContentHeightChanged() { animateOpacity.restart() }
}
NumberAnimation {

2
src/QmlControls/QGCPipOverlay.qml
Unescape View File

@ -174,7 +174,7 @@ Item { @@ -174,7 +174,7 @@ Item {
Connections {
target: _root.parent
onWidthChanged: {
function onWidthChanged() {
if (!_componentComplete) {
// Wait until first time setup is done
return

2
src/QmlControls/ScreenTools.qml
Unescape View File

@ -112,7 +112,7 @@ Item { @@ -112,7 +112,7 @@ Item {
*/
Connections {
target: QGroundControl.settingsManager.appSettings.appFontPointSize
onValueChanged: {
function onValueChanged() {
_setBasePointSize(QGroundControl.settingsManager.appSettings.appFontPointSize.value)
}
}

2
src/ui/toolbar/MainToolBar.qml
Unescape View File

@ -186,7 +186,7 @@ Rectangle { @@ -186,7 +186,7 @@ Rectangle {
Connections {
target: QGroundControl.multiVehicleManager
onActiveVehicleChanged: largeProgressBar._userHide = false
function onActiveVehicleChanged() { largeProgressBar._userHide = false }
}
Rectangle {

Write Preview
Loading…
Cancel
Save