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

[Thibaut Gridel]

SVN commit 1006585 by tgridel:

Defer LayerManager creation until after models and MarbleDataFacade are created

 M  +15 -14    MarbleModel.cpp  


--- trunk/KDE/kdeedu/marble/src/lib/MarbleModel.cpp #1006584:1006585
@@ -147,21 +147,7 @@
 {
     MarbleModelPrivate::refCounter.ref();
     d->m_dataFacade = new MarbleDataFacade( this );
-    d->m_layerManager = new LayerManager( d->m_dataFacade, this );
 
-    // FIXME: more on the spot update names and API
-    connect ( d->m_layerManager,      SIGNAL( floatItemsChanged() ),
-              this,                   SIGNAL( modelChanged() ) );
-
-    connect ( d->m_layerManager, SIGNAL( pluginSettingsChanged() ),
-              this,              SIGNAL( pluginSettingsChanged() ) );
-
-    d->m_timer = new QTimer( this );
-    d->m_timer->start( 200 );
-
-    connect( d->m_timer, SIGNAL( timeout() ),
-             this,       SIGNAL( timeout() ) );
-
     d->m_tileLoader = new TileLoader( d->m_downloadManager, this );
 
     d->m_texmapper = 0;
@@ -215,6 +201,21 @@
     connect( fileViewModel(), SIGNAL(layoutChanged()),
              d->m_gpsLayer, SLOT(clearModel() ) );
 
+    d->m_layerManager = new LayerManager( d->m_dataFacade, this );
+
+    // FIXME: more on the spot update names and API
+    connect ( d->m_layerManager,      SIGNAL( floatItemsChanged() ),
+              this,                   SIGNAL( modelChanged() ) );
+
+    connect ( d->m_layerManager, SIGNAL( pluginSettingsChanged() ),
+              this,              SIGNAL( pluginSettingsChanged() ) );
+
+    d->m_timer = new QTimer( this );
+    d->m_timer->start( 200 );
+
+    connect( d->m_timer, SIGNAL( timeout() ),
+             this,       SIGNAL( timeout() ) );
+
     d->m_dateTime       = new ExtDateTime();
     /* Assume we are dealing with the earth */
     d->m_planet = new Planet( "earth" );