diff options
| -rw-r--r-- | core/dive.c | 4 | ||||
| -rw-r--r-- | core/dive.h | 2 | ||||
| -rw-r--r-- | qt-models/filtermodels.cpp | 8 | ||||
| -rw-r--r-- | qt-models/filtermodels.h | 12 |
4 files changed, 14 insertions, 12 deletions
diff --git a/core/dive.c b/core/dive.c index da4b19346..482ba585b 100644 --- a/core/dive.c +++ b/core/dive.c @@ -4202,9 +4202,9 @@ const char *get_dive_country(struct dive *dive) return NULL; } -char *get_dive_location(struct dive *dive) +const char *get_dive_location(const struct dive *dive) { - struct dive_site *ds = get_dive_site_by_uuid(dive->dive_site_uuid); + const struct dive_site *ds = get_dive_site_by_uuid(dive->dive_site_uuid); if (ds && ds->name) return ds->name; return NULL; diff --git a/core/dive.h b/core/dive.h index 98ac06fdc..01ec1fd3d 100644 --- a/core/dive.h +++ b/core/dive.h @@ -444,7 +444,7 @@ extern struct dive *get_dive(int nr); extern struct dive *get_dive_from_table(int nr, struct dive_table *dt); extern struct dive_site *get_dive_site_for_dive(struct dive *dive); extern const char *get_dive_country(struct dive *dive); -extern char *get_dive_location(struct dive *dive); +extern const char *get_dive_location(const struct dive *dive); extern unsigned int number_of_computers(struct dive *dive); extern struct divecomputer *get_dive_dc(struct dive *dive, int nr); extern timestamp_t dive_endtime(const struct dive *dive); diff --git a/qt-models/filtermodels.cpp b/qt-models/filtermodels.cpp index bd95e0ad9..6e5605654 100644 --- a/qt-models/filtermodels.cpp +++ b/qt-models/filtermodels.cpp @@ -132,7 +132,7 @@ int SuitsFilterModel::countDives(const char *s) const return count_dives_with_suit(s); } -bool SuitsFilterModel::doFilter(dive *d) const +bool SuitsFilterModel::doFilter(const dive *d) const { // rowCount() == 0 should never happen, because we have the "no suits" row // let's handle it gracefully anyway. @@ -196,7 +196,7 @@ void TagFilterModel::repopulate() updateList(list); } -bool TagFilterModel::doFilter(dive *d) const +bool TagFilterModel::doFilter(const dive *d) const { // If there's nothing checked, this should show everything // rowCount() == 0 should never happen, because we have the "no tags" row @@ -234,7 +234,7 @@ int BuddyFilterModel::countDives(const char *s) const return count_dives_with_person(s); } -bool BuddyFilterModel::doFilter(dive *d) const +bool BuddyFilterModel::doFilter(const dive *d) const { // If there's nothing checked, this should show everything // rowCount() == 0 should never happen, because we have the "no tags" row @@ -289,7 +289,7 @@ int LocationFilterModel::countDives(const char *s) const return count_dives_with_location(s); } -bool LocationFilterModel::doFilter(struct dive *d) const +bool LocationFilterModel::doFilter(const dive *d) const { // rowCount() == 0 should never happen, because we have the "no location" row // let's handle it gracefully anyway. diff --git a/qt-models/filtermodels.h b/qt-models/filtermodels.h index 2ccfec010..0c35f2612 100644 --- a/qt-models/filtermodels.h +++ b/qt-models/filtermodels.h @@ -7,10 +7,12 @@ #include <stdint.h> #include <vector> +struct dive; + class FilterModelBase : public QStringListModel { Q_OBJECT public: - virtual bool doFilter(struct dive *d) const = 0; + virtual bool doFilter(const dive *d) const = 0; void clearFilter(); void selectAll(); void invertSelection(); @@ -34,7 +36,7 @@ class TagFilterModel : public FilterModelBase { Q_OBJECT public: static TagFilterModel *instance(); - bool doFilter(struct dive *d) const; + bool doFilter(const dive *d) const; public slots: void repopulate(); @@ -48,7 +50,7 @@ class BuddyFilterModel : public FilterModelBase { Q_OBJECT public: static BuddyFilterModel *instance(); - bool doFilter(struct dive *d) const; + bool doFilter(const dive *d) const; public slots: void repopulate(); @@ -62,7 +64,7 @@ class LocationFilterModel : public FilterModelBase { Q_OBJECT public: static LocationFilterModel *instance(); - bool doFilter(struct dive *d) const; + bool doFilter(const dive *d) const; public slots: void repopulate(); @@ -78,7 +80,7 @@ class SuitsFilterModel : public FilterModelBase { Q_OBJECT public: static SuitsFilterModel *instance(); - bool doFilter(struct dive *d) const; + bool doFilter(const dive *d) const; public slots: void repopulate(); |