Author: mir3x Date: Mon May 15 19:46:06 2017 New Revision: 35597 URL: http://svn.gna.org/viewcvs/freeciv?rev=35597&view=rev Log: Qt client - remove unused not trivial variables.
See hrm Bug #658869 Modified: trunk/client/gui-qt/chatline.cpp trunk/client/gui-qt/citydlg.cpp trunk/client/gui-qt/dialogs.cpp trunk/client/gui-qt/diplodlg.cpp trunk/client/gui-qt/gui_main.cpp trunk/client/gui-qt/pages.cpp trunk/client/gui-qt/ratesdlg.cpp trunk/client/gui-qt/repodlgs.cpp trunk/client/gui-qt/shortcuts.cpp trunk/client/gui-qt/sidebar.cpp trunk/client/gui-qt/themes.cpp Modified: trunk/client/gui-qt/chatline.cpp URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/chatline.cpp?rev=35597&r1=35596&r2=35597&view=diff ============================================================================== --- trunk/client/gui-qt/chatline.cpp (original) +++ trunk/client/gui-qt/chatline.cpp Mon May 15 19:46:06 2017 @@ -444,8 +444,6 @@ ***************************************************************************/ bool chatwdg::eventFilter(QObject *obj, QEvent *event) { - QString message; - if (obj == chat_line) { if (event->type() == QEvent::KeyPress) { QKeyEvent *keyEvent = static_cast<QKeyEvent *>(event); Modified: trunk/client/gui-qt/citydlg.cpp URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/citydlg.cpp?rev=35597&r1=35596&r2=35597&view=diff ============================================================================== --- trunk/client/gui-qt/citydlg.cpp (original) +++ trunk/client/gui-qt/citydlg.cpp Mon May 15 19:46:06 2017 @@ -120,7 +120,6 @@ void progress_bar::paintEvent(QPaintEvent *event) { QPainter p; - QString str; QLinearGradient g, gx; QColor c; QRect r, rx, r2; @@ -514,7 +513,6 @@ { hud_message_box ask(city_dlg); QString s; - QVariant qvar; char buf[256]; int price; int ret; @@ -561,7 +559,6 @@ happy_cost = hppy_cost; QImage cropped_img; QImage img; - QPixmap pix; QRect crop; qunit = punit; struct canvas *unit_pixmap; @@ -2347,7 +2344,6 @@ QVariant qvar; QSlider *slider; QLabel *label; - QString s; slider = qobject_cast<QSlider *>(sender()); qvar = slider->property("FC"); @@ -3243,7 +3239,6 @@ QModelIndex index; struct worklist queue; struct universal *target = new universal; - QVariant qvar; if (selected_row_p < 1 || selected_row_p >= p_table_p->rowCount()) { return; @@ -3285,7 +3280,6 @@ QModelIndex index; struct worklist queue; struct universal *target = new universal; - QVariant qvar; if (selected_row_p < 0 || selected_row_p >= p_table_p->rowCount() - 1) { return; Modified: trunk/client/gui-qt/dialogs.cpp URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/dialogs.cpp?rev=35597&r1=35596&r2=35597&view=diff ============================================================================== --- trunk/client/gui-qt/dialogs.cpp (original) +++ trunk/client/gui-qt/dialogs.cpp Mon May 15 19:46:06 2017 @@ -526,7 +526,7 @@ { char buf[4096]; QModelIndex index ; - QVariant qvar,qvar2; + QVariant qvar; QModelIndexList indexes = selected.indexes(); QString str; QTableWidgetItem *item; @@ -2197,7 +2197,7 @@ static void spy_steal(QVariant data1, QVariant data2) { QString str; - QVariant qv1, qv2; + QVariant qv1; pfcn_void func; int diplomat_id = data1.toInt(); int diplomat_target_id = data2.toInt(); @@ -2567,7 +2567,6 @@ { hud_message_box ask(gui()->central_wdg); int ret; - QString str; char buf[1024]; char buf2[1024]; int diplomat_id = actor->id; Modified: trunk/client/gui-qt/diplodlg.cpp URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/diplodlg.cpp?rev=35597&r1=35596&r2=35597&view=diff ============================================================================== --- trunk/client/gui-qt/diplodlg.cpp (original) +++ trunk/client/gui-qt/diplodlg.cpp Mon May 15 19:46:06 2017 @@ -55,7 +55,6 @@ color *colr; QString text; QString text2; - QString text_color; QString text_tooltip; QLabel *plr1_label; QLabel *plr2_label; Modified: trunk/client/gui-qt/gui_main.cpp URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/gui_main.cpp?rev=35597&r1=35596&r2=35597&view=diff ============================================================================== --- trunk/client/gui-qt/gui_main.cpp (original) +++ trunk/client/gui-qt/gui_main.cpp Mon May 15 19:46:06 2017 @@ -442,8 +442,6 @@ ****************************************************************************/ void apply_city_font(option *poption) { - QString s; - if (gui() && qtg_get_current_client_page() == PAGE_GAME) { qtg_gui_update_font("city_label", option_font_get(poption)); city_font_update(); Modified: trunk/client/gui-qt/pages.cpp URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/pages.cpp?rev=35597&r1=35596&r2=35597&view=diff ============================================================================== --- trunk/client/gui-qt/pages.cpp (original) +++ trunk/client/gui-qt/pages.cpp Mon May 15 19:46:06 2017 @@ -1405,7 +1405,6 @@ const char *sname, *sdescription, *sauthors; QTableWidgetItem *item; QString format; - QString str = QString(pfile->name); QString st; QStringList sl; int fcver; Modified: trunk/client/gui-qt/ratesdlg.cpp URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/ratesdlg.cpp?rev=35597&r1=35596&r2=35597&view=diff ============================================================================== --- trunk/client/gui-qt/ratesdlg.cpp (original) +++ trunk/client/gui-qt/ratesdlg.cpp Mon May 15 19:46:06 2017 @@ -119,7 +119,6 @@ QHBoxLayout *some_layout; QLabel *label; QSlider *slider; - QString str; QVBoxLayout *main_layout; struct player *pplayer = client_player(); @@ -168,9 +167,7 @@ void multipler_rates_dialog::slot_set_value(int i) { QSlider *qo; - QString str; qo = (QSlider *) QObject::sender(); - QString sender; QVariant qvar; QLabel *lab; Modified: trunk/client/gui-qt/repodlgs.cpp URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/repodlgs.cpp?rev=35597&r1=35596&r2=35597&view=diff ============================================================================== --- trunk/client/gui-qt/repodlgs.cpp (original) +++ trunk/client/gui-qt/repodlgs.cpp Mon May 15 19:46:06 2017 @@ -205,7 +205,7 @@ hud_message_box ask(gui()->central_wdg); int price; int ret; - QString s1, s2; + QString s2; struct unit_type *upgrade; upgrade = can_upgrade_unittype(client_player(), utype); Modified: trunk/client/gui-qt/shortcuts.cpp URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/shortcuts.cpp?rev=35597&r1=35596&r2=35597&view=diff ============================================================================== --- trunk/client/gui-qt/shortcuts.cpp (original) +++ trunk/client/gui-qt/shortcuts.cpp Mon May 15 19:46:06 2017 @@ -405,7 +405,6 @@ **************************************************************************/ QString button_name(Qt::MouseButton bt) { - QString button_name = ""; switch (bt) { case Qt::NoButton: return _("NoButton"); Modified: trunk/client/gui-qt/sidebar.cpp URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/sidebar.cpp?rev=35597&r1=35596&r2=35597&view=diff ============================================================================== --- trunk/client/gui-qt/sidebar.cpp (original) +++ trunk/client/gui-qt/sidebar.cpp Mon May 15 19:46:06 2017 @@ -696,7 +696,6 @@ void side_right_click_science(void) { QMenu *menu; - QString str; QAction *act; QVariant qvar; QList<qlist_item> curr_list; Modified: trunk/client/gui-qt/themes.cpp URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/themes.cpp?rev=35597&r1=35596&r2=35597&view=diff ============================================================================== --- trunk/client/gui-qt/themes.cpp (original) +++ trunk/client/gui-qt/themes.cpp Mon May 15 19:46:06 2017 @@ -46,7 +46,6 @@ void qtg_gui_load_theme(const char *directory, const char *theme_name) { QString name; - QString res_name; QString path; QString fake_dir; QDir dir; _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits