Remove gui-qt from code files

longturn · Feb 14, 2024 · cbe265c · cbe265c
1 parent 44d35a6
commit cbe265c
Show file tree

Hide file tree

Showing 71 changed files with 138 additions and 224 deletions.
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
@@ -200,8 +200,8 @@ if(EMSCRIPTEN)
                       "--preload-file=${CMAKE_SOURCE_DIR}/data/hexemplio@data/hexemplio"
                       "--preload-file=${CMAKE_SOURCE_DIR}/data/amplio2.tilespec@data/amplio2.tilespec"
                       "--preload-file=${CMAKE_SOURCE_DIR}/data/amplio2@data/amplio2"
-                      "--preload-file=${CMAKE_SOURCE_DIR}/data/themes/gui-qt/Classic@data/themes/gui-qt/Classic"
-                      "--preload-file=${CMAKE_SOURCE_DIR}/data/themes/gui-qt/icons@data/themes/gui-qt/icons"
+                      "--preload-file=${CMAKE_SOURCE_DIR}/data/themes/Classic@data/themes/Classic"
+                      "--preload-file=${CMAKE_SOURCE_DIR}/data/themes/icons@data/themes/icons"
                       "--preload-file=${CMAKE_SOURCE_DIR}/data/stdmusic.musicspec@data/stdmusic.musicspec"
                       "--preload-file=${CMAKE_SOURCE_DIR}/data/stdmusic@data/stdmusic"
                       "--preload-file=${CMAKE_SOURCE_DIR}/data/stdsounds@data/stdsounds"

diff --git a/client/audio/audio_none.cpp b/client/audio/audio_none.cpp
@@ -9,14 +9,10 @@
                   see https://www.gnu.org/licenses/.
  */
 
-#include "support.h"
-
-#include "audio.h"
-
 #include "audio_none.h"
-
-// gui-qt
+#include "audio.h"
 #include "qtg_cxxside.h"
+#include "support.h"
 
 /**
    Clean up

diff --git a/client/chatline.cpp b/client/chatline.cpp
@@ -26,24 +26,24 @@
 // common
 #include "chat.h"
 #include "chatline_common.h"
+
 // client
 #include "audio/audio.h"
 #include "client_main.h"
 #include "climap.h"
 #include "colors_common.h"
 #include "connectdlg_common.h"
 #include "control.h"
-#include "featured_text.h"
-#include "game.h"
-#include "views/view_map_common.h"
-// gui-qt
 #include "dialogs.h"
 #include "fc_client.h"
+#include "featured_text.h"
 #include "fonts.h"
+#include "game.h"
 #include "icons.h"
 #include "messagewin.h"
 #include "page_game.h"
 #include "views/view_map.h"
+#include "views/view_map_common.h"
 
 static bool is_plain_public_message(const QString &s);
 

diff --git a/client/chatline.h b/client/chatline.h
@@ -16,7 +16,7 @@
 #include <QEvent>
 #include <QLineEdit>
 #include <QTextBrowser>
-// gui-qt
+// client
 #include "listener.h"
 #include "widgets/decorations.h"
 

diff --git a/client/chatline_common.cpp b/client/chatline_common.cpp
@@ -22,13 +22,10 @@
 #include "featured_text.h"
 #include "packets.h"
 
-// gui-qt
-#include "chatline.h"
-
 // client
-#include "client_main.h"
-
+#include "chatline.h"
 #include "chatline_common.h"
+#include "client_main.h"
 
 Q_GLOBAL_STATIC(QMutex, ow_mutex);
 

diff --git a/client/citybar.cpp b/client/citybar.cpp
@@ -23,10 +23,8 @@
 // common
 #include "city.h"
 
-// gui-qt
-#include "canvas.h"
-
 // client
+#include "canvas.h"
 #include "client_main.h"
 #include "colors_common.h"
 #include "views/view_map_common.h"

diff --git a/client/citydlg.cpp b/client/citydlg.cpp
@@ -33,31 +33,30 @@
 #include "game.h"
 
 // client
+#include "canvas.h"
 #include "citydlg_common.h"
 #include "client_main.h"
 #include "climisc.h"
 #include "control.h"
-#include "global_worklist.h"
-#include "governor.h"
-#include "mapctrl_common.h"
-#include "tileset/tilespec.h"
-#include "views/view_map_common.h"
-// gui-qt
-#include "canvas.h"
 #include "fc_client.h"
 #include "fonts.h"
+#include "global_worklist.h"
+#include "governor.h"
 #include "hudwidget.h"
 #include "icons.h"
+#include "mapctrl_common.h"
 #include "page_game.h"
 #include "qtg_cxxside.h"
 #include "text.h"
+#include "tileset/tilespec.h"
 #include "tooltips.h"
 #include "top_bar.h"
 #include "unitlist.h"
 #include "utils/improvement_seller.h"
 #include "utils/unit_quick_menu.h"
 #include "views/view_cities.h" // hIcon
 #include "views/view_map.h"
+#include "views/view_map_common.h"
 #include "widgets/city/governor_widget.h"
 
 extern QString split_text(const QString &text, bool cut);

diff --git a/client/citydlg.h b/client/citydlg.h
@@ -24,7 +24,7 @@
 #include <QToolTip>
 #include <QtMath>
 #include <qobjectdefs.h>
-// gui-qt
+// client
 #include "dialogs.h"
 
 #define CITIZENS_PER_ROW 20

diff --git a/client/client_main.cpp b/client/client_main.cpp
@@ -74,12 +74,14 @@
 #include "fonts.h"
 #include "global_worklist.h"
 #include "governor.h"
+#include "helpdlg.h"
 #include "messagewin_common.h"
 #include "minimap_panel.h"
 #include "music.h"
 #include "options.h"
 #include "overview_common.h"
 #include "packhand.h"
+#include "qtg_cxxside.h"
 #include "themes_common.h"
 #include "tileset/tilespec.h"
 #include "update_queue.h"
@@ -88,10 +90,6 @@
 #include "views/view_nations_data.h"
 #include "voteinfo.h"
 
-// gui-qt
-#include "helpdlg.h"
-#include "qtg_cxxside.h"
-
 /* client/luascript */
 #include "script_client.h"
 

