diff options
| author | akashihi <akashihi@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2010-03-23 09:48:07 +0000 |
|---|---|---|
| committer | akashihi <akashihi@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2010-03-23 09:48:07 +0000 |
| commit | 23d8bea52055ce3d43f2e6d896bf1d0e11adc1c4 (patch) | |
| tree | 7564f7cb014cba53fe375474db2b713822eb0b8c | |
| parent | 08e9ec947e9a094335e7f0307ec7c961e63cac13 (diff) | |
| download | navit-svn-23d8bea52055ce3d43f2e6d896bf1d0e11adc1c4.tar.gz | |
Fix:gui/qml:Unicode now works fine
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit/navit@3074 ffa7fe5e-494d-0410-b361-a75ebd5db220
| -rw-r--r-- | gui/qml/ngqpoint.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gui/qml/ngqpoint.h b/gui/qml/ngqpoint.h index b69036be..1dba4764 100644 --- a/gui/qml/ngqpoint.h +++ b/gui/qml/ngqpoint.h @@ -48,7 +48,7 @@ public slots: lng_deg=g.lng; lng_min=fmod(g.lng*60,60); lng_sec=fmod(g.lng*3600,60); - return QString("%1°%2'%3\" %4%5%6°%7'%8\" %9").arg(lat_deg).arg(lat_min).arg(lat_sec).arg(latc).arg(' ').arg(lng_deg).arg(lng_min).arg(lng_sec).arg(lngc); + return QString(QString::fromLocal8Bit("%1°%2'%3\" %4%5%6°%7'%8\" %9")).arg(lat_deg).arg(lat_min).arg(lat_sec).arg(latc).arg(' ').arg(lng_deg).arg(lng_min).arg(lng_sec).arg(lngc); } QString pointName() { int dist=10; @@ -87,9 +87,9 @@ public slots: if (item_attr_get(item, attr_label, &attr)) { label=map_convert_string(m, attr.u.str); if (QString(item_to_name(item->type)).startsWith(QString("poi_"))) { - ret=item_to_name(item->type); + ret=QString::fromLocal8Bit(item_to_name(item->type)); ret=ret.remove(QString("poi_")); - ret+=QString(" ")+label; + ret+=QString(" ")+QString::fromLocal8Bit(label); map_convert_free(label); street_data_free(data); map_rect_destroy(mr); @@ -97,9 +97,9 @@ public slots: return ret; } if (QString(item_to_name(item->type)).startsWith(QString("poly_"))) { - ret=item_to_name(item->type); + ret=QString::fromLocal8Bit(item_to_name(item->type)); ret=ret.remove(QString("poly_")); - ret+=QString(" ")+label; + ret+=QString(" ")+QString::fromLocal8Bit(label); map_convert_free(label); street_data_free(data); map_rect_destroy(mr); @@ -108,7 +108,7 @@ public slots: } if (QString(item_to_name(item->type)).startsWith(QString("street_"))) { ret="Street "; - ret+=label; + ret+=QString::fromLocal8Bit(label); map_convert_free(label); street_data_free(data); map_rect_destroy(mr); |