Remove civstatus

The civstatus widget was introduced as a first-gen top bar, but never reached
maturity and is now superseded. Remove it.

Closes longturn#1271.

client/CMakeLists.txt

@@ -51,7 +51,6 @@ add_library(
   citydlg_common.cpp
   cityrep.cpp
   cityrepdata.cpp
-  civstatus.cpp
   client_main.cpp
   climap.cpp
   climisc.cpp

client/fc_client.cpp

@@ -457,18 +457,6 @@ void fc_client::read_settings()
   } else {
     qt_settings.battlelog_y = 0.0;
   }
-  if (s.contains(QStringLiteral("civstatus_x"))) {
-    qt_settings.civstatus_x =
-        s.value(QStringLiteral("civstatus_x")).toFloat();
-  } else {
-    qt_settings.civstatus_x = 0.0;
-  }
-  if (s.contains(QStringLiteral("civstatus_y"))) {
-    qt_settings.civstatus_y =
-        s.value(QStringLiteral("civstatus_y")).toFloat();
-  } else {
-    qt_settings.civstatus_y = 0.0;
-  }
   qt_settings.player_repo_sort_col = -1;
   qt_settings.city_repo_sort_col = -1;
 
@@ -524,8 +512,6 @@ void fc_client::write_settings()
   s.setValue(QStringLiteral("battlelog_scale"), qt_settings.battlelog_scale);
   s.setValue(QStringLiteral("battlelog_x"), qt_settings.battlelog_x);
   s.setValue(QStringLiteral("battlelog_y"), qt_settings.battlelog_y);
-  s.setValue(QStringLiteral("civstatus_x"), qt_settings.civstatus_x);
-  s.setValue(QStringLiteral("civstatus_y"), qt_settings.civstatus_y);
   s.setValue(QStringLiteral("new_turn_text"),
              qt_settings.show_new_turn_text);
   s.setValue(QStringLiteral("show_battle_log"), qt_settings.show_battle_log);

client/fc_client.h

@@ -72,8 +72,6 @@ struct fc_settings {
   float battlelog_scale;
   float battlelog_x;
   float battlelog_y;
-  float civstatus_x;
-  float civstatus_y;
 };
 
 /****************************************************************************

client/page_game.cpp

@@ -25,7 +25,6 @@
 #include "government.h"
 #include "repodlgs_g.h"
 // client
-#include "civstatus.h"
 #include "client_main.h"
 #include "mapview_common.h"
 #include "text.h"
@@ -154,10 +153,6 @@ pageGame::pageGame(QWidget *parent)
   top_bar_wdg->addWidget(sw_indicators);
   top_bar_wdg->addWidget(sw_message);
 
-  civ_status = new civstatus(mapview_wdg);
-  civ_status->setAttribute(Qt::WA_NoMousePropagation);
-  civ_status->show();
-
   city_overlay = new city_dialog(mapview_wdg);
   connect(mapview_wdg, &map_view::scale_changed, city_overlay,
           &city_dialog::refresh);
@@ -533,9 +528,6 @@ bool fc_game_tab_widget::event(QEvent *event)
           qRound(king()->qt_settings.battlelog_x * mapview.width),
           qRound(king()->qt_settings.battlelog_y * mapview.height));
       queen()->x_vote->move(width() / 2 - queen()->x_vote->width() / 2, 0);
-      queen()->civ_status->move(
-          qRound(king()->qt_settings.civstatus_x * mapview.width),
-          qRound(king()->qt_settings.civstatus_y * mapview.height));
 
       queen()->updateSidebarTooltips();
       queen()->minimap_panel->turn_done()->setEnabled(

client/page_game.h

@@ -19,7 +19,6 @@
 class city_dialog;
 class fc_client;
 class map_view;
-class civstatus;
 class minimap_panel;
 class hud_units;
 class indicators_widget;
@@ -82,7 +81,6 @@ class pageGame : public QWidget {
   units_reports *units;
   top_bar_widget *sw_cunit;
   xvote *x_vote;
-  civstatus *civ_status;
   top_bar_widget *sw_diplo;
   indicators_widget *sw_indicators;
   top_bar_widget *sw_science;