From 1e89fa4226be870d97d3b21c6c7087886c81bbc5 Mon Sep 17 00:00:00 2001
From: Peter Varga <pvarga@inf.u-szeged.hu>
Date: Tue, 11 Sep 2018 15:48:43 +0200
Subject: Clean up WebEngineAction API

- Rename iconText to iconName
- Remove unused QQuickWebEngineAction::toggled signal
- Remove argument of QQuickWebEngineAction::enabledChanged signal

Change-Id: I37172c096003eea58e567753265abd91679dacf1
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 src/webengine/api/qquickwebengineview.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/webengine/api/qquickwebengineview.cpp')

diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index 6bf23ea7b..116f49c3c 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -1768,30 +1768,30 @@ QQuickWebEngineAction *QQuickWebEngineView::action(WebAction action)
     }
 
     QString text;
-    QString iconText;
+    QString iconName;
 
     switch (action) {
     case Back:
         text = RenderViewContextMenuQt::getMenuItemName(RenderViewContextMenuQt::ContextMenuItem::Back);
-        iconText = QStringLiteral("go-previous");
+        iconName = QStringLiteral("go-previous");
         break;
     case Forward:
         text = RenderViewContextMenuQt::getMenuItemName(RenderViewContextMenuQt::ContextMenuItem::Forward);
-        iconText = QStringLiteral("go-next");
+        iconName = QStringLiteral("go-next");
         break;
     case Stop:
         text = tr("Stop");
         break;
     case Reload:
         text = RenderViewContextMenuQt::getMenuItemName(RenderViewContextMenuQt::ContextMenuItem::Reload);
-        iconText = QStringLiteral("view-refresh");
+        iconName = QStringLiteral("view-refresh");
         break;
     case ReloadAndBypassCache:
         text = tr("Reload and Bypass Cache");
         break;
     case Cut:
         text = RenderViewContextMenuQt::getMenuItemName(RenderViewContextMenuQt::ContextMenuItem::Cut);
-        iconText = QStringLiteral("Cut");
+        iconName = QStringLiteral("Cut");
         break;
     case Copy:
         text = RenderViewContextMenuQt::getMenuItemName(RenderViewContextMenuQt::ContextMenuItem::Copy);
@@ -1870,7 +1870,7 @@ QQuickWebEngineAction *QQuickWebEngineView::action(WebAction action)
         break;
     case ViewSource:
         text = RenderViewContextMenuQt::getMenuItemName(RenderViewContextMenuQt::ContextMenuItem::ViewSource);
-        iconText = QStringLiteral("view-source");
+        iconName = QStringLiteral("view-source");
         break;
     case ToggleBold:
         text = tr("&Bold");
@@ -1914,7 +1914,7 @@ QQuickWebEngineAction *QQuickWebEngineView::action(WebAction action)
         break;
     }
 
-    QQuickWebEngineAction *retVal = new QQuickWebEngineAction(action, text, iconText, false, this);
+    QQuickWebEngineAction *retVal = new QQuickWebEngineAction(action, text, iconName, false, this);
 
     d->actions[action] = retVal;
     d->updateAction(action);
-- 
cgit v1.2.3