summaryrefslogtreecommitdiffstats
path: root/qt-ui/diveplanner.h
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2013-11-01 11:19:23 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2013-11-01 11:19:23 -0700
commit9e635392373cdc56fb3a897ea491e7c33fdbd424 (patch)
treef774d955632b301428088365d41abe62badfdd26 /qt-ui/diveplanner.h
parent1a4d098ef2062923bbe09538cc01c1d130989640 (diff)
parent0e96c9f62e3a7030d9208f32e59390cb3fd20bbe (diff)
downloadsubsurface-9e635392373cdc56fb3a897ea491e7c33fdbd424.tar.gz
Merge branch 'editMode' of github.com:tcanabrava/subsurface
Diffstat (limited to 'qt-ui/diveplanner.h')
-rw-r--r--qt-ui/diveplanner.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/qt-ui/diveplanner.h b/qt-ui/diveplanner.h
index acb36e63e..6883f62eb 100644
--- a/qt-ui/diveplanner.h
+++ b/qt-ui/diveplanner.h
@@ -54,7 +54,8 @@ public slots:
void cancelPlan();
void createTemporaryPlan();
void deleteTemporaryPlan();
-
+ void loadFromDive(dive* d);
+ void undoEdition();
signals:
void planCreated();
void planCanceled();
@@ -66,6 +67,7 @@ private:
QVector<divedatapoint> divepoints;
struct dive *tempDive;
void deleteTemporaryPlan(struct divedatapoint *dp);
+ QVector<sample> backupSamples; // For editing added dives.
};
class Button : public QObject, public QGraphicsRectItem {