Move DivePlannerModel and CylinderModel to qt-models

Still trying to make it easier for the Mobile Port:
This patch is a bit bigger than I hopped, but it was the smallest that I
could get.

A lot of TODO items where added where I broke the code because the current
implementation would break the QML implementtion on the designer. I'll
most probably fix those myself when I finish the transition to the models
to the new folder.

I only moved both models at once because there's an interdependency
between them (seems inevitable, tough, but I'll take a better look at it
later).

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

1 files changed, 1 insertions, 42 deletions

diff --git a/qt-models/models.h b/qt-models/models.h
index 60b83cd95..2edf89269 100644
--- a/qt-models/models.h
+++ b/qt-models/models.h
@@ -12,6 +12,7 @@
 #include <QStringList>
 #include <QStringListModel>
 #include <QSortFilterProxyModel>
+#include <QPixmap>
 
 #include "metrics.h"
 
@@ -78,48 +79,6 @@ private:
 /* Retrieve the trash icon pixmap, common to most table models */
 const QPixmap &trashIcon();
 
-/* Encapsulation of the Cylinder Model, that presents the
- * Current cylinders that are used on a dive. */
-class CylindersModel : public CleanerTableModel {
-	Q_OBJECT
-public:
-	enum Column {
-		REMOVE,
-		TYPE,
-		SIZE,
-		WORKINGPRESS,
-		START,
-		END,
-		O2,
-		HE,
-		DEPTH,
-		USE,
-		COLUMNS
-	};
-
-	explicit CylindersModel(QObject *parent = 0);
-	static CylindersModel *instance();
-	/*reimp*/ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
-	/*reimp*/ int rowCount(const QModelIndex &parent = QModelIndex()) const;
-	/*reimp*/ Qt::ItemFlags flags(const QModelIndex &index) const;
-	/*reimp*/ bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
-
-	void passInData(const QModelIndex &index, const QVariant &value);
-	void add();
-	void clear();
-	void updateDive();
-	void copyFromDive(struct dive *d);
-	cylinder_t *cylinderAt(const QModelIndex &index);
-	bool changed;
-
-public
-slots:
-	void remove(const QModelIndex &index);
-
-private:
-	int rows;
-};
-
 /* Encapsulation of the Weight Model, that represents
  * the current weights on a dive. */
 class WeightModel : public CleanerTableModel {