summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedrich W. H. Kossebau <kossebau@kde.org>2016-09-18 23:56:37 (GMT)
committerFriedrich W. H. Kossebau <kossebau@kde.org>2016-09-18 23:56:37 (GMT)
commit41a46ee8003891977794625c6040710dc384d896 (patch)
tree2066561b2636300a16e1156bcfc0273a2f253c34
parent099e160c8a4840c3ef6134a5ef9265ea5b7398b3 (diff)
Remove code variants for outdated Qt4 Marble versions
-rw-r--r--src/backends/backendmarble.cpp28
1 files changed, 0 insertions, 28 deletions
diff --git a/src/backends/backendmarble.cpp b/src/backends/backendmarble.cpp
index 93173d4..15bcd59 100644
--- a/src/backends/backendmarble.cpp
+++ b/src/backends/backendmarble.cpp
@@ -189,14 +189,7 @@ BackendMarble::~BackendMarble()
if (d->marbleWidget)
{
#ifdef KGEOMAP_MARBLE_ADD_LAYER
-
-#if MARBLE_VERSION>=0x000c00
d->marbleWidget->removeLayer(d->bmLayer);
-#elif MARBLE_VERSION>=0x000b00
- d->marbleWidget->map()->removeLayer(d->bmLayer);
-#else
- d->marbleWidget->model()->removeLayer(d->bmLayer);
-#endif
delete d->bmLayer;
#endif
@@ -239,14 +232,7 @@ QWidget* BackendMarble::mapWidget()
d->marbleWidget = new Marble::MarbleWidget();
d->bmLayer = new BackendMarbleLayer(this);
-#if MARBLE_VERSION>=0x000c00
d->marbleWidget->addLayer(d->bmLayer);
-#elif MARBLE_VERSION>=0x000b00
- d->marbleWidget->map()->addLayer(d->bmLayer);
-#else
- d->marbleWidget->model()->addLayer(d->bmLayer);
-#endif
-
#else
d->marbleWidget = new BMWidget(this);
#endif
@@ -665,9 +651,6 @@ void BackendMarble::marbleCustomPaint(Marble::GeoPainter* painter)
}
painter->save();
-#if MARBLE_VERSION < 0x000f14
- painter->autoMapQuality();
-#endif
if (s->trackManager)
{
@@ -1109,11 +1092,7 @@ GeoCoordinates::PairList BackendMarble::getNormalizedBounds()
return GeoCoordinates::PairList();
}
-#if MARBLE_VERSION < 0x000b00
- const Marble::GeoDataLatLonAltBox marbleBounds = d->marbleWidget->map()->viewParams()->viewport()->viewLatLonAltBox();
-#else
const Marble::GeoDataLatLonAltBox marbleBounds = d->marbleWidget->viewport()->viewLatLonAltBox();
-#endif
// qCDebug(LIBKGEOMAP_LOG)<<marbleBounds.toString(GeoDataCoordinates::Degree);
const GeoCoordinates::Pair boundsPair = GeoCoordinates::makePair(
@@ -1771,14 +1750,7 @@ void BackendMarble::drawSearchRectangle(Marble::GeoPainter* const painter, const
Marble::GeoDataCoordinates coordBottomRight(lonEast, latSouth, 0, Marble::GeoDataCoordinates::Degree);
Marble::GeoDataLinearRing polyRing;
-#if MARBLE_VERSION < 0x000800
- polyRing.append(&coordTopLeft);
- polyRing.append(&coordTopRight);
- polyRing.append(&coordBottomRight);
- polyRing.append(&coordBottomLeft);
-#else // MARBLE_VERSION < 0x000800
polyRing << coordTopLeft << coordTopRight << coordBottomRight << coordBottomLeft;
-#endif // MARBLE_VERSION < 0x000800
QPen selectionPen;