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

[Thibaut Gridel]

SVN commit 1135198 by tgridel:

use MarbleModel's positionTracking()

 M  +5 -5      MarbleControlBox.cpp  
 M  +0 -5      gps/GpsLayer.cpp  
 M  +0 -1      gps/GpsLayer.h  


--- trunk/KDE/kdeedu/marble/src/lib/MarbleControlBox.cpp #1135197:1135198
@@ -333,14 +333,14 @@
     //connect CurrentLoctaion signals
     connect( this, SIGNAL( gpsPositionChanged( qreal, qreal ) ),
              d->m_widget, SLOT( changeCurrentPosition( qreal, qreal ) ) );
-    connect( d->m_widget->model()->gpsLayer()->getPositionTracking(),
+    connect( d->m_widget->model()->positionTracking(),
              SIGNAL( gpsLocation( GeoDataCoordinates, qreal ) ),
              this, SLOT( receiveGpsCoordinates( GeoDataCoordinates, qreal ) ) );
     connect( d->uiWidget.positionTrackingComboBox, SIGNAL( currentIndexChanged( QString ) ),
              this, SLOT( changePositionProvider( QString ) ) );
     connect( d->uiWidget.locationLabel, SIGNAL( linkActivated( QString ) ),
              this, SLOT( centerOnCurrentLocation() ) );
-    connect( d->m_widget->model()->gpsLayer()->getPositionTracking(),
+    connect( d->m_widget->model()->positionTracking(),
              SIGNAL( statusChanged( PositionProviderStatus) ), this,
              SLOT( adjustPositionTrackingStatus( PositionProviderStatus) ) );
 }
@@ -437,7 +437,7 @@
             break;
         case PositionProviderStatusError:
             html += tr( "Error when determining current location: " );
-            html += d->m_widget->model()->gpsLayer()->getPositionTracking()->error();
+            html += d->m_widget->model()->positionTracking()->error();
             break;
     }
 
@@ -743,7 +743,7 @@
     if ( provider == tr("Disabled") ) {
         d->uiWidget.locationLabel->setEnabled( false );
         d->m_widget->map()->model()->gpsLayer()->setVisible( false );
-        d->m_widget->model()->gpsLayer()->getPositionTracking()->setPositionProviderPlugin( 0 );
+        d->m_widget->model()->positionTracking()->setPositionProviderPlugin( 0 );
         d->m_widget->update();
     }
     else {
@@ -751,7 +751,7 @@
             if ( plugin->guiString() == provider ) {
                d->uiWidget.locationLabel->setEnabled( true );
                PositionProviderPlugin* instance = plugin->newInstance();
-               PositionTracking *tracking = d->m_widget->model()->gpsLayer()->getPositionTracking();
+               PositionTracking *tracking = d->m_widget->model()->positionTracking();
                tracking->setPositionProviderPlugin( instance );
                d->m_widget->map()->model()->gpsLayer()->setVisible( true );
                d->m_widget->update();
--- trunk/KDE/kdeedu/marble/src/lib/gps/GpsLayer.cpp #1135197:1135198
@@ -53,11 +53,6 @@
 //     return QRegion();
 }
 
-PositionTracking* GpsLayer::getPositionTracking()
-{
-    return m_tracking;
-}
-
 void GpsLayer::paintLayer( ClipPainter *painter,
                           const QSize &canvasSize, ViewParams *viewParams )
 {
--- trunk/KDE/kdeedu/marble/src/lib/gps/GpsLayer.h #1135197:1135198
@@ -48,7 +48,6 @@
                    QRegion &reg);
 
     GpxFileModel        *m_fileModel;
-    PositionTracking*   getPositionTracking();
 public slots:
     virtual void clearModel();
  private: