diff options
author | Dirk Hohndel <dirk@hohndel.org> | 2015-09-23 14:18:40 -0700 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2015-09-23 14:18:40 -0700 |
commit | 6ee2a44235cd3cf391aec6d6a60098e19fd01e81 (patch) | |
tree | 6ffb0abae7092c10748a977ab5984850fbf72632 /qt-ui/maintab.h | |
parent | 148b30849abadef23fc20a0480964a1763f8104d (diff) | |
parent | 483320a0c094c57c5806fda39bd4a56d29ff7687 (diff) | |
download | subsurface-6ee2a44235cd3cf391aec6d6a60098e19fd01e81.tar.gz |
Merge branch 'NewLocationEditDropdown'
Diffstat (limited to 'qt-ui/maintab.h')
-rw-r--r-- | qt-ui/maintab.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/qt-ui/maintab.h b/qt-ui/maintab.h index 26dd3853e..502ea6910 100644 --- a/qt-ui/maintab.h +++ b/qt-ui/maintab.h @@ -22,7 +22,6 @@ class CylindersModel; class ExtraDataModel; class DivePictureModel; class QCompleter; -class LocationManagementEditHelper; struct Completers { QCompleter *divemaster; @@ -55,7 +54,6 @@ public: void refreshDisplayedDiveSite(); void nextInputField(QKeyEvent *event); void showAndTriggerEditSelective(struct dive_components what); - virtual bool eventFilter(QObject*, QEvent*); signals: void addDiveFinished(); @@ -69,7 +67,7 @@ slots: void updateDiveInfo(bool clear = false); void acceptChanges(); void rejectChanges(); - void on_location_editingFinished(); + void on_location_diveSiteSelected(); void on_location_textChanged(); void on_divemaster_textChanged(); void on_buddy_textChanged(); @@ -124,7 +122,6 @@ private: dive_trip_t *currentTrip; dive_trip_t displayedTrip; bool acceptingEdit; - LocationManagementEditHelper *locationManagementEditHelper; void updateDisplayedDiveSite(); void updateDiveSite(int divenr); }; |