undo: autogenerate string get() and data() functions using a template

Do this in analogy to other types. However, here we have to convert
from / to QString. We could do this in an even more general way
by using two templat parameters: one for the Qt type, one for the
core type and define conversion functions. However, let's not do
this for now.

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

1 files changed, 14 insertions, 8 deletions

diff --git a/commands/command_edit.h b/commands/command_edit.h
index 073853254..e10934704 100644
--- a/commands/command_edit.h
+++ b/commands/command_edit.h
@@ -84,19 +84,25 @@ private:
 	T data(struct dive *d) const override final;	// final prevents further overriding - then just don't use this template
 };
 
-class EditNotes : public EditTemplate<QString, DiveField::NOTES> {
+// Automatically generate getter and setter in the case for string assignments.
+// The third parameter is a pointer to a C-style string in the dive structure.
+template <DiveField::Flags ID, char *dive::*PTR>
+class EditStringSetter : public EditTemplate<QString, ID> {
+private:
+	using EditTemplate<QString, ID>::EditTemplate;
+	void set(struct dive *d, QString) const override final;	// final prevents further overriding - then just don't use this template
+	QString data(struct dive *d) const override final;	// final prevents further overriding - then just don't use this template
+};
+
+class EditNotes : public EditStringSetter<DiveField::NOTES, &dive::notes> {
 public:
-	using EditTemplate::EditTemplate;	// Use constructor of base class.
-	void set(struct dive *d, QString s) const override;
-	QString data(struct dive *d) const override;
+	using EditStringSetter::EditStringSetter;	// Use constructor of base class.
 	QString fieldName() const override;
 };
 
-class EditSuit : public EditTemplate<QString, DiveField::SUIT> {
+class EditSuit : public EditStringSetter<DiveField::SUIT, &dive::suit> {
 public:
-	using EditTemplate::EditTemplate;	// Use constructor of base class.
-	void set(struct dive *d, QString s) const override;
-	QString data(struct dive *d) const override;
+	using EditStringSetter::EditStringSetter;	// Use constructor of base class.
 	QString fieldName() const override;
 };