mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
globe.cpp/h: remove the dummy QLabel based widget
If NO_MARBLE is defined don't create a dummy replacement widget in the GlobeGPS class. At this point all cases of NO_MARBLE are covered by the MapWidget solution. Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
This commit is contained in:
parent
ab7d6a73d4
commit
a8af2f5548
2 changed files with 0 additions and 55 deletions
|
@ -395,38 +395,4 @@ void GlobeGPS::centerOnIndex(const QModelIndex& idx)
|
||||||
else
|
else
|
||||||
centerOnDiveSite(ds);
|
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
|
#endif
|
||||||
|
|
|
@ -57,27 +57,6 @@ slots:
|
||||||
void centerOnIndex(const QModelIndex& idx);
|
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
|
#endif // NO_MARBLE
|
||||||
|
|
||||||
extern "C" double getDistance(int lat1, int lon1, int lat2, int lon2);
|
extern "C" double getDistance(int lat1, int lon1, int lat2, int lon2);
|
||||||
|
|
Loading…
Add table
Reference in a new issue