diff --git a/client/climisc.cpp b/client/climisc.cpp
@@ -57,13 +57,11 @@
 #include "options.h"
 #include "packhand.h"
 #include "page_game.h"
+#include "qtg_cxxside.h"
 #include "tileset/tilespec.h"
 #include "views/view_map.h"
 #include "views/view_map_common.h"
 
-// gui-qt
-#include "qtg_cxxside.h"
-
 extern void flush_dirty_overview();
 /**
    Remove unit, client end version

diff --git a/client/clinet.cpp b/client/clinet.cpp
@@ -40,8 +40,6 @@
 #include "governor.h"
 #include "options.h"
 #include "packhand.h"
-
-// gui-qt
 #include "qtg_cxxside.h"
 
 // In autoconnect mode, try to connect to once a second

diff --git a/client/connectdlg.cpp b/client/connectdlg.cpp
@@ -12,9 +12,8 @@
 #include "game.h"
 // client
 #include "chatline_common.h"
-#include "packhand_gen.h"
-// gui-qt
 #include "fc_client.h"
+#include "packhand_gen.h"
 #include "page_network.h"
 #include "pages_g.h"
 #include "qtg_cxxside.h"

diff --git a/client/connectdlg_common.cpp b/client/connectdlg_common.cpp
@@ -41,8 +41,6 @@
 #include "clinet.h" // connect_to_server()
 #include "connectdlg_common.h"
 #include "packhand_gen.h"
-
-// gui-qt
 #include "qtg_cxxside.h"
 
 #define WAIT_BETWEEN_TRIES 100000 // usecs

diff --git a/client/control.cpp b/client/control.cpp
@@ -37,23 +37,20 @@
 
 // client
 #include "audio/audio.h"
+#include "chatline.h"
 #include "client_main.h"
 #include "climap.h"
 #include "climisc.h"
+#include "control.h"
 #include "editor.h"
 #include "goto.h"
 #include "governor.h"
 #include "options.h"
 #include "overview_common.h"
-#include "tileset/tilespec.h"
-#include "update_queue.h"
-
-#include "control.h"
-
-// gui-qt
-#include "chatline.h"
 #include "page_game.h"
 #include "qtg_cxxside.h"
+#include "tileset/tilespec.h"
+#include "update_queue.h"
 #include "views/view_map.h"
 
 struct client_disband_unit_data {

diff --git a/client/dialogs.cpp b/client/dialogs.cpp
@@ -39,22 +39,21 @@
 #include "chatline_common.h"
 #include "client_main.h"
 #include "control.h"
-#include "packhand.h"
-#include "text.h"
-#include "tileset/tilespec.h"
-#include "views/view_map_common.h"
-// gui-qt - awesome client
 #include "fc_client.h"
 #include "fonts.h"
 #include "helpdlg.h"
 #include "hudwidget.h"
 #include "icons.h"
+#include "packhand.h"
 #include "page_game.h"
 #include "qtg_cxxside.h"
+#include "text.h"
 #include "tileset/sprite.h"
+#include "tileset/tilespec.h"
 #include "unithudselector.h"
 #include "unitselect.h"
 #include "views/view_map.h"
+#include "views/view_map_common.h"
 #include "widgets/report_widget.h"
 
 // Locations for non action enabler controlled buttons.

diff --git a/client/dialogs.h b/client/dialogs.h
@@ -17,7 +17,6 @@
 #include "fc_types.h"
 // client
 #include "dialogs_g.h"
-// gui-qt
 #include "hudwidget.h"
 #include "widgets/decorations.h"
 

diff --git a/client/diplodlg.cpp b/client/diplodlg.cpp
@@ -34,7 +34,6 @@
 // client
 #include "client_main.h"
 #include "colors_common.h"
-// gui-qt
 #include "diplodlg_g.h"
 #include "fc_client.h"
 #include "icons.h"

diff --git a/client/editor.cpp b/client/editor.cpp
@@ -30,14 +30,10 @@
 #include "control.h"
 #include "editor.h"
 #include "mapctrl_common.h"
-#include "tileset/tilespec.h"
-#include "views/view_map_geometry.h"
-
-/* client/include */
 #include "mapview_g.h"
