Author: mir3x
Date: Mon May 15 19:47:56 2017
New Revision: 35598
URL: http://svn.gna.org/viewcvs/freeciv?rev=35598&view=rev
Log:
Qt client - don't call non-const member functions on temporaries.
See hrm Bug #658871
Modified:
branches/S2_6/client/gui-qt/optiondlg.cpp
Modified: branches/S2_6/client/gui-qt/optiondlg.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/optiondlg.cpp?rev=35598&r1=35597&r2=35598&view=diff
==============================================================================
--- branches/S2_6/client/gui-qt/optiondlg.cpp (original)
+++ branches/S2_6/client/gui-qt/optiondlg.cpp Mon May 15 19:47:56 2017
@@ -262,7 +262,7 @@
option_int_set(poption, get_int(poption));
break;
case OT_STRING:
- option_str_set(poption, get_string(poption).data());
+ option_str_set(poption, get_string(poption).constData());
break;
case OT_ENUM:
option_enum_set_int(poption, get_enum(poption));
@@ -271,7 +271,7 @@
option_bitwise_set(poption, get_bitwise(poption));
break;
case OT_FONT:
- option_font_set(poption, get_button_font(poption).data());
+ option_font_set(poption, get_button_font(poption).constData());
break;
case OT_COLOR:
get_color(poption, ba1, ba2);
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
