From 3efafd1fde504a1e3ccd104fe53941a511ae3e09 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Fri, 31 Jul 2015 11:01:16 -0700 Subject: Enable building with NO_MARBLE again This was broken in commit 7efa92406794 ("Transform GlobeGPS in a static instance() class"). Signed-off-by: Dirk Hohndel --- qt-ui/globe.cpp | 6 ++++++ qt-ui/globe.h | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'qt-ui') diff --git a/qt-ui/globe.cpp b/qt-ui/globe.cpp index 4f40e22ec..aceeed9ab 100644 --- a/qt-ui/globe.cpp +++ b/qt-ui/globe.cpp @@ -390,6 +390,12 @@ void GlobeGPS::centerOnIndex(const QModelIndex& idx) } #else +GlobeGPS *GlobeGPS::instance() +{ + static GlobeGPS *self = new GlobeGPS(); + return self; +} + GlobeGPS::GlobeGPS(QWidget *parent) { setText("MARBLE DISABLED AT BUILD TIME"); diff --git a/qt-ui/globe.h b/qt-ui/globe.h index a8cb89440..8cc1265e4 100644 --- a/qt-ui/globe.h +++ b/qt-ui/globe.h @@ -63,7 +63,8 @@ slots: class GlobeGPS : public QLabel { Q_OBJECT public: - GlobeGPS(QWidget *parent); + GlobeGPS(QWidget *parent = 0); + static GlobeGPS *instance(); void reload(); void repopulateLabels(); void centerOnDiveSite(uint32_t uuid); -- cgit v1.2.3-70-g09d2