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

[Jens-Michael Hoffmann]

SVN commit 1092223 by jmhoffmann:

Revert "TileLoader: add MapThemeManager parameter to constructor."

This reverts commit d550f4a1257d7e0351f51b6e5e4f21faef077304,
because it was committed to the wrong branch.

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


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