diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2013-10-06 10:57:16 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2013-10-06 10:57:16 -0700 |
| commit | b3490213f42ed63bc4b05b37bcfc12809f2d432c (patch) | |
| tree | d56ede6f1ea8d20c2120eba2b9ca705927a77913 /qthelper.h | |
| parent | 92d8978ab4ad980397883b50d0e7bc81d2bf5f73 (diff) | |
| parent | 70352c3962cf3b4379590326cdc489ac0543f7e9 (diff) | |
| download | subsurface-b3490213f42ed63bc4b05b37bcfc12809f2d432c.tar.gz | |
Merge branch 'glib-removal-hack'
Fix obvious merge issue in Rules.mk
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qthelper.h')
| -rw-r--r-- | qthelper.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/qthelper.h b/qthelper.h index 3ac83b5c4..0ab184b78 100644 --- a/qthelper.h +++ b/qthelper.h @@ -29,10 +29,11 @@ public: void rmDC(QString m, uint32_t d); DiveComputerNode matchDC(QString m, uint32_t d); DiveComputerNode matchModel(QString m); - QMultiMap<QString, struct DiveComputerNode> dcMap; - QMultiMap<QString, struct DiveComputerNode> dcWorkingMap; + QMultiMap<QString, class DiveComputerNode> dcMap; + QMultiMap<QString, class DiveComputerNode> dcWorkingMap; }; QString weight_string(int weight_in_grams); +bool gpsHasChanged(struct dive* dive, struct dive *master, const QString &gps_text); #endif // QTHELPER_H |