From 104828318680922ca2cc9319bf2bbb52fa7716f5 Mon Sep 17 00:00:00 2001 From: Shannon Booth Date: Mon, 18 May 2020 22:09:05 +1200 Subject: [PATCH] WindowServer: Remove uneeded const_casts for getting a submenu --- Services/WindowServer/Menu.cpp | 2 +- Services/WindowServer/MenuManager.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Services/WindowServer/Menu.cpp b/Services/WindowServer/Menu.cpp index 3f466a8375..ac8593b57a 100644 --- a/Services/WindowServer/Menu.cpp +++ b/Services/WindowServer/Menu.cpp @@ -523,7 +523,7 @@ bool Menu::is_menu_ancestor_of(const Menu& other) const for (auto& item : m_items) { if (!item.is_submenu()) continue; - auto& submenu = *const_cast(item).submenu(); + auto& submenu = *item.submenu(); if (&submenu == &other) return true; if (submenu.is_menu_ancestor_of(other)) diff --git a/Services/WindowServer/MenuManager.cpp b/Services/WindowServer/MenuManager.cpp index 31211edb69..99f7651eb8 100644 --- a/Services/WindowServer/MenuManager.cpp +++ b/Services/WindowServer/MenuManager.cpp @@ -351,7 +351,7 @@ static void collect_menu_subtree(Menu& menu, Vector& menus) auto& item = menu.item(i); if (!item.is_submenu()) continue; - collect_menu_subtree(*const_cast(item).submenu(), menus); + collect_menu_subtree(*item.submenu(), menus); } }