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

[Jens-Michael Hoffmann]

SVN commit 1126812 by jmhoffmann:

AbstractScanlineTextureMapper: Declare data members private rather than
protected, if possible.

 M  +6 -3      AbstractScanlineTextureMapper.cpp  
 M  +13 -17    AbstractScanlineTextureMapper.h  


--- trunk/KDE/kdeedu/marble/src/lib/AbstractScanlineTextureMapper.cpp #1126811:1126812
@@ -35,14 +35,17 @@
       m_toTileCoordinatesLon( 0.0 ),
       m_toTileCoordinatesLat( 0.0 ),
       m_interlaced( false ),
-      m_textureLayer( textureLayer ),
       m_tileLoader( tileLoader ),
-      m_tile( 0 ),
-      m_maxTileLevel( 0 ),
       m_tilePosX( 0 ),
       m_tilePosY( 0 ),
+      m_textureLayer( textureLayer ),
+      m_tile( 0 ),
+      m_previousRadius( 0 ),
+      m_n( 0 ),
+      m_nInverse( 0.0 ),
       m_nBest( 0 ),
       m_tileLevel( 0 ),
+      m_maxTileLevel( 0 ),
       m_globalWidth( 0 ),
       m_globalHeight( 0 ),
       m_normGlobalWidth( 0.0 ),
--- trunk/KDE/kdeedu/marble/src/lib/AbstractScanlineTextureMapper.h #1126811:1126812
@@ -101,7 +101,7 @@
     // maximum values for global texture coordinates
     // ( with origin in upper left corner, measured in pixel) 
     int     m_maxGlobalX;
-    int     m_maxGlobalY;
+    int     m_maxGlobalY; // could be private also
 
     int     m_imageHeight;
     int     m_imageWidth;
@@ -120,36 +120,32 @@
 
     bool m_interlaced;
 
-    // ------------------------
-    // Tile stuff
-    GeoSceneTexture *m_textureLayer;
-    /// size of the tiles of of the current texture layer
-    QSize m_tileSize;
     StackedTileLoader *m_tileLoader;
-    GeoSceneTexture::Projection m_tileProjection;
 
-    StackedTile *m_tile;
-
-    int          m_maxTileLevel;
-
-    int          m_previousRadius;
-
     // Position of the tile in global Texture Coordinates
     // ( with origin in upper left corner, measured in pixel) 
     int          m_tilePosX;
     int          m_tilePosY;
 
-    int          m_n;
-    qreal        m_nInverse;
-    int          m_nBest;
-
  private:
     Q_DISABLE_COPY( AbstractScanlineTextureMapper )
     void initGlobalWidth();
     void initGlobalHeight();
     void initTileSize();
 
+    GeoSceneTexture *m_textureLayer;
+    /// size of the tiles of of the current texture layer
+    QSize m_tileSize;
+    GeoSceneTexture::Projection m_tileProjection;
+    StackedTile *m_tile;
+    int         m_previousRadius;
+
+    int         m_n;
+    qreal       m_nInverse;
+    int         m_nBest;
+
     int         m_tileLevel;
+    int         m_maxTileLevel;
     int         m_globalWidth;
     int         m_globalHeight;
     qreal       m_normGlobalWidth;