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

[Thibaut Gridel]

SVN commit 1135200 by tgridel:

gpslayer: drop currentPosition

 M  +0 -2      MarbleControlBox.cpp  
 M  +0 -2      MarbleControlBox.h  
 M  +0 -5      MarbleMap.cpp  
 M  +0 -7      MarbleMap.h  
 M  +0 -6      MarbleWidget.cpp  
 M  +0 -8      MarbleWidget.h  
 M  +0 -15     gps/GpsLayer.cpp  
 M  +0 -3      gps/GpsLayer.h  


--- trunk/KDE/kdeedu/marble/src/lib/MarbleControlBox.cpp #1135199:1135200
@@ -331,8 +331,6 @@
     }
 
     //connect CurrentLoctaion signals
-    connect( this, SIGNAL( gpsPositionChanged( qreal, qreal ) ),
-             d->m_widget, SLOT( changeCurrentPosition( qreal, qreal ) ) );
     connect( d->m_widget->model()->positionTracking(),
              SIGNAL( gpsLocation( GeoDataCoordinates, qreal ) ),
              this, SLOT( receiveGpsCoordinates( GeoDataCoordinates, qreal ) ) );
--- trunk/KDE/kdeedu/marble/src/lib/MarbleControlBox.h #1135199:1135200
@@ -162,8 +162,6 @@
 
     void projectionSelected( Projection );
     
-    void gpsPositionChanged( qreal lat, qreal lon );
-   
  public Q_SLOTS:
 
     void selectTheme( const QString & );
--- trunk/KDE/kdeedu/marble/src/lib/MarbleMap.cpp #1135199:1135200
@@ -1124,11 +1124,6 @@
     d->m_viewParams.setShowGps( visible );
 }
 
-void MarbleMap::changeCurrentPosition( qreal lon, qreal lat )
-{
-    d->m_model->gpsLayer()->changeCurrentPosition( lat, lon );
-}
-
 void MarbleMap::notifyMouseClick( int x, int y )
 {
     qreal  lon   = 0;
--- trunk/KDE/kdeedu/marble/src/lib/MarbleMap.h #1135199:1135200
@@ -740,13 +740,6 @@
     void setShowFrameRate( bool visible );
 
     /**
-     * @brief Set the current Gps position
-     * @param lat the new latitude value
-     * @param lon the new longitude value
-     */
-    void changeCurrentPosition( qreal lon, qreal lat );
-
-     /**
      * @brief used to notify about the position of the mouse click
       */
     void notifyMouseClick( int x, int y );
--- trunk/KDE/kdeedu/marble/src/lib/MarbleWidget.cpp #1135199:1135200
@@ -1049,12 +1049,6 @@
     d->m_model->layerDecorator()->setShowTileId( visible );
 }
 
-void MarbleWidget::changeCurrentPosition( qreal lon, qreal lat)
-{
-    d->m_model->gpsLayer()->changeCurrentPosition( lat, lon );
-    repaint();
-}
-
 void MarbleWidget::notifyMouseClick( int x, int y)
 {
     qreal  lon   = 0;
--- trunk/KDE/kdeedu/marble/src/lib/MarbleWidget.h #1135199:1135200
@@ -847,14 +847,6 @@
     void setShowTileId( bool visible );
 
     /**
-     * @brief Set the current Gps position
-     * @param lat the new latitude value
-     * @param lon the new longitude value
-     */
-    
-    void changeCurrentPosition( qreal lon, qreal lat );
-
-     /**
      * @brief Used to notify about the position of the mouse click
       */
     void notifyMouseClick( int x, int y );
--- trunk/KDE/kdeedu/marble/src/lib/gps/GpsLayer.cpp #1135199:1135200
@@ -27,13 +27,6 @@
                     QObject *parent )
                 :AbstractLayer( parent )
 {
-    m_currentPosition = new Waypoint( 0,0 );
-
-    /*
-    m_waypoints = new WaypointContainer();
-    m_tracks = new TrackContainer();*/
-
-//     m_files = new QVector<GpxFile*>();
     m_fileModel = fileModel;
 
     m_tracking = positionTracking;
@@ -43,7 +36,6 @@
 GpsLayer::~GpsLayer()
 {
     // leaks m_fileModel, see comment in clearModel()
-    delete m_currentPosition;
 }
 
 void GpsLayer::paintLayer( ClipPainter *painter,
@@ -51,8 +43,6 @@
 {
     painter->save();
     if ( visible() ) {
-        m_currentPosition->draw( painter, canvasSize,
-                                 viewParams );
         QRegion temp; // useless variable
         m_tracking->update( canvasSize, viewParams, temp );
         m_tracking->draw( painter, canvasSize, viewParams );
@@ -67,11 +57,6 @@
     painter->restore();
 }
 
-void GpsLayer::changeCurrentPosition( qreal lat, qreal lon )
-{
-    m_currentPosition->setPosition( lat, lon );
-}
-
 void GpsLayer::clearModel()
 {
     // Here is a know memory leak, because m_fileModel does not get
--- trunk/KDE/kdeedu/marble/src/lib/gps/GpsLayer.h #1135199:1135200
@@ -37,14 +37,11 @@
     virtual void paintLayer( ClipPainter *painter, 
                              const QSize &canvasSize,
                              ViewParams *viewParams );
-    void changeCurrentPosition( qreal lat, qreal lon );
 
     GpxFileModel        *m_fileModel;
 public slots:
     virtual void clearModel();
  private:
-    Waypoint            *m_currentPosition;
-
     PositionTracking         *m_tracking;
 };