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

Thibaut Gridel tgridel at free.fr
Tue Jun 1 23:14:31 CEST 2010


SVN commit 1133513 by tgridel:

dead code

 M  +0 -2      MarbleControlBox.cpp  
 M  +0 -1      MarbleControlBox.h  
 M  +0 -9      gps/PositionTracking.cpp  
 M  +0 -8      gps/PositionTracking.h  


--- trunk/KDE/kdeedu/marble/src/lib/MarbleControlBox.cpp #1133512:1133513
@@ -331,8 +331,6 @@
     }
 
     //connect CurrentLoctaion signals
-    connect( this, SIGNAL( gpsInputDisabled( bool ) ),
-             d->m_widget, SLOT( setShowGps( bool ) ) );
     connect( this, SIGNAL( gpsPositionChanged( qreal, qreal ) ),
              d->m_widget, SLOT( changeCurrentPosition( qreal, qreal ) ) );
     connect( d->m_widget->model()->gpsLayer()->getPositionTracking(),
--- trunk/KDE/kdeedu/marble/src/lib/MarbleControlBox.h #1133512:1133513
@@ -162,7 +162,6 @@
 
     void projectionSelected( Projection );
     
-    void gpsInputDisabled( bool );
     void gpsPositionChanged( qreal lat, qreal lon );
    
  public Q_SLOTS:
--- trunk/KDE/kdeedu/marble/src/lib/gps/PositionTracking.cpp #1133512:1133513
@@ -37,7 +37,6 @@
     m_gpsTrack    = new Track();
     currentGpx->addTrack( m_gpsTrack );
     m_gpsTrackSeg = 0;
-    m_updateDelay = 0;
 }
 
 
@@ -108,13 +107,6 @@
         return dirty;
 }
 
-void PositionTracking::notifyPosition( GeoDataCoordinates pos )
-{
-    //mDebug() << "Position from gpsd: " << pos.toString();
-    // FIXME: Unused parameters should get fixed during refactoring of this class
-    Q_UNUSED( pos )
-}
-
 void PositionTracking::updateSpeed( TrackPoint* previous, TrackPoint* next )
 {
     //This function makes the assumption that the update stage happens once
@@ -152,7 +144,6 @@
         if ( !( m_gpsPreviousPosition->position() ==
                 m_gpsTracking->position() ) )
         {
-            notifyPosition( m_gpsTracking->position() );
             m_gpsTrackSeg->append( m_gpsPreviousPosition );
             m_gpsPreviousPosition = m_gpsCurrentPosition;
             m_gpsCurrentPosition = new TrackPoint( *m_gpsTracking );
--- trunk/KDE/kdeedu/marble/src/lib/gps/PositionTracking.h #1133512:1133513
@@ -90,9 +90,6 @@
 
     QString error() const;
 
- public slots:
-    void  notifyPosition( GeoDataCoordinates );
-
 Q_SIGNALS:
     void  gpsLocation( GeoDataCoordinates, qreal );
 
@@ -108,7 +105,6 @@
     QPointF             m_relativeRight;
     QPolygonF           m_currentDraw;
     QPolygonF           m_previousDraw;
-    QPointF             m_previousDistancePosition;
 
     Waypoint            *m_currentPosition;
     TrackPoint          *m_gpsCurrentPosition;
@@ -118,10 +114,6 @@
     Track               *m_gpsTrack;
     TrackSegment        *m_gpsTrackSeg;
 
-    int                 m_updateDelay;
-    QTemporaryFile      m_tempFile;
-    QString             m_data;
-
     PositionProviderPlugin* m_positionProvider;
 };
 


More information about the Marble-commits mailing list