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

[Jens-Michael Hoffmann]

SVN commit 1011087 by jmhoffmann:

- Make methods non-virtual for classes w/o virtual dtor and w/o derived classes,
- also remove unnecessary user defined ctors and dtors, probably fixing
  unintended behaviour in case of GeoDataIconStylePrivate, where some members
  are not copied by copy dtor.


 M  +1 -11     GeoDataColorStyle.cpp  
 M  +1 -12     GeoDataHotSpot.cpp  
 M  +1 -12     GeoDataIconStyle.cpp  
 M  +2 -13     GeoDataLabelStyle.cpp  
 M  +1 -1      GeoDataLatLonAltBox.cpp  
 M  +2 -1      GeoDataLatLonBox.cpp  
 M  +1 -10     GeoDataLineStyle.cpp  
 M  +1 -1      GeoDataLod_p.h  
 M  +1 -1      GeoDataObject.cpp  
 M  +1 -1      GeoDataPolyStyle.cpp  
 M  +3 -3      GeoDataRegion_p.h  
 M  +1 -5      GeoDataStyle.cpp  
 M  +1 -14     GeoDataStyleMap.cpp  
 M  +1 -14     GeoDataStyleSelector.cpp  


--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataColorStyle.cpp #1011086:1011087
@@ -22,18 +22,8 @@
     {
     }
 
-    GeoDataColorStylePrivate( const GeoDataColorStylePrivate& other )
-      : m_color( other.m_color ),
-        m_colorMode( other.m_colorMode )
+    QString nodeType() const
     {
-    }
-
-    ~GeoDataColorStylePrivate()
-    {
-    }
-
-    virtual QString nodeType() const
-    {
         return GeoDataTypes::GeoDataColorStyleType;
     }
 
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataHotSpot.cpp #1011086:1011087
@@ -31,19 +31,8 @@
     {
     }
 
-    GeoDataHotSpotPrivate( const GeoDataHotSpotPrivate& other )
-        : m_hotSpot( other.m_hotSpot ),
-          m_xunits( other.m_xunits ),
-          m_yunits( other.m_yunits )
+    QString nodeType() const
     {
-    }
-
-    ~GeoDataHotSpotPrivate()
-    {
-    }
-
-    virtual QString nodeType() const
-    {
         return GeoDataTypes::GeoDataHotspotType;
     }
 
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataIconStyle.cpp #1011086:1011087
@@ -24,13 +24,6 @@
     {
     }
 
-    GeoDataIconStylePrivate( const GeoDataIconStylePrivate& other )
-        : m_scale( other.m_scale ),
-          m_icon( other.m_icon ),
-          m_hotSpot( other.m_hotSpot )
-    {
-    }
-
     GeoDataIconStylePrivate( const QPixmap& icon, const QPointF &hotSpot )
         : m_scale( 1.0 ),
           m_icon( icon ),
@@ -38,12 +31,8 @@
     {
     }
 
-    ~GeoDataIconStylePrivate()
+    QString nodeType() const
     {
-    }
-
-    virtual QString nodeType() const
-    {
         return GeoDataTypes::GeoDataIconStyleType;
     }
 
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataLabelStyle.cpp #1011086:1011087
@@ -32,26 +32,15 @@
     {
     }
 
-    GeoDataLabelStylePrivate( const GeoDataLabelStylePrivate& other )
-        : m_scale( other.m_scale ),
-          m_alignment( other.m_alignment ),
-          m_font( other.m_font )
-    {
-    }
-
-    GeoDataLabelStylePrivate( const QFont &font )
+    explicit GeoDataLabelStylePrivate( const QFont &font )
         : m_scale( 1.0 ),
           m_alignment( GeoDataLabelStyle::Corner ),
           m_font( font )
     {
     }
 
