summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/dive.h10
-rw-r--r--core/divesite.h1
2 files changed, 3 insertions, 8 deletions
diff --git a/core/dive.h b/core/dive.h
index 517c18c8b..d3101cc83 100644
--- a/core/dive.h
+++ b/core/dive.h
@@ -436,15 +436,11 @@ extern void update_setpoint_events(const struct dive *dive, struct divecomputer
#ifdef __cplusplus
}
-/* Make pointers to dive, dive_trip, dive_table, trip_table and dive_site_table
- * "Qt metatypes" so that they can be passed through QVariants and through QML.
- * Note: we have to use the typedef "dive_table_t" instead of "struct dive_table",
- * because MOC removes the "struct", but dive_table is already the name of a global
- * variable, leading to compilation errors. Likewise for "struct trip_table" and
- * "struct dive_site_table" (defined in "dive.h" and "divesite.h"). */
+/* Make pointers to dive and dive_trip "Qt metatypes" so that they can be passed through
+ * QVariants and through QML.
+ */
#include <QObject>
Q_DECLARE_METATYPE(struct dive *);
-Q_DECLARE_METATYPE(dive_table_t *);
#endif
diff --git a/core/divesite.h b/core/divesite.h
index e5ef4d1b4..d6ec4e51d 100644
--- a/core/divesite.h
+++ b/core/divesite.h
@@ -81,7 +81,6 @@ QString constructLocationTags(struct taxonomy_data *taxonomy, bool for_maintab);
/* Make pointer-to-dive_site a "Qt metatype" so that we can pass it through QVariants */
Q_DECLARE_METATYPE(dive_site *);
-Q_DECLARE_METATYPE(dive_site_table_t *);
#endif