-
-// gui-qt
 #include "qtg_cxxside.h"
+#include "tileset/tilespec.h"
+#include "views/view_map_geometry.h"
 
 enum selection_modes {
   SELECTION_MODE_NEW = 0,

diff --git a/client/endgamereport.cpp b/client/endgamereport.cpp
@@ -16,10 +16,9 @@
 // common
 #include "nation.h"
 // client
-#include "tileset/sprite.h"
-// gui-qt
 #include "fc_client.h"
 #include "page_game.h"
+#include "tileset/sprite.h"
 
 /**
    Constructor for endgame report

diff --git a/client/fc_client.cpp b/client/fc_client.cpp
@@ -31,8 +31,6 @@
 #include "client_main.h"
 #include "clinet.h"
 #include "connectdlg_common.h"
-#include "update_queue.h"
-// gui-qt
 #include "fonts.h"
 #include "gui_main.h"
 #include "icons.h"
@@ -47,6 +45,7 @@
 #include "page_scenario.h"
 #include "tileset/sprite.h"
 #include "top_bar.h"
+#include "update_queue.h"
 #include "views/view_map.h"
 #include "voteinfo_bar.h"
 
@@ -138,7 +137,6 @@ fc_client::~fc_client()
 }
 
 /**
-   Main part of gui-qt.
    This is not called simply 'fc_client::main()', since SDL includes
    ould sometimes cause 'main' to be considered an macro that expands to
    'SDL_main'

diff --git a/client/fc_client.h b/client/fc_client.h
@@ -17,12 +17,11 @@
 // common
 #include "packets.h"
 // client
+#include "chatline.h"
+#include "menu.h"
 #include "pages_g.h"
 #include "servers.h"
 #include "tileset/tilespec.h"
-// gui-qt
-#include "chatline.h"
-#include "menu.h"
 #include "tradecalculation.h"
 
 class QApplication;

diff --git a/client/gotodlg.cpp b/client/gotodlg.cpp
@@ -24,14 +24,13 @@
 // client
 #include "client_main.h"
 #include "control.h"
+#include "fc_client.h"
 #include "goto.h"
+#include "page_game.h"
 #include "text.h"
+#include "tileset/sprite.h"
 #include "views/view_map.h"
 #include "views/view_map_common.h"
-// gui-qt
-#include "fc_client.h"
-#include "page_game.h"
-#include "tileset/sprite.h"
 
 /**
    Constructor for goto_dialog

diff --git a/client/gui_main.cpp b/client/gui_main.cpp
@@ -21,23 +21,22 @@
 // client
 #include "client_main.h"
 #include "clinet.h"
-#include "mapview_g.h"
-#include "options.h"
-#include "themes_common.h"
-#include "tileset/sprite.h"
-#include "tileset/tilespec.h"
-#include "views/view_map_common.h"
-// gui-qt
 #include "fc_client.h"
 #include "fonts.h"
 #include "helpdlg.h"
 #include "hudwidget.h"
+#include "mapview_g.h"
 #include "messagewin.h"
+#include "options.h"
 #include "page_game.h"
 #include "page_pregame.h"
 #include "qtg_cxxside.h"
+#include "themes_common.h"
+#include "tileset/sprite.h"
+#include "tileset/tilespec.h"
 #include "unitselect.h"
 #include "views/view_map.h"
+#include "views/view_map_common.h"
 #include "widgets/report_widget.h"
 
 void real_science_report_dialog_update(void *);