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

[Patrick Spendrin]

SVN commit 994895 by sengels:

revert the commit made to get around virtual functions
they seem to work now correctly

 M  +1 -1      GeoDataLineString.cpp  
 M  +1 -1      GeoDataLineString.h  
 M  +0 -5      GeoDataLineString_p.h  
 M  +5 -0      GeoDataLinearRing.cpp  
 M  +2 -0      GeoDataLinearRing.h  
 M  +0 -5      GeoDataLinearRing_p.h  


--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataLineString.cpp #994894:994895
@@ -232,7 +232,7 @@
 
 bool GeoDataLineString::isClosed() const
 {
-    return p()->isClosed();
+    return false;
 }
 
 bool GeoDataLineString::tessellate() const
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataLineString.h #994894:994895
@@ -55,7 +55,7 @@
 
     virtual ~GeoDataLineString();
 
-    bool isClosed() const;
+    virtual bool isClosed() const;
 
     bool tessellate() const;
     void setTessellate( bool tessellate );
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataLineString_p.h #994894:994895
@@ -44,11 +44,6 @@
         return GeoDataLineStringId;
     }
 
-    virtual bool isClosed() const
-    {
-        return false;
-    }
-
     void toPoleCorrected( const GeoDataLineString & q, GeoDataLineString & poleCorrected );
 
     void toDateLineCorrected( const GeoDataLineString & q,
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataLinearRing.cpp #994894:994895
@@ -33,6 +33,11 @@
 {
 }
 
+bool GeoDataLinearRing::isClosed() const
+{
+    return true;
+}
+
 qreal GeoDataLinearRing::length( qreal planetRadius ) const
 {
     qreal  length = GeoDataLineString::length( planetRadius );
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataLinearRing.h #994894:994895
@@ -43,6 +43,8 @@
 
     virtual ~GeoDataLinearRing();
 
+    virtual bool isClosed() const;
+
     virtual qreal length( qreal planetRadius ) const;
 
     virtual QVector<GeoDataLineString*> toRangeCorrected() const;
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataLinearRing_p.h #994894:994895
@@ -39,11 +39,6 @@
     {
         return GeoDataLinearRingId;
     }
-
-    virtual bool isClosed() const
-    {
-        return true;
-    }
 };
 
 } // namespace Marble