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

[Thibaut Gridel]

SVN commit 1150836 by tgridel:

GeoDataFeature: drop copy converters to downcast classes

 M  +0 -5      GeoDataContainer.cpp  
 M  +0 -1      GeoDataContainer.h  
 M  +0 -5      GeoDataDocument.cpp  
 M  +0 -1      GeoDataDocument.h  
 M  +0 -28     GeoDataFeature.cpp  
 M  +0 -6      GeoDataFeature.h  
 M  +0 -5      GeoDataFolder.cpp  
 M  +0 -1      GeoDataFolder.h  
 M  +0 -5      GeoDataPlacemark.cpp  
 M  +0 -5      GeoDataPlacemark.h  


--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataContainer.cpp #1150835:1150836
@@ -41,11 +41,6 @@
 {
 }
 
-GeoDataContainer::GeoDataContainer( const GeoDataFeature& other )
-    : GeoDataFeature( other )
-{
-}
-
 GeoDataContainer::~GeoDataContainer()
 {
 }
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataContainer.h #1150835:1150836
@@ -49,7 +49,6 @@
     /// Default constructor
     GeoDataContainer();
     GeoDataContainer( const GeoDataContainer& other );
-    GeoDataContainer( const GeoDataFeature& other );
     GeoDataContainerPrivate* p() const;
     /// Destruct the GeoDataContainer
     virtual ~GeoDataContainer();
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataDocument.cpp #1150835:1150836
@@ -39,11 +39,6 @@
 {
 }
 
-GeoDataDocument::GeoDataDocument( const GeoDataFeature& other )
-    : GeoDataContainer( other )
-{
-}
-
 GeoDataDocument::GeoDataDocument( const GeoDataDocument& other )
     : GeoDocument(), GeoDataContainer( other )
 {
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataDocument.h #1150835:1150836
@@ -55,7 +55,6 @@
 {
 public:
     GeoDataDocument();
-    GeoDataDocument( const GeoDataFeature& other );
     GeoDataDocument( const GeoDataDocument& other );
     ~GeoDataDocument();
 
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataFeature.cpp #1150835:1150836
@@ -51,34 +51,6 @@
     d->ref.ref();
 }
 
-GeoDataFeature::GeoDataFeature( const GeoDataContainer& other )
-    : GeoDataObject( other ),
-      d( other.GeoDataFeature::d )
-{
-    d->ref.ref();
-}
-
-GeoDataFeature::GeoDataFeature( const GeoDataFolder& other )
-    : GeoDataObject( other ),
-      d( other.GeoDataFeature::d )
-{
-    d->ref.ref();
-}
-
-GeoDataFeature::GeoDataFeature( const GeoDataDocument& other )
-    : GeoDataObject( other ),
-      d( other.GeoDataFeature::d )
-{
-    d->ref.ref();
-}
-
-GeoDataFeature::GeoDataFeature( const GeoDataPlacemark& other )
-    : GeoDataObject( other ),
-      d( other.GeoDataFeature::d )
-{
-    d->ref.ref();
-}
-
 GeoDataFeature::GeoDataFeature( const QString& name )
     : d( new GeoDataFeaturePrivate() )
 {
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataFeature.h #1150835:1150836
@@ -71,12 +71,6 @@
 
     GeoDataFeature( const GeoDataFeature& other );
 
-    // copy ctors for derived classes
-    GeoDataFeature( const GeoDataContainer& other );
-    GeoDataFeature( const GeoDataFolder& other );
-    GeoDataFeature( const GeoDataDocument& other );
-    GeoDataFeature( const GeoDataPlacemark& other );
-
     virtual ~GeoDataFeature();
 
     GeoDataFeature& operator=( const GeoDataFeature& other );
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataFolder.cpp #1150835:1150836
@@ -60,11 +60,6 @@
 {
 }
 
-GeoDataFolder::GeoDataFolder( const GeoDataFeature& other )
-    : GeoDataContainer( other )
-{
-}
-
 GeoDataFolder::~GeoDataFolder()
 {
 }
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataFolder.h #1150835:1150836
@@ -52,7 +52,6 @@
  public:
     GeoDataFolder();
     GeoDataFolder( const GeoDataFolder& other );
-    GeoDataFolder( const GeoDataFeature& other );
     ~GeoDataFolder();
 
     /// Provides type information for downcasting a GeoData
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataPlacemark.cpp #1150835:1150836
@@ -33,11 +33,6 @@
 {
 }
 
-GeoDataPlacemark::GeoDataPlacemark( const GeoDataFeature& other )
-: GeoDataFeature( other )
-{
-}
-
 GeoDataPlacemark::GeoDataPlacemark( const QString& name )
     : GeoDataFeature( new GeoDataPlacemarkPrivate )
 {
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataPlacemark.h #1150835:1150836
@@ -63,11 +63,6 @@
     GeoDataPlacemark( const GeoDataPlacemark& placemark );
 
     /**
-     * Create a new placemark from existing feature @p feature
-     */
-    GeoDataPlacemark( const GeoDataFeature& feature );
-
-    /**
      * Create a new placemark with the given @p name.
      */
     GeoDataPlacemark( const QString &name );