Merge branch 'qtHelper'

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

1 files changed, 11 insertions, 7 deletions

diff --git a/qt-ui/models.h b/qt-ui/models.h
index 30d4b3a17..35ed529e3 100644
--- a/qt-ui/models.h
+++ b/qt-ui/models.h
@@ -13,6 +13,7 @@
 
 #include "../dive.h"
 #include "../divelist.h"
+#include "../qthelper.h"
 
 QFont defaultModelFont();
 
@@ -181,19 +182,22 @@ class DiveComputerModel : public QAbstractTableModel
 	Q_OBJECT
 public:
 	enum {REMOVE, MODEL, ID, NICKNAME, COLUMNS};
-    explicit DiveComputerModel(QObject* parent = 0);
-    virtual QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
-    virtual int columnCount(const QModelIndex& parent = QModelIndex()) const;
-    virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
-    virtual int rowCount(const QModelIndex& parent = QModelIndex()) const;
-    virtual Qt::ItemFlags flags(const QModelIndex& index) const;
-    virtual bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole);
+	DiveComputerModel(QMultiMap<QString, DiveComputerNode> &dcMap, QObject *parent = 0);
+	virtual QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
+	virtual int columnCount(const QModelIndex& parent = QModelIndex()) const;
+	virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
+	virtual int rowCount(const QModelIndex& parent = QModelIndex()) const;
+	virtual Qt::ItemFlags flags(const QModelIndex& index) const;
+	virtual bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole);
 	void update();
+	void keepWorkingList();
+	void dropWorkingList();
 
 public slots:
 	void remove(const QModelIndex& index);
 private:
 	int numRows;
+	QMultiMap<QString, DiveComputerNode> dcWorkingMap;
 };
 
 class YearlyStatisticsModel : public TreeModel {