From 93d348fa592ecbd20d3ce1de1fade1ca4654a899 Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <dirk@hohndel.org>
Date: Sat, 11 Jul 2015 06:52:14 -0700
Subject: Globe: Remove workarounds for ancient Marble versions

We build against our own Marble, anyway. So this isn't needed anymore.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 qt-ui/globe.cpp | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/qt-ui/globe.cpp b/qt-ui/globe.cpp
index 41b250052..244edf672 100644
--- a/qt-ui/globe.cpp
+++ b/qt-ui/globe.cpp
@@ -18,21 +18,11 @@
 #include <marble/MapThemeManager.h>
 #include <marble/GeoDataStyle.h>
 #include <marble/GeoDataIconStyle.h>
+#include <marble/GeoDataTreeModel.h>
 
 #ifdef MARBLE_SUBSURFACE_BRANCH
 #include <marble/MarbleDebug.h>
 #endif
-#if INCOMPLETE_MARBLE
-#include "marble/GeoDataTreeModel.h"
-#else
-#include <marble/GeoDataTreeModel.h>
-#endif
-
-// as of Marble 4.10 (which has MARBLE_VERSION 0x001000) zoomView is
-// deprecated and has been replaced by setZoom with the same function signature
-#if MARBLE_VERSION < 0x001000
-#define setZoom zoomView
-#endif
 
 GlobeGPS::GlobeGPS(QWidget *parent) : MarbleWidget(parent),
 	loadedDives(0),
-- 
cgit v1.2.3-70-g09d2