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

[Jens-Michael Hoffmann]

SVN commit 994940 by jmhoffmann:

Make protected member variables private.


 M  +3 -4      GeoSceneGroup.h  
 M  +3 -3      GeoSceneIcon.h  
 M  +3 -4      GeoSceneItem.h  
 M  +4 -4      GeoSceneLayer.h  
 M  +3 -4      GeoSceneProperty.h  
 M  +3 -4      GeoSceneSection.h  
 M  +1 -1      GeoSceneTexture.h  
 M  +1 -1      GeoSceneVector.h  
 M  +3 -4      GeoSceneZoom.h  


--- trunk/KDE/kdeedu/marble/src/lib/geodata/scene/GeoSceneGroup.h #994939:994940
@@ -86,14 +86,13 @@
  Q_SIGNALS:
     void valueChanged( QString, bool );
 
- protected:
+ private:
+    Q_DISABLE_COPY( GeoSceneGroup )
+
     /// The vector holding all the properties in this settings group.
     QVector<GeoSceneProperty*> m_properties;
 
     QString m_name;
-
- private:
-    Q_DISABLE_COPY( GeoSceneGroup )
 };
 
 }
--- trunk/KDE/kdeedu/marble/src/lib/geodata/scene/GeoSceneIcon.h #994939:994940
@@ -47,11 +47,11 @@
     QColor color() const;
     void setColor(const QColor&);
 
- protected:
+ private:
+    // FIXME: d-pointerfy
+
     QString m_pixmap;
     QColor  m_color;
-
-    // FIXME: d-pointerfy
 };
 
 }
--- trunk/KDE/kdeedu/marble/src/lib/geodata/scene/GeoSceneItem.h #994939:994940
@@ -57,7 +57,9 @@
 
     GeoSceneIcon* icon() const;
 
- protected:
+ private:
+    Q_DISABLE_COPY( GeoSceneItem )
+
     GeoSceneIcon* m_icon;
 
     QString m_name;
@@ -66,9 +68,6 @@
 
     bool    m_checkable;
     int     m_spacing;
-
- private:
-    Q_DISABLE_COPY( GeoSceneItem )
 };
 
 }
--- trunk/KDE/kdeedu/marble/src/lib/geodata/scene/GeoSceneLayer.h #994939:994940
@@ -54,6 +54,7 @@
  protected:
     explicit GeoSceneAbstractDataset( const QString& name );
 
+ private:
     QString m_name;
     QString m_fileFormat;
     int     m_expire;
@@ -97,7 +98,9 @@
     void addFilter( GeoSceneFilter * filter );
     void removeFilter( GeoSceneFilter * filter );
 
- protected:
+ private:
+    Q_DISABLE_COPY( GeoSceneLayer )
+
     /// The vector holding all the data in the layer.
     /// (We want to preserve the order and don't care 
     /// much about speed here), so we don't use a hash
@@ -110,9 +113,6 @@
     QString          m_role;
 
     bool             m_tiled;
-
- private:
-    Q_DISABLE_COPY( GeoSceneLayer )
 };
 
 }
--- trunk/KDE/kdeedu/marble/src/lib/geodata/scene/GeoSceneProperty.h #994939:994940
@@ -55,14 +55,13 @@
  Q_SIGNALS:
     void valueChanged( QString, bool );
 
- protected:
+ private:
+    // FIXME: d-pointerfy
+
     QString  m_name;
     bool     m_available;
     bool     m_defaultValue;
     bool     m_value;
-
- private:
-    // FIXME: d-pointerfy
 };
 
 }
--- trunk/KDE/kdeedu/marble/src/lib/geodata/scene/GeoSceneSection.h #994939:994940
@@ -64,7 +64,9 @@
     int  spacing() const;
     void setSpacing( int spacing );
 
- protected:
+ private:
+    Q_DISABLE_COPY( GeoSceneSection )
+
     /// The vector holding all the items in the legend section.
     /// (We want to preserve the order and don't care 
     /// much about speed here), so we don't use a hash
@@ -76,9 +78,6 @@
 
     bool    m_checkable;
     int     m_spacing;
-
- private:
-    Q_DISABLE_COPY( GeoSceneSection )
 };
 
 }
--- trunk/KDE/kdeedu/marble/src/lib/geodata/scene/GeoSceneTexture.h #994939:994940
@@ -72,7 +72,7 @@
 
     virtual QString type();
 
- protected:
+ private:
     QString m_sourceDir;
     QString m_installMap;
     StorageLayoutMode m_storageLayoutMode;
--- trunk/KDE/kdeedu/marble/src/lib/geodata/scene/GeoSceneVector.h #994939:994940
@@ -54,7 +54,7 @@
 
     virtual QString type();
 
- protected:
+ private:
     QString m_sourceFile;
     QString m_feature;
 
--- trunk/KDE/kdeedu/marble/src/lib/geodata/scene/GeoSceneZoom.h #994939:994940
@@ -43,13 +43,12 @@
     bool discrete() const;
     void setDiscrete( bool theme );
 
- protected:
+ private:
+    // FIXME: d-pointerfy
+
     int  m_minimum;
     int  m_maximum;
     bool m_discrete;
-
- private:
-    // FIXME: d-pointerfy
 };
 
 }