Mobile: return dive-id directly from DiveListModel

We don't want to generate a DiveObjectHelper numerous times for
every item in the dive list. Therefore, return this datum directly
from the model. In this case, don't remove from DiveObjectHelper,
as this datum might be used by grantlee templates.

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

mobile-widgets/qml/DiveList.qml

@@ -229,11 +229,11 @@ Kirigami.ScrollablePage {
 							copyButtonVisible = false
 							pasteButtonVisible = false
 							timer.stop()
-							manager.copyDiveData(dive.id)
+							manager.copyDiveData(id)
 						}
 						onPressAndHold: {
 								globalDrawer.close()
-								manager.copyDiveData(dive.id)
+								manager.copyDiveData(id)
 								pageStack.push(settingsCopyWindow)
 						}
 					}
@@ -270,7 +270,7 @@ Kirigami.ScrollablePage {
 							copyButtonVisible = false
 							pasteButtonVisible = false
 							timer.stop()
-							manager.pasteDiveData(dive.id)
+							manager.pasteDiveData(id)
 						}
 					}
 				}
@@ -307,7 +307,7 @@ Kirigami.ScrollablePage {
 							copyButtonVisible = false
 							pasteButtonVisible = false
 							timer.stop()
-							manager.deleteDive(dive.id)
+							manager.deleteDive(id)
 						}
 					}
 				}

qt-models/divelistmodel.cpp

@@ -254,6 +254,7 @@ QVariant DiveListModel::data(const QModelIndex &index, int role) const
 		return QStringLiteral("%1 %2").arg(localTime.date().toString(prefs.date_format_short),
 						   localTime.time().toString(prefs.time_format));
 		}
+	case IdRole: return d->id;
 	}
 	return QVariant();
 }
@@ -266,6 +267,7 @@ QHash<int, QByteArray> DiveListModel::roleNames() const
 	roles[TripIdRole] = "tripId";
 	roles[TripNrDivesRole] = "tripNrDives";
 	roles[DateTimeRole] = "dateTime";
+	roles[IdRole] = "id";
 	return roles;
 }
 

qt-models/divelistmodel.h

@@ -40,7 +40,8 @@ public:
 		DiveDateRole,
 		TripIdRole,
 		TripNrDivesRole,
-		DateTimeRole
+		DateTimeRole,
+		IdRole
 	};
 
 	static DiveListModel *instance();