Author: mir3x Date: Mon May 15 19:36:32 2017 New Revision: 35593 URL: http://svn.gna.org/viewcvs/freeciv?rev=35593&view=rev Log: Qt client - dont pass by value in foreach macro.
See hrm Bug #658868 Modified: trunk/client/gui-qt/cityrep.cpp trunk/client/gui-qt/menu.cpp Modified: trunk/client/gui-qt/cityrep.cpp URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/cityrep.cpp?rev=35593&r1=35592&r2=35593&view=diff ============================================================================== --- trunk/client/gui-qt/cityrep.cpp (original) +++ trunk/client/gui-qt/cityrep.cpp Mon May 15 19:36:32 2017 @@ -1071,6 +1071,8 @@ ***************************************************************************/ void city_widget::update_model() { + QFont f = QApplication::font(); + QFontMetrics fm(f); QStringList sl; QString s, str; int width; @@ -1085,8 +1087,6 @@ sl = str.split('\n'); width = 0; foreach (s, sl) { - QFont f = QApplication::font(); - QFontMetrics fm(f); width = qMax(width, fm.width(s)); } header()->resizeSection(j, width + 10); Modified: trunk/client/gui-qt/menu.cpp URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/menu.cpp?rev=35593&r1=35592&r2=35593&view=diff ============================================================================== --- trunk/client/gui-qt/menu.cpp (original) +++ trunk/client/gui-qt/menu.cpp Mon May 15 19:36:32 2017 @@ -1664,8 +1664,6 @@ void mr_menu::execute_shortcut(int sid) { QList<QMenu*> menu_list; - QMenu *m; - QAction* a; QKeySequence seq; fc_shortcut *fcs; @@ -1678,8 +1676,8 @@ seq = QKeySequence(shortcut_to_string(fcs)); menu_list = findChildren<QMenu*>(); - foreach (m, menu_list) { - foreach (a, m->actions()) { + foreach (const QMenu *m, menu_list) { + foreach (QAction *a, m->actions()) { if (a->shortcut() == seq && a->isEnabled()) { a->activate(QAction::Trigger); return; @@ -1694,14 +1692,12 @@ QString mr_menu::shortcut_exist(fc_shortcut *fcs) { QList<QMenu*> menu_list; - QMenu *m; QKeySequence seq; - QAction* a; seq = QKeySequence(shortcut_to_string(fcs)); menu_list = findChildren<QMenu *>(); - foreach (m, menu_list) { - foreach (a, m->actions()) { + foreach (const QMenu *m, menu_list) { + foreach (QAction *a, m->actions()) { if (a->shortcut() == seq && fcs->mouse == Qt::AllButtons) { return a->text(); } @@ -1717,8 +1713,6 @@ QString mr_menu::shortcut_2_menustring(int sid) { QList<QMenu *> menu_list; - QMenu *m; - QAction *a; QKeySequence seq; fc_shortcut *fcs; @@ -1726,8 +1720,8 @@ seq = QKeySequence(shortcut_to_string(fcs)); menu_list = findChildren<QMenu *>(); - foreach (m, menu_list) { - foreach (a, m->actions()) { + foreach (const QMenu *m, menu_list) { + foreach (QAction *a, m->actions()) { if (a->shortcut() == seq) { return (a->text() + " (" + a->shortcut().toString(QKeySequence::NativeText) + ")"); _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits