Merge branch 'multiDiveEdition' of https://github.com/tcanabrava/subsurface

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

Conflicts:
	qt-ui/maintab.h

1 files changed, 3 insertions, 3 deletions

diff --git a/qt-ui/maintab.h b/qt-ui/maintab.h
index c423bc619..f9f65a3ff 100644
--- a/qt-ui/maintab.h
+++ b/qt-ui/maintab.h
@@ -9,11 +9,12 @@
 
 #include <QTabWidget>
 #include <QDialog>
+#include <QMap>
 
 #include "models.h"
 
 class QCompleter;
-
+struct dive;
 namespace Ui
 {
 	class MainTab;
@@ -68,8 +69,7 @@ private:
 	Ui::MainTab *ui;
 	WeightModel *weightModel;
 	CylindersModel *cylindersModel;
-	NotesBackup notesBackup;
-	struct dive* currentDive;
+	QMap<dive*, NotesBackup> notesBackup;
 	enum { NONE, DIVE, TRIP } editMode;
 	Completers completers;
 	void enableEdition();