diff --git a/desktop-widgets/globe.cpp b/desktop-widgets/globe.cpp index 74053ec6e..ca143f901 100644 --- a/desktop-widgets/globe.cpp +++ b/desktop-widgets/globe.cpp @@ -395,38 +395,4 @@ void GlobeGPS::centerOnIndex(const QModelIndex& idx) else centerOnDiveSite(ds); } -#else - -GlobeGPS *GlobeGPS::instance() -{ - static GlobeGPS *self = new GlobeGPS(); - return self; -} - -GlobeGPS::GlobeGPS(QWidget *parent) -{ - setText("MARBLE DISABLED AT BUILD TIME"); -} -void GlobeGPS::repopulateLabels() -{ -} -void GlobeGPS::centerOnCurrentDive() -{ -} -bool GlobeGPS::eventFilter(QObject *obj, QEvent *ev) -{ - return QObject::eventFilter(obj, ev); -} -void GlobeGPS::prepareForGetDiveCoordinates() -{ -} -void GlobeGPS::endGetDiveCoordinates() -{ -} -void GlobeGPS::reload() -{ -} -void GlobeGPS::centerOnIndex(const QModelIndex& idx) -{ -} #endif diff --git a/desktop-widgets/globe.h b/desktop-widgets/globe.h index 39696fe23..d53c59721 100644 --- a/desktop-widgets/globe.h +++ b/desktop-widgets/globe.h @@ -57,27 +57,6 @@ slots: void centerOnIndex(const QModelIndex& idx); }; -#else // NO_MARBLE -/* Dummy widget for when we don't have MarbleWidget */ -#include - -class GlobeGPS : public QLabel { - Q_OBJECT -public: - GlobeGPS(QWidget *parent = 0); - static GlobeGPS *instance(); - void reload(); - void repopulateLabels(); - void centerOnDiveSite(uint32_t uuid); - void centerOnIndex(const QModelIndex& idx); - void centerOnCurrentDive(); - bool eventFilter(QObject *, QEvent *); -public -slots: - void prepareForGetDiveCoordinates(); - void endGetDiveCoordinates(); -}; - #endif // NO_MARBLE extern "C" double getDistance(int lat1, int lon1, int lat2, int lon2);