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

List:       kde-commits
Subject:    branches/KDE/4.1/kdeedu/marble
From:       Inge Wallin <inge () lysator ! liu ! se>
Date:       2008-07-20 19:56:23
Message-ID: 1216583783.430674.1829.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 835574 by ingwa:

Make Marble forward compatible again by putting all the members of
MarbleModel into the private class.



 M  +6 -0      ChangeLog  
 M  +21 -15    src/lib/MarbleModel.cpp  
 M  +0 -5      src/lib/MarbleModel.h  


--- branches/KDE/4.1/kdeedu/marble/ChangeLog #835573:835574
@@ -1,3 +1,9 @@
+2008-07-20  Inge Wallin  <inge@lysator.liu.se>
+
+	Restore forward compatibility
+	* src/lib/MarbleModel.{h,cpp}: Make all members part of the
+	private class.
+
 2008-07-20  Jens-Michael Hoffmann  <jensmh@gmx.de>
 
     * src/lib/HttpDownloadManager.cpp:
--- branches/KDE/4.1/kdeedu/marble/src/lib/MarbleModel.cpp #835573:835574
@@ -93,6 +93,12 @@
     MarblePlacemarkModel  *m_placemarkmodel;
     PlaceMarkLayout       *m_placeMarkLayout;
 
+
+    // Misc stuff
+    ExtDateTime           *m_dateTime;
+    SunLocator            *m_sunLocator;
+    MergedLayerDecorator  *m_layerDecorator;
+
     // Selection handling
     QItemSelectionModel *m_placemarkselectionmodel;
 
@@ -163,18 +169,18 @@
     connect( d->m_fileviewmodel, SIGNAL( updateRegion( BoundingBox& ) ),
              this,               SIGNAL( regionChanged( BoundingBox& ) ) );
 
-    m_dateTime = new ExtDateTime();
-    m_sunLocator = new SunLocator(m_dateTime);
-    m_layerDecorator = new MergedLayerDecorator(m_sunLocator);
+    d->m_dateTime       = new ExtDateTime();
+    d->m_sunLocator     = new SunLocator( d->m_dateTime );
+    d->m_layerDecorator = new MergedLayerDecorator( d->m_sunLocator );
 
-    connect(m_dateTime, SIGNAL( timeChanged() ),
-            m_sunLocator, SLOT( update() ) );
-    connect( m_layerDecorator, SIGNAL( repaintMap() ),
-                               SIGNAL( modelChanged() ) );
+    connect(d->m_dateTime,   SIGNAL( timeChanged() ),
+            d->m_sunLocator, SLOT( update() ) );
+    connect( d->m_layerDecorator, SIGNAL( repaintMap() ),
+                                  SIGNAL( modelChanged() ) );
 
     // TODO be able to set these somewhere
-    m_layerDecorator->setShowClouds(true);
-    m_layerDecorator->setShowTileId(false);
+    d->m_layerDecorator->setShowClouds( true );
+    d->m_layerDecorator->setShowTileId( false );
 }
 
 MarbleModel::~MarbleModel()
@@ -705,12 +711,12 @@
 
 SunLocator* MarbleModel::sunLocator() const
 {
-    return m_sunLocator;
+    return d->m_sunLocator;
 }
 
 MergedLayerDecorator* MarbleModel::layerDecorator() const
 {
-    return m_layerDecorator;
+    return d->m_layerDecorator;
 }
 
 void MarbleModel::clearVolatileTileCache()
@@ -776,14 +782,14 @@
     qDebug() << "MarbleModel::paintTile: " << "x: " << x << "y:" << y << "level: " \
<< level << "requestTileUpdate" << requestTileUpdate;  
     if ( d->m_downloadManager != 0 ) {
-        connect( m_layerDecorator, SIGNAL( downloadTile( QUrl, QString, QString ) ),
+        connect( d->m_layerDecorator, SIGNAL( downloadTile( QUrl, QString, QString ) \
                ),
                  d->m_downloadManager, SLOT( addJob( QUrl, QString, QString ) ) );
     }
 
-    m_layerDecorator->setInfo(x, y, level, tile->id());
-    m_layerDecorator->setTile(tile->tile());
+    d->m_layerDecorator->setInfo(x, y, level, tile->id());
+    d->m_layerDecorator->setTile(tile->tile());
         
-    m_layerDecorator->paint("maps/" + textureLayer->sourceDir(), mapTheme() );
+    d->m_layerDecorator->paint("maps/" + textureLayer->sourceDir(), mapTheme() );
     tile->loadTile(requestTileUpdate);
 }
 
--- branches/KDE/4.1/kdeedu/marble/src/lib/MarbleModel.h #835573:835574
@@ -308,11 +308,6 @@
 
     Q_PRIVATE_SLOT( d, void notifyModelChanged() )
     Q_PRIVATE_SLOT( d, void geoDataDocumentLoaded( GeoDataDocument& ) )
-
-    // FIXME: move to d-pointer class
-    SunLocator* m_sunLocator;
-    MergedLayerDecorator* m_layerDecorator;
-    ExtDateTime* m_dateTime;
 };
 
 


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