Merge branch 'cmakeAndPreferences'

1 files changed, 0 insertions, 84 deletions

diff --git a/qt-ui/globe.h b/qt-ui/globe.h
deleted file mode 100644
index 8cc1265e4..000000000
--- a/qt-ui/globe.h
+++ /dev/null
@@ -1,84 +0,0 @@
-#ifndef GLOBE_H
-#define GLOBE_H
-
-#include <stdint.h>
-
-#ifndef NO_MARBLE
-#include <marble/MarbleWidget.h>
-#include <marble/GeoDataCoordinates.h>
-
-#include <QHash>
-
-namespace Marble{
-	class GeoDataDocument;
-}
-
-class KMessageWidget;
-using namespace Marble;
-struct dive;
-
-class GlobeGPS : public MarbleWidget {
-	Q_OBJECT
-public:
-	using MarbleWidget::centerOn;
-	static GlobeGPS *instance();
-	void reload();
-	bool eventFilter(QObject *, QEvent *);
-
-protected:
-	/* reimp */ void resizeEvent(QResizeEvent *event);
-	/* reimp */ void mousePressEvent(QMouseEvent *event);
-	/* reimp */ void contextMenuEvent(QContextMenuEvent *);
-
-private:
-	GeoDataDocument *loadedDives;
-	KMessageWidget *messageWidget;
-	QTimer *fixZoomTimer;
-	int currentZoomLevel;
-	bool needResetZoom;
-	bool editingDiveLocation;
-	bool doubleClick;
-	GlobeGPS(QWidget *parent = 0);
-
-signals:
-	void coordinatesChanged();
-
-public
-slots:
-	void repopulateLabels();
-	void changeDiveGeoPosition(qreal lon, qreal lat, GeoDataCoordinates::Unit);
-	void mouseClicked(qreal lon, qreal lat, GeoDataCoordinates::Unit);
-	void fixZoom(bool now = false);
-	void zoomOutForNoGPS();
-	void prepareForGetDiveCoordinates();
-	void endGetDiveCoordinates();
-	void centerOnDiveSite(struct dive_site *ds);
-	void centerOnIndex(const QModelIndex& idx);
-};
-
-#else // NO_MARBLE
-/* Dummy widget for when we don't have MarbleWidget */
-#include <QLabel>
-
-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);
-
-#endif // GLOBE_H