diff options
author | Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2019-03-13 19:42:52 +0100 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2019-04-12 18:19:07 +0300 |
commit | 0fd85832b7f628d1bb6d308c11b5e53ea1e9f65b (patch) | |
tree | f4d3aa47bcca46a43cdd205dd4eb1ab32950deab | |
parent | f022a4a4d0d3c0c022b6ce2b7b11c0ff9bf8089d (diff) | |
download | subsurface-0fd85832b7f628d1bb6d308c11b5e53ea1e9f65b.tar.gz |
Dive site: remove implicit deletion of empty dive sites
There was a way of deleting dive sites by clearing all fields.
This is not necessary anymore, as now the user can delete a
dive site in the dive site list.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
-rw-r--r-- | desktop-widgets/locationinformation.cpp | 5 | ||||
-rw-r--r-- | qt-models/divelocationmodel.cpp | 13 | ||||
-rw-r--r-- | qt-models/divelocationmodel.h | 1 |
3 files changed, 0 insertions, 19 deletions
diff --git a/desktop-widgets/locationinformation.cpp b/desktop-widgets/locationinformation.cpp index d827f5006..0da3e12ee 100644 --- a/desktop-widgets/locationinformation.cpp +++ b/desktop-widgets/locationinformation.cpp @@ -212,11 +212,6 @@ void LocationInformationWidget::acceptChanges() if (!ui.diveSiteCoordinates->text().isEmpty()) parseGpsText(ui.diveSiteCoordinates->text(), diveSite->location); - if (dive_site_is_empty(diveSite)) { - LocationInformationModel::instance()->removeRow(get_divesite_idx(diveSite, &dive_site_table)); - displayed_dive.dive_site = nullptr; - diveSite = nullptr; - } mark_divelist_changed(true); resetState(); } diff --git a/qt-models/divelocationmodel.cpp b/qt-models/divelocationmodel.cpp index c64d1990a..ae3baf9df 100644 --- a/qt-models/divelocationmodel.cpp +++ b/qt-models/divelocationmodel.cpp @@ -136,19 +136,6 @@ void LocationInformationModel::update() endResetModel(); } -bool LocationInformationModel::removeRows(int row, int, const QModelIndex&) -{ - if(row >= rowCount()) - return false; - - beginRemoveRows(QModelIndex(), row, row); - struct dive_site *ds = get_dive_site(row, &dive_site_table); - if (ds) - delete_dive_site(ds, &dive_site_table); - endRemoveRows(); - return true; -} - void LocationInformationModel::diveSiteDiveCountChanged(dive_site *ds) { int idx = get_divesite_idx(ds, &dive_site_table); diff --git a/qt-models/divelocationmodel.h b/qt-models/divelocationmodel.h index 4fd7b3d36..a7743f9c9 100644 --- a/qt-models/divelocationmodel.h +++ b/qt-models/divelocationmodel.h @@ -26,7 +26,6 @@ public: int columnCount(const QModelIndex &parent) const; int rowCount(const QModelIndex &parent = QModelIndex()) const; QVariant data(const QModelIndex &index = QModelIndex(), int role = Qt::DisplayRole) const; - bool removeRows(int row, int count, const QModelIndex & parent = QModelIndex()); QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; Qt::ItemFlags flags(const QModelIndex &index) const override; |