[Digikam-devel] Re: libkmap && KDE 4.6 beta2

[Michael G. Hansen]

On 12/09/2010 12:19 AM, Martin Klapetek wrote:
> Hi,
>
> I'd just like to inform you, that libkmap from kdereview/ does not compile
> anymore with the newest KDE 4.6 beta2 (4.5.85) because of some Marble stuff.

I fixed this in commit 1205859. I those of you with an earlier version 
of Marble encounter problems, try the fix indicated in the code and let 
me know!

Michael


SVN commit 1205859 by mghansen:

Adapt to Marble API change. Not sure the version number for the if is 
correct, though.



  M  +14 -0     backend-marble.cpp


--- 
branches/extragear/graphics/digikam/3rdparty/libkmap/libkmap/backend-marble.cpp 
#1205858:1205859
@@ -153,7 +153,14 @@
  #ifdef KMAP_MARBLE_ADD_LAYER
      d->marbleWidget = new Marble::MarbleWidget();
      d->bmLayer = new BMLayer(this);
+
+    /// @todo I am not sure this is the exact version where this was 
changed. If the build fails with the version you have, use the else-part 
of this.
+#if MARBLE_VERSION>=0x000b00
+    d->marbleWidget->map()->addLayer(d->bmLayer);
+#else
      d->marbleWidget->model()->addLayer(d->bmLayer);
+#endif
+
  #else
      d->marbleWidget = new BMWidget(this);
  #endif
@@ -176,7 +183,14 @@
      if (d->marbleWidget)
      {
  #ifdef KMAP_MARBLE_ADD_LAYER
+
+    /// @todo I am not sure this is the exact version where this was 
changed. If the build fails with the version you have, use the else-part 
of this.
+#if MARBLE_VERSION>=0x000b00
+        d->marbleWidget->map()->removeLayer(d->bmLayer);
+#else
          d->marbleWidget->model()->removeLayer(d->bmLayer);
+#endif
+
          delete d->bmLayer;
  #endif
          delete d->marbleWidget;