Author: mir3x Date: Mon May 15 19:48:05 2017 New Revision: 35599 URL: http://svn.gna.org/viewcvs/freeciv?rev=35599&view=rev Log: Qt client - don't call non-const member functions on temporaries.
See hrm Bug #658871 Modified: branches/S3_0/client/gui-qt/optiondlg.cpp Modified: branches/S3_0/client/gui-qt/optiondlg.cpp URL: http://svn.gna.org/viewcvs/freeciv/branches/S3_0/client/gui-qt/optiondlg.cpp?rev=35599&r1=35598&r2=35599&view=diff ============================================================================== --- branches/S3_0/client/gui-qt/optiondlg.cpp (original) +++ branches/S3_0/client/gui-qt/optiondlg.cpp Mon May 15 19:48:05 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