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

[Torsten Rahn]

SVN commit 1002972 by rahn:

- Apply "Remove GeoGraphicsItem inheritance in GeoDataObjects" patch by Gridel Thibaut



 M  +0 -14     GeoDataFeature.cpp  
 M  +1 -11     GeoDataFeature.h  
 M  +0 -14     GeoDataGeometry.cpp  
 M  +1 -7      GeoDataGeometry.h  


--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataFeature.cpp #1002971:1002972
@@ -528,20 +528,6 @@
     s_defaultStyleInitialized = false;
 }
 
-void GeoDataFeature::paint( GeoPainter *painter, ViewportParams *viewport,
-                            const QString& renderPos, GeoSceneLayer * layer )
-{
-    Q_UNUSED(painter);
-    Q_UNUSED(viewport);
-    Q_UNUSED(renderPos);
-    Q_UNUSED(layer);
-}
-
-bool GeoDataFeature::isGeoProjected()
-{
-    return false;
-}
-
 void GeoDataFeature::detach()
 {
     if(d->ref == 1)
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataFeature.h #1002971:1002972
@@ -38,11 +38,7 @@
 class GeoDataStyleSelector;
 class GeoDataStyleMap;
 
-class GeoPainter; 
-class ViewportParams;
-class GeoSceneLayer;
 
-
 class GeoDataFeaturePrivate;
 
 /**
@@ -58,8 +54,7 @@
 
 // FIXME: Later also add NetworkLink and Overlay
 
-class GEODATA_EXPORT GeoDataFeature : public GeoDataObject, 
-                                      public GeoGraphicsItem
+class GEODATA_EXPORT GeoDataFeature : public GeoDataObject
 {
     friend class GeoDataContainer;
     friend class GeoDataFolder;
@@ -290,11 +285,6 @@
      */
     static void resetDefaultStyles();
 
-    void paint( GeoPainter *painter, ViewportParams *viewport,
-                const QString& renderPos, GeoSceneLayer * layer = 0 );
-
-    bool isGeoProjected();
-
     /// Serialize the contents of the feature to @p stream.
     virtual void pack( QDataStream& stream ) const;
     /// Unserialize the contents of the feature from @p stream.
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataGeometry.cpp #1002971:1002972
@@ -138,15 +138,6 @@
     d->m_altitudeMode = altitudeMode;
 }
 
-void GeoDataGeometry::paint( GeoPainter *painter, ViewportParams *viewport,
-                             const QString& renderPos, GeoSceneLayer * layer )
-{
-    Q_UNUSED(painter);
-    Q_UNUSED(viewport);
-    Q_UNUSED(renderPos);
-    Q_UNUSED(layer);
-}
-
 void GeoDataGeometry::pack( QDataStream& stream ) const
 {
     GeoDataObject::pack( stream );
@@ -166,9 +157,4 @@
     d->m_altitudeMode = (AltitudeMode) am;
 }
 
-bool GeoDataGeometry::isGeoProjected()
-{
-    return true;
 }
-
-}
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataGeometry.h #1002971:1002972
@@ -43,8 +43,7 @@
  * @see GeoDataPolygon
  */
 
-class GEODATA_EXPORT GeoDataGeometry : public GeoDataObject,
-                                       public GeoGraphicsItem
+class GEODATA_EXPORT GeoDataGeometry : public GeoDataObject
 {
     friend class GeoDataPoint;
     friend class GeoDataPolygon;
@@ -73,16 +72,11 @@
     AltitudeMode altitudeMode() const;
     void setAltitudeMode( const AltitudeMode altitudeMode );
 
-    void paint( GeoPainter *painter, ViewportParams *viewport,
-                const QString& renderPos, GeoSceneLayer * layer = 0 );
-
     /// Serialize the contents of the feature to @p stream.
     virtual void pack( QDataStream& stream ) const;
     /// Unserialize the contents of the feature from @p stream.
     virtual void unpack( QDataStream& stream );
 
-    virtual bool isGeoProjected();
-
     void detach();
  private:
     GeoDataGeometryPrivate* p() const;