[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdeedu/kstars/kstars/widgets
From:       Alexey Khudyakov <alexey.skladnoy () gmail ! com>
Date:       2009-11-04 21:40:53
Message-ID: 1257370853.609570.6415.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1044911 by khudyakov:

Use function in GeoLocation class to construct the name

 M  +4 -9      infoboxwidget.cpp  


--- trunk/KDE/kdeedu/kstars/kstars/widgets/infoboxwidget.cpp #1044910:1044911
@@ -99,20 +99,15 @@
 }
 
 void InfoBoxWidget::slotGeoChanged() {
-    KStarsData* data = KStarsData::Instance();
+    GeoLocation* geo = KStarsData::Instance()->geo();
 
-    QString name = data->geo()->translatedName() + ", ";
-    if ( ! data->geo()->province().isEmpty() )
-        name += data->geo()->translatedProvince() + ",  ";
-    name += data->geo()->translatedCountry();
-
     m_strings.clear();
-    m_strings << name;
+    m_strings << geo->fullName();
     m_strings <<
         i18nc( "Longitude", "Long:" ) + ' ' +
-        KGlobal::locale()->formatNumber( data->geo()->lng()->Degrees(),3) + "   " +
+        KGlobal::locale()->formatNumber( geo->lng()->Degrees(),3) + "   " +
         i18nc( "Latitude", "Lat:" ) + ' ' +
-        KGlobal::locale()->formatNumber( data->geo()->lat()->Degrees(),3);
+        KGlobal::locale()->formatNumber( geo->lat()->Degrees(),3);
     updateSize();
     update();
 }
[prev in list] [next in list] [prev in thread] [next in thread]