From 5d593212531ed3a0b49a44894bc924ffa9298dc6 Mon Sep 17 00:00:00 2001
From: Volker Krause <vkrause@kde.org>
Date: Sat, 3 Sep 2022 09:29:42 +0200
Subject: [PATCH] Rename action() signal in clipboard menu

The base class for this has an action property in Qt 6.
---
 applets/clipboard/contents/ui/ClipboardItemDelegate.qml | 2 +-
 applets/clipboard/contents/ui/ClipboardPage.qml         | 2 +-
 applets/clipboard/contents/ui/DelegateToolButtons.qml   | 2 +-
 applets/clipboard/contents/ui/Menu.qml                  | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/applets/clipboard/contents/ui/ClipboardItemDelegate.qml b/applets/clipboard/contents/ui/ClipboardItemDelegate.qml
index a611c1054..1370aea08 100644
--- a/applets/clipboard/contents/ui/ClipboardItemDelegate.qml
+++ b/applets/clipboard/contents/ui/ClipboardItemDelegate.qml
@@ -30,7 +30,7 @@ PlasmaComponents.ItemDelegate {
     signal remove(string uuid)
     signal edit(string uuid)
     signal barcode(string text)
-    signal action(string uuid)
+    signal triggerAction(string uuid)
 
     // the 1.6 comes from ToolButton's default height
     height: Math.max(label.height, Math.round(PlasmaCore.Units.gridUnit * 1.6)) + 2 * PlasmaCore.Units.smallSpacing
diff --git a/applets/clipboard/contents/ui/ClipboardPage.qml b/applets/clipboard/contents/ui/ClipboardPage.qml
index 32f4fbe01..acd1240a6 100644
--- a/applets/clipboard/contents/ui/ClipboardPage.qml
+++ b/applets/clipboard/contents/ui/ClipboardPage.qml
@@ -160,7 +160,7 @@ Menu {
             text: text
         });
     }
-    onAction: clipboardSource.service(uuid, "action")
+    onTriggerAction: clipboardSource.service(uuid, "action")
 
     Component.onCompleted: {
         // Intercept up/down key to prevent ListView from accepting the key event.
diff --git a/applets/clipboard/contents/ui/DelegateToolButtons.qml b/applets/clipboard/contents/ui/DelegateToolButtons.qml
index 088217eb9..129f8a6cd 100644
--- a/applets/clipboard/contents/ui/DelegateToolButtons.qml
+++ b/applets/clipboard/contents/ui/DelegateToolButtons.qml
@@ -22,7 +22,7 @@ RowLayout {
         display: PlasmaComponents3.AbstractButton.IconOnly
         text: i18n("Invoke action")
 
-        onClicked: menuItem.action(UuidRole)
+        onClicked: menuItem.triggerAction(UuidRole)
 
         PlasmaComponents3.ToolTip {
             text: parent.text
diff --git a/applets/clipboard/contents/ui/Menu.qml b/applets/clipboard/contents/ui/Menu.qml
index 6dde29a13..e50d21e71 100644
--- a/applets/clipboard/contents/ui/Menu.qml
+++ b/applets/clipboard/contents/ui/Menu.qml
@@ -25,7 +25,7 @@ PlasmaComponents3.ScrollView {
     signal remove(string uuid)
     signal edit(string uuid)
     signal barcode(string text)
-    signal action(string uuid)
+    signal triggerAction(string uuid)
 
     // HACK: workaround for https://bugreports.qt.io/browse/QTBUG-83890
     PlasmaComponents3.ScrollBar.horizontal.policy: PlasmaComponents3.ScrollBar.AlwaysOff
@@ -58,7 +58,7 @@ PlasmaComponents3.ScrollView {
             onRemove: menu.remove(uuid)
             onEdit: menu.edit(uuid)
             onBarcode: menu.barcode(text)
-            onAction: menu.action(uuid)
+            onTriggerAction: menu.triggerAction(uuid)
 
             Binding {
                 target: menuListView; when: hovered