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

[Torsten Rahn]

SVN commit 1002235 by rahn:

Forward port of r1002231

- Fix "was hidden" warning regarding AbstractProjection::screenCoordinates( GeoDataLineString )
- Fix "unused Parameter" warning for deprecated class.



 M  +8 -0      Projections/EquirectProjection.cpp  
 M  +4 -0      Projections/EquirectProjection.h  
 M  +8 -0      Projections/MercatorProjection.cpp  
 M  +5 -1      Projections/MercatorProjection.h  
 M  +8 -0      Projections/SphericalProjection.cpp  
 M  +4 -0      Projections/SphericalProjection.h  
 M  +5 -1      gps/PositionTracking.cpp  


--- trunk/KDE/kdeedu/marble/src/lib/Projections/EquirectProjection.cpp #1002234:1002235
@@ -190,6 +190,14 @@
 }
 
 
+bool EquirectProjection::screenCoordinates( const GeoDataLineString &lineString,
+                                            const ViewportParams *viewport,
+                                            QVector<QPolygonF *> &polygons )
+{
+    return AbstractProjection::screenCoordinates( lineString, viewport, polygons );
+}
+
+
 bool EquirectProjection::geoCoordinates( const int x, const int y,
                                          const ViewportParams *viewport,
                                          qreal& lon, qreal& lat,
--- trunk/KDE/kdeedu/marble/src/lib/Projections/EquirectProjection.h #1002234:1002235
@@ -80,6 +80,10 @@
                             const QSizeF& size,
                             bool &globeHidesPoint );
 
+    bool screenCoordinates( const GeoDataLineString &lineString,
+                            const ViewportParams *viewport,
+                            QVector<QPolygonF*> &polygons );
+
     /**
      * @brief Get the earth coordinates corresponding to a pixel in the map.
      * @param x      the x coordinate of the pixel
--- trunk/KDE/kdeedu/marble/src/lib/Projections/MercatorProjection.cpp #1002234:1002235
@@ -236,6 +236,14 @@
 }
 
 
+bool MercatorProjection::screenCoordinates( const GeoDataLineString &lineString,
+                                            const ViewportParams *viewport,
+                                            QVector<QPolygonF *> &polygons )
+{
+    return AbstractProjection::screenCoordinates( lineString, viewport, polygons );
+}
+
+
 bool MercatorProjection::geoCoordinates( const int x, const int y,
                                          const ViewportParams *viewport,
                                          qreal& lon, qreal& lat,
--- trunk/KDE/kdeedu/marble/src/lib/Projections/MercatorProjection.h #1002234:1002235
@@ -79,7 +79,11 @@
                             const QSizeF& size,
                             bool &globeHidesPoint );
 
-    /**
+    bool screenCoordinates( const GeoDataLineString &lineString,
+                            const ViewportParams *viewport,
+                            QVector<QPolygonF*> &polygons );
+
+   /**
      * @brief Get the earth coordinates corresponding to a pixel in the map.
      * @param x      the x coordinate of the pixel
      * @param y      the y coordinate of the pixel
--- trunk/KDE/kdeedu/marble/src/lib/Projections/SphericalProjection.cpp #1002234:1002235
@@ -181,6 +181,14 @@
 }
 
 
+bool SphericalProjection::screenCoordinates( const GeoDataLineString &lineString,
+                                             const ViewportParams *viewport,
+                                             QVector<QPolygonF *> &polygons )
+{
+    return AbstractProjection::screenCoordinates( lineString, viewport, polygons );
+}
+
+
 bool SphericalProjection::geoCoordinates( const int x, const int y,
                                           const ViewportParams *viewport,
                                           qreal& lon, qreal& lat,
--- trunk/KDE/kdeedu/marble/src/lib/Projections/SphericalProjection.h #1002234:1002235
@@ -79,6 +79,10 @@
                             const QSizeF& size,
                             bool &globeHidesPoint );
 
+    bool screenCoordinates( const GeoDataLineString &lineString,
+                            const ViewportParams *viewport,
+                            QVector<QPolygonF*> &polygons );
+                            
     /**
      * @brief Get the earth coordinates corresponding to a pixel in the map.
      * @param x      the x coordinate of the pixel
--- trunk/KDE/kdeedu/marble/src/lib/gps/PositionTracking.cpp #1002234:1002235
@@ -76,7 +76,9 @@
 void PositionTracking::construct( const QSize &canvasSize,
                              ViewParams *viewParams )
 {
-
+    // FIXME: Unused parameters should get fixed during refactoring of this class
+    Q_UNUSED( canvasSize )
+    Q_UNUSED( viewParams )
 }
 
 
@@ -97,6 +99,8 @@
 void PositionTracking::notifyPosition( GeoDataCoordinates pos )
 {
     //qDebug() << "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 )