Author: mir3x
Date: Mon Aug 18 20:12:11 2014
New Revision: 25938
URL: http://svn.gna.org/viewcvs/freeciv?rev=25938&view=rev
Log:
When porting from qt4 to qt5, fromAscii was replaced by fromLatin,
and it showed many characters incorectly
(FromAscii(x) should be just replaced by QString(x))
See http://gna.org/patch/?5041
Modified:
branches/S2_5/client/gui-qt/citydlg.cpp
branches/S2_5/client/gui-qt/mapview.cpp
Modified: branches/S2_5/client/gui-qt/citydlg.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-qt/citydlg.cpp?rev=25938&r1=25937&r2=25938&view=diff
==============================================================================
--- branches/S2_5/client/gui-qt/citydlg.cpp (original)
+++ branches/S2_5/client/gui-qt/citydlg.cpp Mon Aug 18 20:12:11 2014
@@ -1649,13 +1649,13 @@
int j = 2*i;
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
- qlt[i]->setText(QString::fromLatin1(buf[2*i]));
+ qlt[i]->setText(QString(buf[2*i]));
#else
qlt[i]->setText(QString::fromAscii(buf[2*i]));
#endif
if (j != GROWTH && j != GRANARY && j!= WASTE && j!= CORRUPTION){
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
- qlt[i]->setToolTip(QString::fromLatin1(buf[2*i + 1]));
+ qlt[i]->setToolTip(QString(buf[2*i + 1]));
#else
qlt[i]->setToolTip(QString::fromAscii(buf[2*i + 1]));
#endif
@@ -1947,7 +1947,7 @@
const char *name = city_production_name_translation(pcity);
int value = city_production_buy_gold_cost(pcity);
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
- const QString title = QString::fromUtf8(_("Buy")) + QString::fromLatin1(" ?
");
+ const QString title = QString::fromUtf8(_("Buy")) + QString(" ? ");
#else
const QString title = QString::fromUtf8(_("Buy")) + QString::fromAscii(" ?
");
#endif
Modified: branches/S2_5/client/gui-qt/mapview.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-qt/mapview.cpp?rev=25938&r1=25937&r2=25938&view=diff
==============================================================================
--- branches/S2_5/client/gui-qt/mapview.cpp (original)
+++ branches/S2_5/client/gui-qt/mapview.cpp Mon Aug 18 20:12:11 2014
@@ -1109,7 +1109,7 @@
void update_info_label(void)
{
QString eco_info;
- QString s = QString::fromLatin1(textyear(game.info.year)) + " ("
+ QString s = QString(textyear(game.info.year)) + " ("
+ _("Turn") + ":" + QString::number(game.info.turn) + ")";
gui()->game_info_label->set_turn_info(s);
set_indicator_icons(client_research_sprite(),
@@ -1157,7 +1157,7 @@
void qtg_update_timeout_label(void)
{
gui()->game_info_label->set_time_info (
- QString::fromLatin1(get_timeout_label_text()));
+ QString(get_timeout_label_text()));
}
/****************************************************************************
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
