Author: mir3x Date: Sun Dec 4 20:55:19 2016 New Revision: 34690 URL: http://svn.gna.org/viewcvs/freeciv?rev=34690&view=rev Log: Qt client - fixed icc warnings
See bug #25353 Modified: branches/S2_6/client/gui-qt/citydlg.cpp branches/S2_6/client/gui-qt/gui_main.cpp branches/S2_6/client/gui-qt/plrdlg.cpp Modified: branches/S2_6/client/gui-qt/citydlg.cpp URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/citydlg.cpp?rev=34690&r1=34689&r2=34690&view=diff ============================================================================== --- branches/S2_6/client/gui-qt/citydlg.cpp (original) +++ branches/S2_6/client/gui-qt/citydlg.cpp Sun Dec 4 20:55:19 2016 @@ -2270,9 +2270,8 @@ if (cma_is_city_under_agent(pcity, NULL)) { cmafec_get_fe_parameter(pcity, ¶m); - i = cmafec_preset_get_index_of_parameter(const_cast < const struct - cm_parameter *const >(¶m)); - + i = cmafec_preset_get_index_of_parameter(const_cast <struct + cm_parameter *const >(¶m)); if (i >= 0 && i < cma_table->rowCount()) { cma_table->blockSignals(true); cma_table->setCurrentCell(i, 0); Modified: branches/S2_6/client/gui-qt/gui_main.cpp URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/gui_main.cpp?rev=34690&r1=34689&r2=34690&view=diff ============================================================================== --- branches/S2_6/client/gui-qt/gui_main.cpp (original) +++ branches/S2_6/client/gui-qt/gui_main.cpp Sun Dec 4 20:55:19 2016 @@ -72,10 +72,7 @@ const char * const gui_character_encoding = "UTF-8"; const bool gui_use_transliteration = false; -static QPixmap *unit_pixmap; - void reset_unit_table(void); -static void populate_unit_pixmap_table(void); static void apply_titlebar(struct option *poption); static void apply_sidebar(struct option *poption); static void apply_font(struct option *poption); @@ -179,7 +176,6 @@ tileset_init(tileset); tileset_load_tiles(tileset); - populate_unit_pixmap_table(); qpm = get_icon_sprite(tileset, ICON_FREECIV)->pm; app_icon = ::QIcon(*qpm); qapp->setWindowIcon(app_icon); @@ -553,19 +549,6 @@ } /************************************************************************** - Called to build the unit_below pixmap table. This is the table on the - left of the screen that shows all of the inactive units in the current - tile. - - It may be called again if the tileset changes. -**************************************************************************/ -static void populate_unit_pixmap_table(void) -{ - unit_pixmap = new QPixmap(tileset_unit_width(tileset), - tileset_unit_height(tileset)); -} - -/************************************************************************** Insert build information to help **************************************************************************/ void qtg_insert_client_build_info(char *outbuf, size_t outlen) Modified: branches/S2_6/client/gui-qt/plrdlg.cpp URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/plrdlg.cpp?rev=34690&r1=34689&r2=34690&view=diff ============================================================================== --- branches/S2_6/client/gui-qt/plrdlg.cpp (original) +++ branches/S2_6/client/gui-qt/plrdlg.cpp Sun Dec 4 20:55:19 2016 @@ -167,14 +167,13 @@ str = pdc->func(ipplayer); if (str.toInt() != 0){ return str.toInt(); - } else if (str == "?"){ + } else if (str == "?") { return -1; } return str; default: return QVariant(); } - return QVariant(); } /************************************************************************** _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits