KDE · marcbull · May 27, 2020
diff --git a/src/controls/FormLayout.qml b/src/controls/FormLayout.qml
@@ -249,7 +249,7 @@ Item {
             Component.onCompleted: item.x = x + lay.x;
             Connections {
                 target: lay
-                onXChanged: item.x = x + lay.x;
+                function onXChanged(x) { item.x = x + lay.x }
             }
         }
     }

diff --git a/src/controls/PagePoolAction.qml b/src/controls/PagePoolAction.qml
@@ -174,7 +174,7 @@ Kirigami.Action {
             Connections {
                 target: pageStack
 
-                onCurrentItemChanged: {
+                function onCurrentItemChanged() {
                     if (root.useLayers) {
                         if (root.layerContainsPage()) {
                             _private.clearLayers()
@@ -192,7 +192,7 @@ Kirigami.Action {
                 enabled: pageStack.hasOwnProperty("layers")
                 target: pageStack.layers
 
-                onCurrentItemChanged: {
+                function onCurrentItemChanged() {
                     if (root.useLayers && root.checkable) {
                         _private.setChecked(root.layerContainsPage());
 

diff --git a/src/controls/private/ActionButton.qml b/src/controls/private/ActionButton.qml
@@ -200,15 +200,15 @@ Item {
             }
             Connections {
                 target: root.hasGlobalDrawer ? globalDrawer : null
-                onPositionChanged: {
+                function onPositionChanged() {
                     if ( globalDrawer && globalDrawer.modal && !mouseArea.pressed && !edgeMouseArea.pressed && !fakeContextMenuButton.pressed) {
                         button.x = globalDrawer.contentItem.width * globalDrawer.position + root.width/2 - button.width/2;
                     }
                 }
             }
             Connections {
                 target: root.hasContextDrawer ? contextDrawer : null
-                onPositionChanged: {
+                function onPositionChanged() {
                     if (contextDrawer && contextDrawer.modal && !mouseArea.pressed && !edgeMouseArea.pressed && !fakeContextMenuButton.pressed) {
                         button.x = root.width/2 - button.width/2 - contextDrawer.contentItem.width * contextDrawer.position;
                     }

diff --git a/src/controls/private/RefreshableScrollView.qml b/src/controls/private/RefreshableScrollView.qml
@@ -143,7 +143,7 @@ P.ScrollView {
             Connections {
                 enabled: typeof applicationWindow !== "undefined"
                 target: typeof applicationWindow !== "undefined" ? applicationWindow() : null
-                onReachableModeChanged: {
+                function onReachableModeChanged() {
                     overshootResetTimer.running = applicationWindow().reachableMode;
                 }
             }

diff --git a/src/controls/private/globaltoolbar/BreadcrumbControl.qml b/src/controls/private/globaltoolbar/BreadcrumbControl.qml
@@ -23,7 +23,7 @@ Flickable {
 
     Connections {
         target: pageRow
-        onCurrentIndexChanged: {
+        function onCurrentIndexChanged() {
             var currentItem = mainLayout.children[pageRow.currentIndex];
             listScrollAnim.running = false
             listScrollAnim.from = root.contentX;

diff --git a/src/controls/templates/AbstractApplicationHeader.qml b/src/controls/templates/AbstractApplicationHeader.qml
@@ -79,7 +79,7 @@ Item {
     }
     Connections {
         target: __appWindow
-        onControlsVisibleChanged: {
+        function onControlsVisibleChanged() {
             heightAnim.from = root.implicitHeight
             heightAnim.to = __appWindow.controlsVisible ? root.preferredHeight : 0;
             heightAnim.restart();
@@ -102,7 +102,7 @@ Item {
         Connections {
             target: root.page ? root.page.globalToolBarItem : null
             enabled: headerSlideConnection.passive && target
-            onImplicitHeightChanged: root.implicitHeight = root.page.globalToolBarItem.implicitHeight
+            function onImplicitHeightChanged() { root.implicitHeight = root.page.globalToolBarItem.implicitHeight }
         }
 
         Connections {
@@ -116,7 +116,7 @@ Item {
             //A better solution is needed
             readonly property bool passive: root.pageRow && parent.parent == root.pageRow && root.pageRow.globalToolBar.actualStyle !== ApplicationHeaderStyle.TabBar && root.pageRow.globalToolBar.actualStyle != ApplicationHeaderStyle.Breadcrumb
 
-            onContentYChanged: {
+            function onContentYChanged() {
                 if(root.page && root.page.flickable && root.page.flickable.contentHeight < root.page.height) {
                     return
                 }                
@@ -137,7 +137,7 @@ Item {
                 }
             }
 
-            onMovementEnded: {
+            function onMovementEnded() {
                 if ((root.pageRow ? root.pageRow.wideMode : (__appWindow && __appWindow.wideScreen)) || !Settings.isMobile) {
                     return;
                 }
@@ -152,7 +152,7 @@ Item {
         }
         Connections {
             target: pageRow
-            onCurrentItemChanged: {
+            function onCurrentItemChanged() {
                 if (!root.page) {
                     return;
                 }

diff --git a/src/controls/templates/ApplicationHeader.qml b/src/controls/templates/ApplicationHeader.qml
@@ -350,8 +350,8 @@ AbstractApplicationHeader {
                         width: parent.width - x
 
                         Connections {
-                            target: delegateLoader.page
-                            Component.onDestruction: delegateLoader.sourceComponent = null
+                            target: delegateLoader.page.Component
+                            function onDestruction() { delegateLoader.sourceComponent = null }
                         }
 
                         sourceComponent: header.pageDelegate
@@ -369,7 +369,7 @@ AbstractApplicationHeader {
         }
         Connections {
             target: titleList.scrollingLocked ? pageRow.contentItem : null
-            onContentXChanged: {
+            function onContentXChanged() {
                 if (!titleList.dragging && !titleList.movingHorizontally && !titleList.scrollMutex) {
                     titleList.contentX = pageRow.contentItem.contentX - pageRow.contentItem.originX + titleList.originX;
                 }

diff --git a/src/controls/templates/OverlayDrawer.qml b/src/controls/templates/OverlayDrawer.qml
@@ -290,12 +290,12 @@ T2.Drawer {
     //NOTE: this is NOT a binding, otherwise it causes a binding loop in implicitHeight
     Connections {
         target: parent
-        onWidthChanged: {
+        function onWidthChanged() {
             if (edge === Qt.TopEdge || edge === Qt.BottomEdge) {
                 width = parent.width;
             }
         }
-        onHeightChanged: {
+        function onHeightChanged() {
             if (edge === Qt.LeftEdge || edge === Qt.RightEdge) {
                 height = parent.height;
             }

diff --git a/src/controls/templates/OverlaySheet.qml b/src/controls/templates/OverlaySheet.qml
@@ -343,7 +343,7 @@ QtObject {
             Connections {
                 target: enabled ? flickableContents.Window.activeFocusItem : null
                 enabled: flickableContents.focus && flickableContents.Window.activeFocusItem && flickableContents.Window.activeFocusItem.hasOwnProperty("text")
-                onTextChanged: {
+                function onTextChanged() {
                     if (Qt.inputMethod.cursorRectangle.y + Qt.inputMethod.cursorRectangle.height > mainItem.Window.height) {
                         scrollView.flickableItem.contentY += (Qt.inputMethod.cursorRectangle.y + Qt.inputMethod.cursorRectangle.height) - mainItem.Window.height
                     }
@@ -364,7 +364,7 @@ QtObject {
 
         Connections {
             target: scrollView.flickableItem
-            onContentHeightChanged: {
+            function onContentHeightChanged() {
                 if (openAnimation.running) {
                     openAnimation.running = false;
                     open();
@@ -528,7 +528,7 @@ QtObject {
                 Connections {
                     target: scrollView.flickableItem
                     property real oldContentY: 0
-                    onContentYChanged: {
+                    function onContentYChanged() {
                         if (outerFlickable.moving) {
                             oldContentY = scrollView.flickableItem.contentY;
                             return;

diff --git a/src/controls/templates/SwipeListItem.qml b/src/controls/templates/SwipeListItem.qml
@@ -199,7 +199,7 @@ T2.SwipeDelegate {
 
     Connections {
         target: Kirigami.Settings
-        onTabletModeChanged: {
+        function onTabletModeChanged() {
             if (Kirigami.Settings.tabletMode) {
                 if (!internal.swipeFilterItem) {
                     var component = Qt.createComponent(Qt.resolvedUrl("../private/SwipeItemEventFilter.qml"));
@@ -317,7 +317,7 @@ T2.SwipeDelegate {
                 id: swipeFilterConnection
 
                 target: internal.edgeEnabled ? internal.swipeFilterItem : null
-                onPeekChanged: {
+                function onPeekChanged() {
                     if (!listItem.actionsVisible) {
                         return;
                     }
@@ -333,22 +333,22 @@ T2.SwipeDelegate {
 
                     dragButton.lastPosition = listItem.swipe.position;
                 }
-                onPressed: {
+                function onPressed() {
                     if (internal.edgeEnabled) {
                         dragButton.onPressed(mouse);
                     }
                 }
-                onClicked: {
+                function onClicked() {
                     if (Math.abs(listItem.background.x) < Kirigami.Units.gridUnit && internal.edgeEnabled) {
                         dragButton.clicked(mouse);
                     }
                 }
-                onReleased: {
+                function onReleased() {
                     if (internal.edgeEnabled) {
                         dragButton.released(mouse);
                     }
                 }
-                onCurrentItemChanged: {
+                function onCurrentItemChanged() {
                     if (!internal.edgeEnabled) {
                         slideAnim.to = 0;
                         slideAnim.restart();