[Marble-commits] KDE/kdeedu/marble/src/lib

[Dennis Nienhüser]

SVN commit 1113428 by nienhueser:

Improved names

 M  +7 -7      MarbleControlBox.cpp  
 M  +1 -1      MarbleControlBox.h  


--- trunk/KDE/kdeedu/marble/src/lib/MarbleControlBox.cpp #1113427:1113428
@@ -335,7 +335,7 @@
     connect( d->uiWidget.positionTrackingComboBox, SIGNAL( currentIndexChanged( QString ) ),
              this, SLOT( changePositionProvider( QString ) ) );
     connect( d->uiWidget.locationLabel, SIGNAL( linkActivated( QString ) ),
-             this, SLOT( centerOnGps() ) );
+             this, SLOT( centerOnCurrentLocation() ) );
 }
 
 void MarbleControlBox::setWidgetTabShown( QWidget * widget,
@@ -413,9 +413,9 @@
 }
 
 
-void MarbleControlBox::receiveGpsCoordinates( const GeoDataCoordinates &in, qreal speed )
+void MarbleControlBox::receiveGpsCoordinates( const GeoDataCoordinates &position, qreal speed )
 {
-    d->m_currentPosition = in;
+    d->m_currentPosition = position;
     QString unitString;
     QString speedString;
     QString distanceUnitString;
@@ -438,7 +438,7 @@
         unitString = tr("km/h");
         unitSpeed = speed / 1000;
         distanceUnitString = tr("m");
-        distance = in.altitude();
+        distance = position.altitude();
         break;
 
         case Imperial:
@@ -446,14 +446,14 @@
         unitString = tr("m/h");
         unitSpeed = (speed/1000) * KM2MI;
         distanceUnitString = tr("ft");
-        distance = in.altitude() * M2FT;
+        distance = position.altitude() * M2FT;
         break;
     }
     // TODO read this value from the incoming signal
     speedString = QLocale::system().toString( unitSpeed, 'f', 1);
     distanceString = QString( "%1 %2" ).arg( distance, 0, 'f', 1, QChar(' ') ).arg( distanceUnitString );
 
-    html = html.arg( in.lonToString() ).arg( in.latToString() );
+    html = html.arg( position.lonToString() ).arg( position.latToString() );
     html = html.arg( distanceString ).arg( speedString + ' ' + unitString );
     d->uiWidget.locationLabel->setText( html );
 }
@@ -715,7 +715,7 @@
     }
 }
 
-void MarbleControlBox::centerOnGps()
+void MarbleControlBox::centerOnCurrentLocation()
 {
     d->m_widget->centerOn(d->m_currentPosition, true);
 }
--- trunk/KDE/kdeedu/marble/src/lib/MarbleControlBox.h #1113427:1113428
@@ -245,7 +245,7 @@
     void adjustForStill();
 
     void changePositionProvider( const QString &provider );
-    void centerOnGps();
+    void centerOnCurrentLocation();
 
  private:
     void setWidgetTabShown( QWidget * widget, int insertIndex,