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

[Bernhard Beschow]

SVN commit 1185223 by beschow:

un-virtualize a method where all the child classes invoked the parent method

* remove overloaded child methods

 M  +1 -1      AbstractProjection.h  
 M  +0 -8      EquirectProjection.cpp  
 M  +0 -4      EquirectProjection.h  
 M  +0 -8      MercatorProjection.cpp  
 M  +0 -4      MercatorProjection.h  
 M  +0 -8      SphericalProjection.cpp  
 M  +0 -4      SphericalProjection.h  


--- trunk/KDE/kdeedu/marble/src/lib/Projections/AbstractProjection.h #1185222:1185223
@@ -173,7 +173,7 @@
                                     bool &globeHidesPoint ) = 0;
 
 
-    virtual bool screenCoordinates( const GeoDataLineString &lineString, 
+    bool screenCoordinates( const GeoDataLineString &lineString,
                                     const ViewportParams *viewport,
                                     QVector<QPolygonF*> &polygons );
 
--- trunk/KDE/kdeedu/marble/src/lib/Projections/EquirectProjection.cpp #1185222:1185223
@@ -190,14 +190,6 @@
 }
 
 
-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 #1185222:1185223
@@ -80,10 +80,6 @@
                             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 #1185222:1185223
@@ -236,14 +236,6 @@
 }
 
 
-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 #1185222:1185223
@@ -79,10 +79,6 @@
                             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/SphericalProjection.cpp #1185222:1185223
@@ -181,14 +181,6 @@
 }
 
 
-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 #1185222:1185223
@@ -79,10 +79,6 @@
                             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