summaryrefslogtreecommitdiffstats
path: root/qt-ui/divelistview.h
diff options
context:
space:
mode:
Diffstat (limited to 'qt-ui/divelistview.h')
-rw-r--r--qt-ui/divelistview.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/qt-ui/divelistview.h b/qt-ui/divelistview.h
index 3aee19128..1faa3613a 100644
--- a/qt-ui/divelistview.h
+++ b/qt-ui/divelistview.h
@@ -40,6 +40,8 @@ public slots:
void deleteDive();
void testSlot();
void fixMessyQtModelBehaviour();
+ void mergeTripAbove();
+ void mergeTripBelow();
signals:
void currentDiveChanged(int divenr);
@@ -50,6 +52,7 @@ private:
DiveTripModel::Layout currentLayout;
QLineEdit *searchBox;
QModelIndex contextMenuIndex;
+ void merge_trip(const QModelIndex &a, const int offset);
};
#endif // DIVELISTVIEW_H