Author: mir3x
Date: Fri Jul 22 20:22:38 2016
New Revision: 33295
URL: http://svn.gna.org/viewcvs/freeciv?rev=33295&view=rev
Log:
Qt client - Remove unused QObject from fc_client
Patch by Louis Moureaux <louis94>
See patch #7484
Modified:
branches/S2_6/client/gui-qt/fc_client.cpp
branches/S2_6/client/gui-qt/fc_client.h
branches/S2_6/client/gui-qt/pages.cpp
Modified: branches/S2_6/client/gui-qt/fc_client.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/fc_client.cpp?rev=33295&r1=33294&r2=33295&view=diff
==============================================================================
--- branches/S2_6/client/gui-qt/fc_client.cpp (original)
+++ branches/S2_6/client/gui-qt/fc_client.cpp Fri Jul 22 20:22:38 2016
@@ -73,7 +73,6 @@
info_widget = NULL;
saves_load = NULL;
scenarios_load = NULL;
- start_players = NULL;
meta_scan_timer = NULL;
lan_scan_timer = NULL;
status_bar = NULL;
Modified: branches/S2_6/client/gui-qt/fc_client.h
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/fc_client.h?rev=33295&r1=33294&r2=33295&view=diff
==============================================================================
--- branches/S2_6/client/gui-qt/fc_client.h (original)
+++ branches/S2_6/client/gui-qt/fc_client.h Fri Jul 22 20:22:38 2016
@@ -185,7 +185,6 @@
QTableWidget* info_widget;
QTableWidget* saves_load;
QTableWidget* scenarios_load;
- QTableWidget* start_players;
QTreeWidget* start_players_tree;
QTimer* meta_scan_timer;
Modified: branches/S2_6/client/gui-qt/pages.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/pages.cpp?rev=33295&r1=33294&r2=33295&view=diff
==============================================================================
--- branches/S2_6/client/gui-qt/pages.cpp (original)
+++ branches/S2_6/client/gui-qt/pages.cpp Fri Jul 22 20:22:38 2016
@@ -1564,7 +1564,7 @@
sp = "\"" + splayer + "\"";
if (me != splayer) {
str = QString(_("Observe"));
- action = new QAction(str, start_players);
+ action = new QAction(str, start_players_tree);
str = "/observe " + sp;
connect(action, SIGNAL(triggered()), player_menu_mapper,
SLOT(map()));
@@ -1573,7 +1573,7 @@
if (ALLOW_CTRL <= client.conn.access_level) {
str = QString(_("Remove player"));
- action = new QAction(str, start_players);
+ action = new QAction(str, start_players_tree);
str = "/remove " + sp;
connect(action, SIGNAL(triggered()), player_menu_mapper,
SLOT(map()));
@@ -1581,7 +1581,7 @@
menu.addAction(action);
}
str = QString(_("Take this player"));
- action = new QAction(str, start_players);
+ action = new QAction(str, start_players_tree);
str = "/take " + sp;
connect(action, SIGNAL(triggered()), player_menu_mapper,
SLOT(map()));
@@ -1591,7 +1591,7 @@
if (can_conn_edit_players_nation(&client.conn, pplayer)) {
str = QString(_("Pick nation"));
- action = new QAction(str, start_players);
+ action = new QAction(str, start_players_tree);
str = "PICK:" + QString(player_name(pplayer)); /* PICK is a key */
connect(action, SIGNAL(triggered()), player_menu_mapper,
SLOT(map()));
@@ -1612,7 +1612,7 @@
if (is_settable_ai_level(static_cast < ai_level > (level))) {
level_name = ai_level_translated_name(static_cast < ai_level >
(level));
level_cmd = ai_level_cmd(static_cast < ai_level > (level));
- action = new QAction(QString(level_name), start_players);
+ action = new QAction(QString(level_name), start_players_tree);
str = "/" + QString(level_cmd) + " " + sp;
connect(action, SIGNAL(triggered()), player_menu_mapper,
SLOT(map()));
@@ -1641,7 +1641,7 @@
need_empty_team = false;
}
str = team_slot_name_translation(tslot);
- action = new QAction(str, start_players);
+ action = new QAction(str, start_players_tree);
str = "/team" + sp + " \"" + QString(team_slot_rule_name(tslot))
+ "\"";
connect(action, SIGNAL(triggered()),
@@ -1653,7 +1653,7 @@
if (ALLOW_CTRL <= client.conn.access_level && NULL != pplayer) {
str = QString(_("Aitoggle player"));
- action = new QAction(str, start_players);
+ action = new QAction(str, start_players_tree);
str = "/aitoggle " + sp;
connect(action, SIGNAL(triggered()), player_menu_mapper,
SLOT(map()));
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
