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

[Jens-Michael Hoffmann]

SVN commit 1092222 by jmhoffmann:

TileLoader: add MapThemeManager parameter to constructor.

 M  +4 -1      MarbleModel.cpp  
 M  +2 -2      TileLoader.cpp  
 M  +3 -1      TileLoader.h  


--- trunk/KDE/kdeedu/marble/src/lib/MarbleModel.cpp #1092221:1092222
@@ -23,6 +23,7 @@
 #include <QtGui/QItemSelectionModel>
 #include <QtGui/QSortFilterProxyModel>
 
+#include "MapThemeManager.h"
 #include "global.h"
 #include "MarbleDebug.h"
 #include "gps/GpsLayer.h"
@@ -86,6 +87,7 @@
         : m_parent( parent ),
           m_dataFacade( 0 ),
           m_pluginManager( new PluginManager( parent ) ),
+          m_mapThemeManager( new MapThemeManager( parent )),
           m_mapTheme( 0 ),
           m_layerManager( 0 ),
           m_downloadManager( new HttpDownloadManager( new FileStoragePolicy(
@@ -109,6 +111,7 @@
     MarbleDataFacade        *m_dataFacade;
 
     PluginManager           *m_pluginManager;
+    MapThemeManager         *m_mapThemeManager;
 
     // View and paint stuff
     GeoSceneDocument        *m_mapTheme;
@@ -161,7 +164,7 @@
              d->m_downloadManager, SLOT( addJob( QUrl, QString, QString, DownloadUsage )));
     d->m_dataFacade = new MarbleDataFacade( this );
 
-    d->m_tileLoader = new TileLoader( d->m_downloadManager, this );
+    d->m_tileLoader = new TileLoader( d->m_mapThemeManager, d->m_downloadManager, this );
 
     d->m_texmapper = 0;
     
--- trunk/KDE/kdeedu/marble/src/lib/TileLoader.cpp #1092221:1092222
@@ -73,8 +73,8 @@
 };
 
 
-
-TileLoader::TileLoader( HttpDownloadManager *downloadManager, MarbleModel* parent )
+TileLoader::TileLoader( MapThemeManager const * mapThemeManager,
+                        HttpDownloadManager *downloadManager, MarbleModel* parent )
     : d( new TileLoaderPrivate() ),
       m_parent( parent )
 {
--- trunk/KDE/kdeedu/marble/src/lib/TileLoader.h #1092221:1092222
@@ -35,6 +35,7 @@
 
 class TextureTile;
 class HttpDownloadManager;
+class MapThemeManager;
 class MarbleModel;
 class GeoSceneLayer;
 
@@ -64,7 +65,8 @@
          * @param downloadManager The download manager that shall be used to fetch
          *                        the tiles from a remote resource.
          */
-        TileLoader( HttpDownloadManager *downloadManager, MarbleModel* parent);
+        TileLoader( MapThemeManager const * mapThemeManager, HttpDownloadManager *downloadManager,
+                    MarbleModel* parent);
 
         /**
          * Destroys the tile loader.