From 4722104e1c762a01b521f0dce1b2cbb9bf76891e Mon Sep 17 00:00:00 2001 From: Lakshman Date: Wed, 2 Apr 2014 08:51:10 -0500 Subject: Add missing REMOVE slot Model derived from tableview is expected to have remove slot, which is missing in DivePlannerDisplay currently. This patch fixes the annoying warning message while starting Subsurface because of not including remove slot. Currently there is lot of work to do, that either requires modifying the model to skip 'remove' slot or find a way to make them inactive. Signed-off-by: Lakshman Anumolu Signed-off-by: Dirk Hohndel --- qt-ui/diveplanner.cpp | 11 +++++++++++ qt-ui/diveplanner.h | 5 +++++ 2 files changed, 16 insertions(+) (limited to 'qt-ui') diff --git a/qt-ui/diveplanner.cpp b/qt-ui/diveplanner.cpp index 135c21175..5c8973224 100644 --- a/qt-ui/diveplanner.cpp +++ b/qt-ui/diveplanner.cpp @@ -75,6 +75,8 @@ QVariant DivePlannerDisplay::data(const QModelIndex &index, int role) const } } else if (role == Qt::DecorationRole) { switch (index.column()) { + case REMOVE: + return QIcon(":trash"); } } else if (role == Qt::FontRole) { return defaultModelFont(); @@ -159,6 +161,15 @@ void DivePlannerDisplay::insertPoint(const struct computedPoint &p) computedPoints.append(p); } +void DivePlannerDisplay::remove(const QModelIndex &index) +{ + if (index.column() != REMOVE) + return; + + beginRemoveRows(QModelIndex(), index.row(), index.row()); + endRemoveRows(); +} + static DivePlannerPointsModel *plannerModel = DivePlannerPointsModel::instance(); DivePlannerGraphics::DivePlannerGraphics(QWidget *parent) : QGraphicsView(parent), diff --git a/qt-ui/diveplanner.h b/qt-ui/diveplanner.h index 84ac4a817..4d3f0cbaf 100644 --- a/qt-ui/diveplanner.h +++ b/qt-ui/diveplanner.h @@ -31,6 +31,7 @@ private: public: static DivePlannerDisplay *instance(); enum Sections { + REMOVE, COMPUTED_DEPTH, COMPUTED_DURATION, COLUMNS @@ -47,6 +48,10 @@ public: void removeStops(); void addStops(); void insertPoint(const struct computedPoint &p); + +public +slots: + void remove(const QModelIndex &index); }; class DivePlannerPointsModel : public QAbstractTableModel { -- cgit v1.2.3-70-g09d2