From 9f9420e331d7e613f0f53c2a733aa1c8cb8e5a06 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Tue, 1 Mar 2022 12:11:53 +0200 Subject: [PATCH 24/24] Qt: Remove 'menu' from mr_menu class It was used by setup_menus() method only, and had no well-defined meaning outside. Have just a local variable in setup_menus(). See osdn #43996 Signed-off-by: Marko Lindqvist --- client/gui-qt/menu.cpp | 1 + client/gui-qt/menu.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/client/gui-qt/menu.cpp b/client/gui-qt/menu.cpp index 580e8ff5e8..9929f48e5e 100644 --- a/client/gui-qt/menu.cpp +++ b/client/gui-qt/menu.cpp @@ -1006,6 +1006,7 @@ mr_menu::mr_menu() : QMenuBar() void mr_menu::setup_menus() { QAction *act; + QMenu *menu; QMenu *pr; QList menus; int i; diff --git a/client/gui-qt/menu.h b/client/gui-qt/menu.h index 906a89a0e8..31e96baaf3 100644 --- a/client/gui-qt/menu.h +++ b/client/gui-qt/menu.h @@ -273,7 +273,6 @@ class mr_menu : public QMenuBar Q_OBJECT QMenu *airlift_menu; QMenu *bases_menu; - QMenu *menu; QMenu *multiplayer_menu; QMenu *roads_menu; QActionGroup *airlift_type; -- 2.34.1