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

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

Git commit 784d583e585c7397b4c85a99b6466eb06149652c by Niko Sams.
Committed on 31/12/2011 at 14:29.
Pushed by nsams into branch 'master'.

remove for GeoDataObject unneded geometryId

M  +0    -5    src/lib/geodata/data/GeoDataSimpleArrayData.cpp
M  +0    -1    src/lib/geodata/data/GeoDataSimpleArrayData.h
M  +1    -2    src/lib/geodata/data/Serializable.h

http://commits.kde.org/marble/784d583e585c7397b4c85a99b6466eb06149652c

diff --git a/src/lib/geodata/data/GeoDataSimpleArrayData.cpp b/src/lib/geod=
ata/data/GeoDataSimpleArrayData.cpp
index 4349966..42b4fa0 100644
--- a/src/lib/geodata/data/GeoDataSimpleArrayData.cpp
+++ b/src/lib/geodata/data/GeoDataSimpleArrayData.cpp
@@ -69,11 +69,6 @@ const char* GeoDataSimpleArrayData::nodeType() const
     return GeoDataTypes::GeoDataSimpleArrayDataType;
 }
 =

-EnumGeometryId GeoDataSimpleArrayData::geometryId() const
-{
-    return GeoDataSimpleArrayDataId;
-}
-
 void GeoDataSimpleArrayData::pack( QDataStream& stream ) const
 {
     GeoDataObject::pack( stream );
diff --git a/src/lib/geodata/data/GeoDataSimpleArrayData.h b/src/lib/geodat=
a/data/GeoDataSimpleArrayData.h
index b94de98..f9abbdf 100644
--- a/src/lib/geodata/data/GeoDataSimpleArrayData.h
+++ b/src/lib/geodata/data/GeoDataSimpleArrayData.h
@@ -48,7 +48,6 @@ public:
     void append( const QVariant& value );
 =

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

diff --git a/src/lib/geodata/data/Serializable.h b/src/lib/geodata/data/Ser=
ializable.h
index 1b30098..cfa4b74 100644
--- a/src/lib/geodata/data/Serializable.h
+++ b/src/lib/geodata/data/Serializable.h
@@ -43,7 +43,6 @@ enum EnumGeometryId {
     GeoDataPolygonId,
     GeoDataMultiGeometryId,
     GeoDataModelId,
-    GeoDataTrackId,
-    GeoDataSimpleArrayDataId
+    GeoDataTrackId
 };
 #endif

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