From d34c08723d0edc3448704214280d7b8e97e7849b Mon Sep 17 00:00:00 2001 From: Pierre Lamot Date: Mon, 22 Jan 2024 16:08:22 +0100 Subject: [PATCH] qml: fix qt6 parameters injection warning from MouseArea --- .../gui/qt/dialogs/toolbar/qml/EditorDNDDelegate.qml | 2 +- .../dialogs/toolbar/qml/ToolbarEditorButtonList.qml | 2 +- .../gui/qt/medialibrary/qml/MusicArtistDelegate.qml | 6 +++--- modules/gui/qt/player/qml/PlaybackSpeed.qml | 2 +- modules/gui/qt/player/qml/Player.qml | 2 +- modules/gui/qt/player/qml/SliderBar.qml | 6 +++--- .../qt/player/qml/controlbarcontrols/PlayButton.qml | 6 +++--- .../qt/player/qml/controlbarcontrols/VolumeWidget.qml | 11 +++++++---- modules/gui/qt/playlist/qml/PlaylistDelegate.qml | 6 +++--- modules/gui/qt/widgets/qml/ExpandGridView.qml | 4 ++-- modules/gui/qt/widgets/qml/GridItem.qml | 8 ++++---- modules/gui/qt/widgets/qml/HorizontalResizeHandle.qml | 4 ++-- modules/gui/qt/widgets/qml/KeyNavigableListView.qml | 4 ++-- modules/gui/qt/widgets/qml/MediaCover.qml | 2 +- modules/gui/qt/widgets/qml/TableViewDelegate.qml | 6 +++--- 15 files changed, 37 insertions(+), 34 deletions(-) diff --git a/modules/gui/qt/dialogs/toolbar/qml/EditorDNDDelegate.qml b/modules/gui/qt/dialogs/toolbar/qml/EditorDNDDelegate.qml index fdfe84c187..6b1a8f4d37 100644 --- a/modules/gui/qt/dialogs/toolbar/qml/EditorDNDDelegate.qml +++ b/modules/gui/qt/dialogs/toolbar/qml/EditorDNDDelegate.qml @@ -78,7 +78,7 @@ Control { } } - onPressed: { + onPressed: (mouse) => { const pos = mapToItem(control.contentItem.target.parent, mouseX, mouseY) control.contentItem.target.y = pos.y + VLCStyle.dragDelta control.contentItem.target.x = pos.x + VLCStyle.dragDelta diff --git a/modules/gui/qt/dialogs/toolbar/qml/ToolbarEditorButtonList.qml b/modules/gui/qt/dialogs/toolbar/qml/ToolbarEditorButtonList.qml index 246f72855a..8e15988900 100644 --- a/modules/gui/qt/dialogs/toolbar/qml/ToolbarEditorButtonList.qml +++ b/modules/gui/qt/dialogs/toolbar/qml/ToolbarEditorButtonList.qml @@ -159,7 +159,7 @@ GridView { } } - onPressed: { + onPressed: (mouse) => { const pos = mapToItem(buttonDragItem.parent, mouseX, mouseY) buttonDragItem.y = pos.y + VLCStyle.dragDelta buttonDragItem.x = pos.x + VLCStyle.dragDelta diff --git a/modules/gui/qt/medialibrary/qml/MusicArtistDelegate.qml b/modules/gui/qt/medialibrary/qml/MusicArtistDelegate.qml index 784aed3190..139efb89f5 100644 --- a/modules/gui/qt/medialibrary/qml/MusicArtistDelegate.qml +++ b/modules/gui/qt/medialibrary/qml/MusicArtistDelegate.qml @@ -118,19 +118,19 @@ T.ItemDelegate { } } - onClicked: function(mouse) { + onClicked: (mouse) => { if (!(root.selected && mouse.button === Qt.RightButton)) { view.selectionModel.updateSelection(mouse.modifiers, view.currentIndex, index) view.currentIndex = index } } - onDoubleClicked: function(mouse) { + onDoubleClicked: (mouse) => { if (mouse.button !== Qt.RightButton) MediaLib.addAndPlay(model.id); } - onPressed: { + onPressed: (mouse) => { root.forceActiveFocus(Qt.MouseFocusReason) } } diff --git a/modules/gui/qt/player/qml/PlaybackSpeed.qml b/modules/gui/qt/player/qml/PlaybackSpeed.qml index be73a61527..3ea4808f02 100644 --- a/modules/gui/qt/player/qml/PlaybackSpeed.qml +++ b/modules/gui/qt/player/qml/PlaybackSpeed.qml @@ -241,7 +241,7 @@ ColumnLayout { acceptedButtons: Qt.LeftButton - onPressed: { + onPressed: (mouse) => { mouse.accepted = false root._shiftPressed = (mouse.modifiers === Qt.ShiftModifier) diff --git a/modules/gui/qt/player/qml/Player.qml b/modules/gui/qt/player/qml/Player.qml index d17f77d5af..5bbb58b72f 100644 --- a/modules/gui/qt/player/qml/Player.qml +++ b/modules/gui/qt/player/qml/Player.qml @@ -360,7 +360,7 @@ FocusScope { visible: !rootPlayer.hasEmbededVideo - onWheel: { + onWheel: (wheel) => { if (rootPlayer.hasEmbededVideo) { wheel.accepted = false diff --git a/modules/gui/qt/player/qml/SliderBar.qml b/modules/gui/qt/player/qml/SliderBar.qml index 778ed7c18c..0ac06b4b46 100644 --- a/modules/gui/qt/player/qml/SliderBar.qml +++ b/modules/gui/qt/player/qml/SliderBar.qml @@ -229,11 +229,11 @@ Slider { preventStealing: true - onPressed: fsm.pressControl(mouse.x / width, mouse.modifiers === Qt.ShiftModifier) + onPressed: (mouse) => { fsm.pressControl(mouse.x / width, mouse.modifiers === Qt.ShiftModifier) } - onReleased: fsm.releaseControl(mouse.x / width, mouse.modifiers === Qt.ShiftModifier) + onReleased: (mouse) => { fsm.releaseControl(mouse.x / width, mouse.modifiers === Qt.ShiftModifier) } - onPositionChanged: fsm.moveControl(mouse.x / width, mouse.modifiers === Qt.ShiftModifier) + onPositionChanged: (mouse) => { fsm.moveControl(mouse.x / width, mouse.modifiers === Qt.ShiftModifier) } onEntered: { if(Player.hasChapters) diff --git a/modules/gui/qt/player/qml/controlbarcontrols/PlayButton.qml b/modules/gui/qt/player/qml/controlbarcontrols/PlayButton.qml index 4222d4c172..b3fa84d94c 100644 --- a/modules/gui/qt/player/qml/controlbarcontrols/PlayButton.qml +++ b/modules/gui/qt/player/qml/controlbarcontrols/PlayButton.qml @@ -173,7 +173,7 @@ T.Control { } } - onPressed: { + onPressed: (mouse) => { if (!cursorInside) { mouse.accepted = false return @@ -182,12 +182,12 @@ T.Control { root.forceActiveFocus(Qt.MouseFocusReason) } - onClicked: { + onClicked: (mouse) => { MainPlaylistController.togglePlayPause() mouse.accepted = true } - onPressAndHold: { + onPressAndHold: (mouse) => { _pressAndHoldAction() mouse.accepted = true } diff --git a/modules/gui/qt/player/qml/controlbarcontrols/VolumeWidget.qml b/modules/gui/qt/player/qml/controlbarcontrols/VolumeWidget.qml index faf998af09..7f42aa0e63 100644 --- a/modules/gui/qt/player/qml/controlbarcontrols/VolumeWidget.qml +++ b/modules/gui/qt/player/qml/controlbarcontrols/VolumeWidget.qml @@ -238,7 +238,7 @@ T.Pane { anchors.margins: -(VLCStyle.dp(4, VLCStyle.scale)) - onPressed: { + onPressed: (mouse) => { mouse.accepted = false if (mouse.modifiers === Qt.ShiftModifier) @@ -256,7 +256,7 @@ T.Pane { acceptedButtons: (Qt.LeftButton | Qt.RightButton) - onPressed: { + onPressed: (mouse) => { if (root.paintOnly) { mouse.accepted = true return @@ -273,9 +273,12 @@ T.Pane { adjustVolume(mouse) } - onPositionChanged: if (mouse.buttons & Qt.RightButton) adjustVolume(mouse) + onPositionChanged: (mouse) => { + if (mouse.buttons & Qt.RightButton) + adjustVolume(mouse) + } - onWheel: { + onWheel: (wheel) => { let delta = 0, fineControl = false if ((Math.abs(wheel.pixelDelta.x) % 120 > 0) || (Math.abs(wheel.pixelDelta.y) % 120 > 0)) { diff --git a/modules/gui/qt/playlist/qml/PlaylistDelegate.qml b/modules/gui/qt/playlist/qml/PlaylistDelegate.qml index 40a424dec7..96f6bd83a0 100644 --- a/modules/gui/qt/playlist/qml/PlaylistDelegate.qml +++ b/modules/gui/qt/playlist/qml/PlaylistDelegate.qml @@ -245,7 +245,7 @@ T.ItemDelegate { acceptedButtons: Qt.LeftButton | Qt.RightButton - onClicked: { + onClicked: (mouse) => { /* to receive keys events */ if (!(delegate.selected && mouse.button === Qt.RightButton)) { view.selectionModel.updateSelection(mouse.modifiers, view.currentIndex, index) @@ -256,12 +256,12 @@ T.ItemDelegate { contextMenu.popup(index, this.mapToGlobal(mouse.x, mouse.y)) } - onDoubleClicked: { + onDoubleClicked: (mouse) => { if (mouse.button !== Qt.RightButton) MainPlaylistController.goTo(index, true) } - onPressed: { + onPressed: (mouse) => { delegate.forceActiveFocus(Qt.MouseFocusReason) } diff --git a/modules/gui/qt/widgets/qml/ExpandGridView.qml b/modules/gui/qt/widgets/qml/ExpandGridView.qml index 5568a37f54..5132be2d0f 100644 --- a/modules/gui/qt/widgets/qml/ExpandGridView.qml +++ b/modules/gui/qt/widgets/qml/ExpandGridView.qml @@ -634,7 +634,7 @@ FocusScope { preventStealing: true acceptedButtons: Qt.LeftButton | Qt.RightButton - onPressed: { + onPressed: (mouse) => { Helpers.enforceFocus(flickable, Qt.MouseFocusReason) if (!(mouse.modifiers & (Qt.ShiftModifier | Qt.ControlModifier))) { @@ -643,7 +643,7 @@ FocusScope { } } - onReleased: { + onReleased: (mouse) => { if (mouse.button & Qt.RightButton) { root.showContextMenu(mapToGlobal(mouse.x, mouse.y)) } diff --git a/modules/gui/qt/widgets/qml/GridItem.qml b/modules/gui/qt/widgets/qml/GridItem.qml index 91983db489..63964c1d45 100644 --- a/modules/gui/qt/widgets/qml/GridItem.qml +++ b/modules/gui/qt/widgets/qml/GridItem.qml @@ -188,7 +188,7 @@ T.ItemDelegate { drag.smoothed: false - onClicked: { + onClicked: (mouse) => { if (mouse.button === Qt.RightButton) contextMenuButtonClicked(picture, root.mapToGlobal(mouse.x,mouse.y)); else { @@ -196,12 +196,12 @@ T.ItemDelegate { } } - onDoubleClicked: { + onDoubleClicked: (mouse) => { if (mouse.button === Qt.LeftButton) root.itemDoubleClicked(picture,mouse.buttons, mouse.modifiers) } - onPressed: { + onPressed: (mouse) => { _modifiersOnLastPress = mouse.modifiers } @@ -252,7 +252,7 @@ T.ItemDelegate { Layout.preferredWidth: pictureWidth Layout.preferredHeight: pictureHeight - onPlayIconClicked: { + onPlayIconClicked: (mouse) => { // emulate a mouse click before delivering the play signal as to select the item // this helps in updating the selection and restore of initial index in the parent views root.itemClicked(picture, mouse.button, mouse.modifiers) diff --git a/modules/gui/qt/widgets/qml/HorizontalResizeHandle.qml b/modules/gui/qt/widgets/qml/HorizontalResizeHandle.qml index bb25a8f423..84ac1c4599 100644 --- a/modules/gui/qt/widgets/qml/HorizontalResizeHandle.qml +++ b/modules/gui/qt/widgets/qml/HorizontalResizeHandle.qml @@ -42,12 +42,12 @@ MouseArea { width: VLCStyle.dp(8, VLCStyle.scale) acceptedButtons: Qt.LeftButton - onPressed: { + onPressed: (mouse) => { MainCtx.setCursor(cursorShape) _previousX = mouseX } - onReleased: { + onReleased:(mouse) => { MainCtx.restoreCursor() } diff --git a/modules/gui/qt/widgets/qml/KeyNavigableListView.qml b/modules/gui/qt/widgets/qml/KeyNavigableListView.qml index 4806838b0c..4cb85603fb 100644 --- a/modules/gui/qt/widgets/qml/KeyNavigableListView.qml +++ b/modules/gui/qt/widgets/qml/KeyNavigableListView.qml @@ -314,7 +314,7 @@ ListView { acceptedButtons: Qt.LeftButton | Qt.RightButton - onPressed: { + onPressed: (mouse) => { focus = true // Grab the focus from delegate root.forceActiveFocus(Qt.MouseFocusReason) // Re-focus the list @@ -326,7 +326,7 @@ ListView { mouse.accepted = true } - onReleased: { + onReleased: (mouse) => { if (mouse.button & Qt.RightButton) { root.showContextMenu(mapToGlobal(mouse.x, mouse.y)) } diff --git a/modules/gui/qt/widgets/qml/MediaCover.qml b/modules/gui/qt/widgets/qml/MediaCover.qml index d8d7bc65a1..2176417870 100644 --- a/modules/gui/qt/widgets/qml/MediaCover.qml +++ b/modules/gui/qt/widgets/qml/MediaCover.qml @@ -105,7 +105,7 @@ Rectangle { sourceComponent: Widgets.PlayCover { width: playIconSize - onClicked: playIconClicked(mouse) + onClicked: (mouse) => playIconClicked(mouse) } asynchronous: true diff --git a/modules/gui/qt/widgets/qml/TableViewDelegate.qml b/modules/gui/qt/widgets/qml/TableViewDelegate.qml index 3dd4aeb615..417201f548 100644 --- a/modules/gui/qt/widgets/qml/TableViewDelegate.qml +++ b/modules/gui/qt/widgets/qml/TableViewDelegate.qml @@ -127,11 +127,11 @@ T.Control { // Events - onPressed: { + onPressed: (mouse) => { _modifiersOnLastPress = mouse.modifiers } - onClicked: { + onClicked: (mouse) => { if ((mouse.button === Qt.LeftButton) || !delegate.selected) { delegate.selectAndFocus(mouse.modifiers, Qt.MouseFocusReason) } @@ -140,7 +140,7 @@ T.Control { delegate.rightClick(delegate, delegate.rowModel, hoverArea.mapToGlobal(mouse.x, mouse.y)) } - onDoubleClicked: { + onDoubleClicked: (mouse) => { if (mouse.button === Qt.LeftButton) delegate.itemDoubleClicked(delegate._index, delegate.rowModel) }