From a613175b04a735efbd21548278abdd5958322d5f Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Tue, 13 Jun 2023 16:08:02 +0300 Subject: [PATCH 43/43] Qt: Clean out page_menu from fc_client.h See osdn #48235 Signed-off-by: Marko Lindqvist --- client/gui-qt/fc_client.h | 25 ++++++++++++------------- client/gui-qt/pages.cpp | 3 ++- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/client/gui-qt/fc_client.h b/client/gui-qt/fc_client.h index 6d9f1f6498..9e3cb6c322 100644 --- a/client/gui-qt/fc_client.h +++ b/client/gui-qt/fc_client.h @@ -90,10 +90,10 @@ class fc_icons private: explicit fc_icons(); - static fc_icons* m_instance; + static fc_icons *m_instance; public: - static fc_icons* instance(); + static fc_icons *instance(); static void drop(); QIcon get_icon(const QString& id); QPixmap *get_pixmap(const QString& id); @@ -196,21 +196,21 @@ class fc_client : public QMainWindow, QPushButton *start_button; QPushButton *nation_button; - QDialogButtonBox* button_box; + QDialogButtonBox *button_box; QSocketNotifier *server_notifier; chat_input *chat_line; - QTableWidget* lan_widget; - QTableWidget* wan_widget; - QTableWidget* info_widget; - QTableWidget* saves_load; - QTableWidget* scenarios_load; - QTreeWidget* start_players_tree; + QTableWidget *lan_widget; + QTableWidget *wan_widget; + QTableWidget *info_widget; + QTableWidget *saves_load; + QTableWidget *scenarios_load; + QTreeWidget *start_players_tree; - QTimer* meta_scan_timer; - QTimer* lan_scan_timer; + QTimer *meta_scan_timer; + QTimer *lan_scan_timer; QTimer *update_info_timer; QStatusBar *status_bar; @@ -278,7 +278,6 @@ public: fc_sidewidget *sw_diplo; float map_scale; bool map_font_scale; - QMenu *page_menu; QMenu *page_submenu_AI; QMenu *page_submenu_team; @@ -348,7 +347,7 @@ private: void read_settings(); enum client_pages page; - QMap opened_repo_dlgs; + QMap opened_repo_dlgs; QStringList status_bar_queue; QString current_file; bool send_new_aifill_to_server; diff --git a/client/gui-qt/pages.cpp b/client/gui-qt/pages.cpp index 3dfa2fb9cd..aa3a055713 100644 --- a/client/gui-qt/pages.cpp +++ b/client/gui-qt/pages.cpp @@ -1976,7 +1976,8 @@ void fc_client::start_page_menu(QPoint pos) player *pplayer = (player *) qvar2.value < void *>(); if (pplayer != nullptr) { - page_menu = new QMenu(this); + QMenu *page_menu = new QMenu(this); + page_submenu_AI = new QMenu(this); page_submenu_team = new QMenu(this); -- 2.39.2