Desktop: don't connect to remove() slot of model from TableModel

When connecting a model to the TableModel class, it would connect
clicking on an item to the remove() slot of the model.

This breaks the program flow implied by the undo code:
Ui --> Undo-Command --> Model --> UI

Moreover, the naming of the remove() slot is illogical, because
clicks can also have different effects, as for example in the
cylinder-table.

Therefore, move the connect() call from TableModel to the
callers. In the case of TabDiveSite, move the remove() function
from the model to the TabWidget, where it makes more sense.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>

2 files changed, 0 insertions, 25 deletions

diff --git a/qt-models/divelocationmodel.cpp b/qt-models/divelocationmodel.cpp
index f68209a7e..0be755fd2 100644
--- a/qt-models/divelocationmodel.cpp
+++ b/qt-models/divelocationmodel.cpp
@@ -7,9 +7,7 @@
 #include "core/metrics.h"
 #ifndef SUBSURFACE_MOBILE
 #include "cleanertablemodel.h" // for trashIcon() and editIcon()
-#include "desktop-widgets/mainwindow.h" // to place message box
 #include "commands/command.h"
-#include <QMessageBox>
 #endif
 #include <QLineEdit>
 #include <QIcon>
@@ -262,27 +260,6 @@ bool DiveSiteSortedModel::setData(const QModelIndex &index, const QVariant &valu
 	}
 }
 
-// TODO: Remove or edit. It doesn't make sense to call the model here, which calls the undo command,
-// which in turn calls the model.
-void DiveSiteSortedModel::remove(const QModelIndex &index)
-{
-	struct dive_site *ds = getDiveSite(index);
-	if (!ds)
-		return;
-	switch (index.column()) {
-	case LocationInformationModel::EDIT:
-		MainWindow::instance()->editDiveSite(ds);
-		break;
-	case LocationInformationModel::REMOVE:
-		if (ds->dives.nr > 0 &&
-		    QMessageBox::warning(MainWindow::instance(), tr("Delete dive site?"),
-					 tr("This dive site has %n dive(s). Do you really want to delete it?\n", "", ds->dives.nr),
-					 QMessageBox::Yes|QMessageBox::No) == QMessageBox::No)
-				return;
-		Command::deleteDiveSites(QVector<dive_site *>{ds});
-		break;
-	}
-}
 #endif // SUBSURFACE_MOBILE
 
 void DiveSiteSortedModel::setFilter(const QString &text)
diff --git a/qt-models/divelocationmodel.h b/qt-models/divelocationmodel.h
index a42354737..661debc53 100644
--- a/qt-models/divelocationmodel.h
+++ b/qt-models/divelocationmodel.h
@@ -46,8 +46,6 @@ private:
 	QString fullText;
 #ifndef SUBSURFACE_MOBILE
 	bool setData(const QModelIndex &index, const QVariant &value, int role) override;
-public slots:
-	void remove(const QModelIndex &index);
 #endif // SUBSURFACE_MOBILE
 public:
 	DiveSiteSortedModel();