[Freeciv-commits] r25939 - in /trunk/client/gui-qt: citydlg.cpp dialogs.cpp mapview.cpp

[mlewczuk80]

Author: mir3x
Date: Mon Aug 18 20:12:23 2014
New Revision: 25939

URL: http://svn.gna.org/viewcvs/freeciv?rev=25939&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:
    trunk/client/gui-qt/citydlg.cpp
    trunk/client/gui-qt/dialogs.cpp
    trunk/client/gui-qt/mapview.cpp

Modified: trunk/client/gui-qt/citydlg.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/citydlg.cpp?rev=25939&r1=25938&r2=25939&view=diff
==============================================================================
--- trunk/client/gui-qt/citydlg.cpp     (original)
+++ trunk/client/gui-qt/citydlg.cpp     Mon Aug 18 20:12:23 2014
@@ -1644,10 +1644,10 @@
   for (int i = 0; i < NUM_INFO_FIELDS; i++) {
     int j = 2*i;
 
-    qlt[i]->setText(QString::fromLatin1(buf[2*i]));
+    qlt[i]->setText(QString(buf[2*i]));
 
     if (j != GROWTH && j != GRANARY && j!= WASTE && j!= CORRUPTION){
-      qlt[i]->setToolTip(QString::fromLatin1(buf[2*i + 1]));
+      qlt[i]->setToolTip(QString(buf[2*i + 1]));
     }
   }
 }
@@ -1935,7 +1935,7 @@
   int ret;
   const char *name = city_production_name_translation(pcity);
   int value = city_production_buy_gold_cost(pcity);
-  const QString title = QString::fromUtf8(_("Buy")) + QString::fromLatin1(" ? 
");
+  const QString title = QString::fromUtf8(_("Buy")) + QString(" ? ");
   QMessageBox ask(this);
 
   if (!can_client_issue_orders()) {

Modified: trunk/client/gui-qt/dialogs.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/dialogs.cpp?rev=25939&r1=25938&r2=25939&view=diff
==============================================================================
--- trunk/client/gui-qt/dialogs.cpp     (original)
+++ trunk/client/gui-qt/dialogs.cpp     Mon Aug 18 20:12:23 2014
@@ -415,9 +415,9 @@
   cw = new close_widget(this);
   cw->put_to_corner();
 
-  qcaption = QString::fromLatin1(caption);
-  qheadline = QString::fromLatin1(headline);
-  qlines = QString::fromLatin1(lines);
+  qcaption = QString(caption);
+  qheadline = QString(headline);
+  qlines = QString(lines);
   qlist = qlines.split("\n");
   small_font =::gui()->fc_fonts.get_font("gui_qt_font_notify_label");
   x = 0;

Modified: trunk/client/gui-qt/mapview.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/mapview.cpp?rev=25939&r1=25938&r2=25939&view=diff
==============================================================================
--- trunk/client/gui-qt/mapview.cpp     (original)
+++ trunk/client/gui-qt/mapview.cpp     Mon Aug 18 20:12:23 2014
@@ -1110,7 +1110,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(),


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits