Fix 5.15 warnings for c++ singals to QML slots not using function

2025-02-01 04:51:48 +01:00 · 2020-03-25 21:29:01 +01:00 · 2020-03-25 21:29:01 +01:00 · 0658d3f8c8
commit 0658d3f8c8
parent 1cc2ec38a6
16 changed files with 42 additions and 39 deletions
--- a/ScreenPlay/main.qml
+++ b/ScreenPlay/main.qml
@ -74,10 +74,10 @@ ApplicationWindow {

    Connections {
        target: ScreenPlay.util
-        onRequestNavigation: {
+        function onRequestNavigation(nav) {
            switchPage(nav)
        }
-        onRequestToggleWallpaperConfiguration: {
+        function onRequestToggleWallpaperConfiguration() {
            monitors.state = monitors.state == "active" ? "inactive" : "active"
            ScreenPlay.screenPlayManager.requestProjectSettingsListModelAt(0)
        }
@ -233,7 +233,7 @@ ApplicationWindow {
        target: pageLoader.item
        ignoreUnknownSignals: true

-        onSetSidebarActive: {
+        function onSetSidebarActive(active) {
            if (active) {
                sidebar.state = "active"
            } else {
@ -241,7 +241,7 @@ ApplicationWindow {
            }
        }

-        onSetNavigationItem: {
+        function onSetNavigationItem(pos) {
            if (pos === 0) {
                nav.onPageChanged("Create")
            } else {
--- a/ScreenPlay/qml/Common/TagSelector.qml
+++ b/ScreenPlay/qml/Common/TagSelector.qml
@ -53,7 +53,7 @@ Item {

                Connections {
                    target: delegate
-                    onRemoveThis: {
+                    function onRemoveThis() {
                        listModel.remove(itemIndex)
                    }
                }
--- a/ScreenPlay/qml/Create/FFMPEGPopup.qml
+++ b/ScreenPlay/qml/Create/FFMPEGPopup.qml
@ -19,7 +19,8 @@ Popup {

    Connections {
        target: ScreenPlay.util
-        onAquireFFMPEGStatusChanged: {
+
+        function onAquireFFMPEGStatusChanged(aquireFFMPEGStatus) {

            switch (aquireFFMPEGStatus) {
            case QMLUtilities.Init:
--- a/ScreenPlay/qml/Create/Wizards/CreateEmptyHtmlWallpaper/CreateEmptyHtmlWallpaper.qml
+++ b/ScreenPlay/qml/Create/Wizards/CreateEmptyHtmlWallpaper/CreateEmptyHtmlWallpaper.qml
@ -206,7 +206,7 @@ Item {

                Connections {
                    target: ScreenPlay.create
-                    onHtmlWallpaperCreatedSuccessful: {
+                    function onHtmlWallpaperCreatedSuccessful(path) {
                        ScreenPlay.util.openFolderInExplorer(path)
                    }
                }
--- a/ScreenPlay/qml/Create/Wizards/CreateEmptyWidget/CreateEmptyWidget.qml
+++ b/ScreenPlay/qml/Create/Wizards/CreateEmptyWidget/CreateEmptyWidget.qml
@ -195,7 +195,7 @@ Item {

                Connections {
                    target: ScreenPlay.create
-                    onWidgetCreatedSuccessful: {
+                    function onWidgetCreatedSuccessful(path) {
                        ScreenPlay.util.openFolderInExplorer(path)
                    }
                }
--- a/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperVideoImportConvert.qml
+++ b/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperVideoImportConvert.qml
@ -50,7 +50,7 @@ Item {
    Connections {
        target: ScreenPlay.create

-        onCreateWallpaperStateChanged: {
+        function onCreateWallpaperStateChanged(state) {

            switch (state) {
            case CreateImportVideo.ConvertingPreviewImage:
--- a/ScreenPlay/qml/Installed/Installed.qml
+++ b/ScreenPlay/qml/Installed/Installed.qml
@ -28,16 +28,16 @@ Item {

    Connections {
        target: loaderHelp.item
-        onHelperButtonPressed: {
+        function onHelperButtonPressed(pos) {
            setNavigationItem(pos)
        }
    }
    Connections {
        target: ScreenPlay.installedListModel
-        onInstalledLoadingFinished: {
+        function onInstalledLoadingFinished(){
            checkIsContentInstalled()
        }
-        onCountChanged: {
+        function onCountChanged(count) {
            if (count === 0) {
                checkIsContentInstalled()
            }
--- a/ScreenPlay/qml/Installed/Sidebar.qml
+++ b/ScreenPlay/qml/Installed/Sidebar.qml
@ -34,7 +34,7 @@ Item {
    Connections {
        target: ScreenPlay.util

-        onSetSidebarItem: {
+        function onSetSidebarItem(screenId, type) {

            // Toggle sidebar if clicked on the same content twice
            if (activeScreen === screenId && root.state !== "inactive") {
--- a/ScreenPlay/qml/Monitors/MonitorSelection.qml
+++ b/ScreenPlay/qml/Monitors/MonitorSelection.qml
@ -28,7 +28,7 @@ Rectangle {

    Connections {
        target:  ScreenPlay.monitorListModel
-        onMonitorReloadCompleted: {
+        function onMonitorReloadCompleted() {
            resize()
        }
    }
--- a/ScreenPlay/qml/Monitors/Monitors.qml
+++ b/ScreenPlay/qml/Monitors/Monitors.qml
@ -98,10 +98,10 @@ Item {
                }
                Connections {
                    target: ScreenPlay.screenPlayManager
-                    onProjectSettingsListModelFound: {
+                    function onProjectSettingsListModelFound(li,type) {
                        videoControlWrapper.state = "visible"
                        customPropertiesGridView.model = li
-                        if (type == "videoWallpaper") {
+                        if (type === "videoWallpaper") {
                            customPropertiesGridView.state = "hidden"
                            videoControlWrapper.state = "visible"
                        } else {
@ -109,7 +109,7 @@ Item {
                            videoControlWrapper.state = "hidden"
                        }
                    }
-                    onProjectSettingsListModelNotFound: {
+                    function onProjectSettingsListModelNotFound() {
                        customPropertiesGridView.model = null
                        videoControlWrapper.state = "hidden"
                        customPropertiesGridView.state = "hidden"
--- a/ScreenPlay/qml/Navigation/Navigation.qml
+++ b/ScreenPlay/qml/Navigation/Navigation.qml
@ -25,10 +25,10 @@ Rectangle {

    Connections {
        target: ScreenPlay.util
-        onRequestNavigationActive: {
+        function onRequestNavigationActive(isActive) {
            setActive(isActive)
        }
-        onRequestNavigation:{
+        function onRequestNavigation(nav){
            onPageChanged(nav)
        }
    }
--- a/ScreenPlay/qml/Navigation/NavigationWallpaperConfiguration.qml
+++ b/ScreenPlay/qml/Navigation/NavigationWallpaperConfiguration.qml
@ -24,7 +24,7 @@ Item {

    Connections {
        target: ScreenPlay.screenPlayManager
-        onActiveWallpaperCounterChanged: {
+        function onActiveWallpaperCounterChanged() {
            rippleEffect.trigger()
            ScreenPlay.setTrackerSendEvent("navigation",
                                           "wallpaperConfiguration")
--- a/ScreenPlay/qml/Settings/Settings.qml
+++ b/ScreenPlay/qml/Settings/Settings.qml
@ -493,7 +493,7 @@ Item {

                            Connections {
                                target: ScreenPlay.util
-                                onAllLicenseLoaded: {
+                                function onAllLicenseLoaded(licensesText) {
                                    expanderCopyright.text = licensesText
                                }
                            }
@ -534,7 +534,7 @@ Item {

                            Connections {
                                target: ScreenPlay.util
-                                onAllDataProtectionLoaded: {
+                                function onAllDataProtectionLoaded(dataProtectionText) {
                                    expanderDataProtection.text = dataProtectionText
                                }
                            }
--- a/ScreenPlayWallpaper/WebView.qml
+++ b/ScreenPlayWallpaper/WebView.qml
@ -82,12 +82,12 @@ Item {
    Connections {
        target: window

-        onQmlExit: {
+        function onQmlExit() {
            webView.runJavaScript(
                        "var videoPlayer = document.getElementById('videoPlayer'); videoPlayer.volume = 0;")
        }

-        onMutedChanged: {
+        function onMutedChanged(muted) {
            if (muted) {
                webView.runJavaScript(
                            "var videoPlayer = document.getElementById('videoPlayer'); videoPlayer.volume = 0;")
@ -97,28 +97,28 @@ Item {
            }
        }

-        onFillModeChanged: {
+        function onFillModeChanged(fillMode) {
            if (webView.loadProgress === 100) {
                webView.runJavaScript(
-                            "var videoPlayer = document.getElementById('videoPlayer'); videoPlayer.setAttribute('style', 'object-fit :" + window.fillMode + ";');")
+                            "var videoPlayer = document.getElementById('videoPlayer'); videoPlayer.setAttribute('style', 'object-fit :" + fillMode + ";');")
            }
        }

-        onLoopsChanged: {
+        function onLoopsChanged(loops) {
            if (webView.loadProgress === 100) {
                webView.runJavaScript(
                            "var videoPlayer = document.getElementById('videoPlayer'); videoPlayer.loop = " + loops + ";")
            }
        }

-        onVolumeChanged: {
+        function onVolumeChanged(volume) {
            if (webView.loadProgress === 100) {
                webView.runJavaScript(
                            "var videoPlayer = document.getElementById('videoPlayer'); videoPlayer.volume = " + volume + ";")
            }
        }

-        onCurrentTimeChanged: {
+        function onCurrentTimeChanged(currentTime) {
            if (webView.loadProgress === 100) {
                webView.runJavaScript(
                            "var videoPlayer = document.getElementById('videoPlayer'); videoPlayer.currentTime  = "
@ -126,21 +126,21 @@ Item {
            }
        }

-        onPlaybackRateChanged: {
+        function onPlaybackRateChanged(playbackRate) {
            if (webView.loadProgress === 100) {
                webView.runJavaScript(
                            "var videoPlayer = document.getElementById('videoPlayer'); videoPlayer.playbackRate  = " + playbackRate + ";")
            }
        }

-        onVisualsPausedChanged:{
-            if(window.checkWallpaperVisible){
+       function  onVisualsPausedChanged(checkWallpaperVisible){
+            if(checkWallpaperVisible){
                webView.visible = !visualsPaused
                txtVisualsPaused.visible = visualsPaused
            }
        }

-        onIsPlayingChanged: {
+        function onIsPlayingChanged(isPlaying) {
            if (webView.loadProgress === 100) {
                if (isPlaying) {
                    webView.runJavaScript(
--- a/ScreenPlayWallpaper/mainWindow.qml
+++ b/ScreenPlayWallpaper/mainWindow.qml
@ -23,7 +23,7 @@ Rectangle {
    Connections {
        target: window

-        onQmlExit: {
+        function onQmlExit() {
            if (canFadeByWallpaperFillMode && window.canFade) {
                imgCover.state = "outExit"
            } else {
@ -31,14 +31,14 @@ Rectangle {
            }
        }

-        onQmlSceneValueReceived: {
+        function onQmlSceneValueReceived(key,value) {
            var obj2 = 'import QtQuick 2.0; Item {Component.onCompleted: loader.item.'
                    + key + ' = ' + value + '; }'
            print(key, value)
            var newObject = Qt.createQmlObject(obj2.toString(), root, "err")
            newObject.destroy(10000)
        }
-        onReloadQML:{
+        function onReloadQML(){
            loader.sourceComponent = undefined
            loader.source = ""
            window.clearComponentCache()
@ -92,7 +92,9 @@ Rectangle {
        Connections {
            ignoreUnknownSignals: true
            target: loader.item
-            onRequestFadeIn: fadeIn()
+            function onRequestFadeIn() {
+                fadeIn()
+            }
        }
    }

--- a/ScreenPlayWidget/mainWidget.qml
+++ b/ScreenPlayWidget/mainWidget.qml
@ -10,12 +10,12 @@ Item {
    Connections {
        target: Widget

-        onQmlExit: {
+        function onQmlExit() {
            Widget.setWindowBlur(0)
            animFadeOut.start()
        }

-        onQmlSceneValueReceived: {
+        function onQmlSceneValueReceived(key,value) {
            var obj2 = 'import QtQuick 2.14; Item {Component.onCompleted: loader.item.'
                    + key + ' = ' + value + '; }'
            var newObject = Qt.createQmlObject(obj2.toString(), root, "err")