-    ~GeoDataLabelStylePrivate()
+    QString nodeType() const
     {
-    }
-
-    virtual QString nodeType() const
-    {
         return GeoDataTypes::GeoDataLabelStyleType;
     }
 
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataLatLonAltBox.cpp #1011086:1011087
@@ -30,7 +30,7 @@
     {
     }
 
-    virtual QString nodeType() const
+    QString nodeType() const
     {
         return GeoDataTypes::GeoDataLatLonAltBoxType;
     }
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataLatLonBox.cpp #1011086:1011087
@@ -31,7 +31,8 @@
           m_rotation( 0.0 )
     {
     }
-    virtual QString nodeType() const
+
+    QString nodeType() const
     {
         return GeoDataTypes::GeoDataLatLonBoxType;
     }
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataLineStyle.cpp #1011086:1011087
@@ -21,17 +21,8 @@
     {
     }
 
-    GeoDataLineStylePrivate( const GeoDataLineStylePrivate& other )
-     : m_width( other.m_width )
+    QString nodeType() const
     {
-    }
-
-    ~GeoDataLineStylePrivate()
-    {
-    }
-
-    virtual QString nodeType() const
-    {
         return GeoDataTypes::GeoDataLineStyleType;
     }
 
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataLod_p.h #1011086:1011087
@@ -27,7 +27,7 @@
     {
     }
 
-    virtual QString nodeType() const
+    QString nodeType() const
     {
         return GeoDataTypes::GeoDataLodType;
     }
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataObject.cpp #1011086:1011087
@@ -30,7 +30,7 @@
     {
     }
 
-    virtual QString nodeType() const
+    QString nodeType() const
     {
         return GeoDataTypes::GeoDataObjectType;
     }
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataPolyStyle.cpp #1011086:1011087
@@ -22,7 +22,7 @@
     {
     }
 
-    virtual QString nodeType() const
+    QString nodeType() const
     {
         return GeoDataTypes::GeoDataPolyStyleType;
     }
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataRegion_p.h #1011086:1011087
@@ -27,15 +27,15 @@
     }
 
 
-    GeoDataRegionPrivate( GeoDataFeature * feature )
+    explicit GeoDataRegionPrivate( GeoDataFeature * feature )
          : m_parent( feature ),
            m_latLonAltBox( 0 ),
            m_lod( 0 )
     {
     }
-    
 
-    virtual QString nodeType() const
+
+    QString nodeType() const
     {
         return GeoDataTypes::GeoDataRegionType;
     }
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataStyle.cpp #1011086:1011087
@@ -30,12 +30,8 @@
     {
     }
 
-    ~GeoDataStylePrivate()
+    QString nodeType() const
     {
-    }
-
-    virtual QString nodeType() const
-    {
         return GeoDataTypes::GeoDataStyleType;
     }
 
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataStyleMap.cpp #1011086:1011087
@@ -18,21 +18,8 @@
 class GeoDataStyleMapPrivate
 {
   public:
-    GeoDataStyleMapPrivate()
+    QString nodeType() const
     {
-    }
-
-    GeoDataStyleMapPrivate( const GeoDataStyleMapPrivate& other )
-    {
-        lastKey = other.lastKey;
-    }
-
-    ~GeoDataStyleMapPrivate()
-    {
-    }
-
-    virtual QString nodeType() const
-    {
         return GeoDataTypes::GeoDataSyleMapType;
     }
 
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataStyleSelector.cpp #1011086:1011087
@@ -18,21 +18,8 @@
 class GeoDataStyleSelectorPrivate
 {
   public:
-    GeoDataStyleSelectorPrivate()
+    QString nodeType() const
     {
-    }
-
-    GeoDataStyleSelectorPrivate( const GeoDataStyleSelectorPrivate& other )
-    {
-        m_styleId = other.m_styleId;
-    }
-
-    ~GeoDataStyleSelectorPrivate()
-    {
-    }
-
-    virtual QString nodeType() const
-    {
         return GeoDataTypes::GeoDataStyleSelectorType;
     }