Author: cazfi
Date: Sun Aug 7 19:37:37 2016
New Revision: 33502
URL: http://svn.gna.org/viewcvs/freeciv?rev=33502&view=rev
Log:
Wrap a couple of ruledit C-strings with QStrings::fromUtf8() before using in Qt
widgets.
See patch #7552
Modified:
trunk/tools/ruledit/tab_good.cpp
Modified: trunk/tools/ruledit/tab_good.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/tools/ruledit/tab_good.cpp?rev=33502&r1=33501&r2=33502&view=diff
==============================================================================
--- trunk/tools/ruledit/tab_good.cpp (original)
+++ trunk/tools/ruledit/tab_good.cpp Sun Aug 7 19:37:37 2016
@@ -112,7 +112,8 @@
goods_type_iterate(pgood) {
if (!pgood->disabled) {
- QListWidgetItem *item = new QListWidgetItem(goods_rule_name(pgood));
+ QListWidgetItem *item =
+ new QListWidgetItem(QString::fromUtf8(goods_rule_name(pgood)));
good_list->insertItem(goods_index(pgood), item);
}
@@ -273,7 +274,7 @@
void tab_good::edit_reqs()
{
if (selected != nullptr) {
- req_edit *redit = new req_edit(ui, goods_rule_name(selected),
+ req_edit *redit = new req_edit(ui,
QString::fromUtf8(goods_rule_name(selected)),
&selected->reqs);
redit->show();
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
