From 7be14ea88b7b60979447c6e27050d922c1ed790b Mon Sep 17 00:00:00 2001
From: Volker Hilsheimer <volker.hilsheimer@qt.io>
Date: Wed, 6 Dec 2023 16:05:35 +0100
Subject: [PATCH] QIcon: use (some) ThemeIcon constants in the Apple engine
 implementation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I4976bf3b6a389ad772cad9dfa768ab3447c6771c
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
---
 src/gui/platform/darwin/qappleiconengine.mm | 31 ++++++++++-----------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/gui/platform/darwin/qappleiconengine.mm b/src/gui/platform/darwin/qappleiconengine.mm
index 5dc9a6ed82..9ad1615fd9 100644
--- a/src/gui/platform/darwin/qappleiconengine.mm
+++ b/src/gui/platform/darwin/qappleiconengine.mm
@@ -23,22 +23,21 @@ using namespace Qt::StringLiterals;
 namespace {
 auto *loadImage(const QString &iconName)
 {
-    static constexpr std::pair<QStringView, NSString *> iconMap[] = {
-        {u"address-book-new", @"folder.circle"},
-        {u"application-exit", @"xmark.circle"},
-        {u"appointment-new", @"hourglass.badge.plus"},
-        {u"call-start", @"phone.arrow.up.right"},
-        {u"call-stop", @"phone.arrow.down.left"},
-        {u"edit-clear", @"clear"},
-        {u"edit-copy", @"doc.on.doc"},
-        {u"edit-cut", @"scissors"},
-        {u"edit-delete", @"delete.left"},
-        {u"edit-find", @"magnifyingglass"},
-        {u"edit-find-replace", @"arrow.up.left.and.down.right.magnifyingglass"},
-        {u"edit-paste", @"clipboard"},
-        {u"edit-redo", @"arrowshape.turn.up.right"},
-        {u"edit-select-all", @""},
-        {u"edit-undo", @"arrowshape.turn.up.left"},
+    static constexpr std::pair<QLatin1StringView, NSString *> iconMap[] = {
+        {QIcon::ThemeIcon::AddressBookNew, @"folder.circle"},
+        {QIcon::ThemeIcon::ApplicationExit, @"xmark.circle"},
+        {QIcon::ThemeIcon::AppointmentNew, @"hourglass.badge.plus"},
+        {QIcon::ThemeIcon::CallStart, @"phone.arrow.up.right"},
+        {QIcon::ThemeIcon::CallStop, @"phone.arrow.down.left"},
+        {QIcon::ThemeIcon::EditClear, @"clear"},
+        {QIcon::ThemeIcon::EditCopy, @"doc.on.doc"},
+        {QIcon::ThemeIcon::EditCut, @"scissors"},
+        {QIcon::ThemeIcon::EditDelete, @"delete.left"},
+        {QIcon::ThemeIcon::EditFind, @"magnifyingglass"},
+        {QIcon::ThemeIcon::EditFindReplace, @"arrow.up.left.and.down.right.magnifyingglass"},
+        {QIcon::ThemeIcon::EditPaste, @"clipboard"},
+        {QIcon::ThemeIcon::EditRedo, @"arrowshape.turn.up.right"},
+        {QIcon::ThemeIcon::EditUndo, @"arrowshape.turn.up.left"},
     };
     const auto it = std::find_if(std::begin(iconMap), std::end(iconMap), [iconName](const auto &c){
         return c.first == iconName;