[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [marble] src/lib/geodata/data: GeoDataSimpleArrayData: inherit
From:       Niko Sams <niko.sams () gmail ! com>
Date:       2011-12-31 15:16:59
Message-ID: 20111231151659.7A9FB580D3 () git ! kde ! org
[Download RAW message or body]

Git commit f3af925006ec55f736b155a4716fdc4d5dfd29a3 by Niko Sams.
Committed on 11/12/2011 at 13:01.
Pushed by nsams into branch 'master'.

GeoDataSimpleArrayData: inherit GeoDataObject instead of GeoDataGeometry

it's not rendered, so GeoDataGeometry is incorrect.

and:
- cleanup includes
- properly implement copy constructor

M  +4    -13   src/lib/geodata/data/GeoDataSimpleArrayData.cpp
M  +4    -7    src/lib/geodata/data/GeoDataSimpleArrayData.h

http://commits.kde.org/marble/f3af925006ec55f736b155a4716fdc4d5dfd29a3

diff --git a/src/lib/geodata/data/GeoDataSimpleArrayData.cpp b/src/lib/geod=
ata/data/GeoDataSimpleArrayData.cpp
index 6eff93e..4349966 100644
--- a/src/lib/geodata/data/GeoDataSimpleArrayData.cpp
+++ b/src/lib/geodata/data/GeoDataSimpleArrayData.cpp
@@ -10,15 +10,11 @@
 =

 #include "GeoDataSimpleArrayData.h"
 =

-#include "GeoDataLatLonAltBox.h"
 #include "GeoDataTypes.h"
 #include "MarbleDebug.h"
 =

-#include "GeoDataLineString.h"
-
 #include <QtCore/QMap>
 #include <QtCore/QLinkedList>
-#include "GeoDataExtendedData.h"
 =

 namespace Marble {
 =

@@ -37,8 +33,8 @@ GeoDataSimpleArrayData::GeoDataSimpleArrayData()
 {
 }
 =

-GeoDataSimpleArrayData::GeoDataSimpleArrayData( const GeoDataGeometry &oth=
er )
-    : GeoDataGeometry( other )
+GeoDataSimpleArrayData::GeoDataSimpleArrayData( const GeoDataSimpleArrayDa=
ta& other )
+    : GeoDataObject( other ), d( new GeoDataSimpleArrayDataPrivate( *other=
.d ) )
 {
 }
 =

@@ -78,19 +74,14 @@ EnumGeometryId GeoDataSimpleArrayData::geometryId() con=
st
     return GeoDataSimpleArrayDataId;
 }
 =

-GeoDataLatLonAltBox GeoDataSimpleArrayData::latLonAltBox() const
-{
-    return GeoDataLatLonAltBox();
-}
-
 void GeoDataSimpleArrayData::pack( QDataStream& stream ) const
 {
-    GeoDataGeometry::pack( stream );
+    GeoDataObject::pack( stream );
 }
 =

 void GeoDataSimpleArrayData::unpack( QDataStream& stream )
 {
-    GeoDataGeometry::unpack( stream );
+    GeoDataObject::unpack( stream );
 }
 =

 =

diff --git a/src/lib/geodata/data/GeoDataSimpleArrayData.h b/src/lib/geodat=
a/data/GeoDataSimpleArrayData.h
index aa86e63..b94de98 100644
--- a/src/lib/geodata/data/GeoDataSimpleArrayData.h
+++ b/src/lib/geodata/data/GeoDataSimpleArrayData.h
@@ -11,22 +11,20 @@
 #ifndef MARBLE_GEODATASIMPLEARRAYDATA_H
 #define MARBLE_GEODATASIMPLEARRAYDATA_H
 =

-#include "GeoDataCoordinates.h"
-#include "GeoDataGeometry.h"
+#include "GeoDataObject.h"
 =

-#include <QtCore/QDateTime>
-#include <QtCore/QPair>
+#include <QtCore/QVariant>
 =

 namespace Marble {
 =

 class GeoDataSimpleArrayDataPrivate;
 =

-class GEODATA_EXPORT GeoDataSimpleArrayData : public GeoDataGeometry
+class GEODATA_EXPORT GeoDataSimpleArrayData : public GeoDataObject
 {
 =

 public:
     GeoDataSimpleArrayData();
-    GeoDataSimpleArrayData( const GeoDataGeometry &other );
+    GeoDataSimpleArrayData( const GeoDataSimpleArrayData& other );
     ~GeoDataSimpleArrayData();
 =

     /**
@@ -51,7 +49,6 @@ public:
 =

     virtual const char* nodeType() const;
     virtual EnumGeometryId geometryId() const;
-    virtual GeoDataLatLonAltBox latLonAltBox() const;
     virtual void pack( QDataStream& stream ) const;
     virtual void unpack( QDataStream& stream );
 =


[prev in list] [next in list] [prev in thread] [next in thread]