mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

map: use value semantics for MapLocation

Browse source 
This makes memory management more simple, as not explicit deletion
is necessary.

A rather large commit, because changing QVector<> to std::vector<>
is propagated up the call chain.

Adds a new range_contains() helper function for collection
types such as std::vector<>. I didn't want to call it
contains(), since we already have a contains function
for strings and let's keep argument overloading simple.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-05-11 13:21:53 +02:00 • committed by bstoeger
parent e39dea3d68
commit 6b835710bc
17 changed files with 84 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

14
qt-models/maplocationmodel.h
View file

@ -3,8 +3,8 @@
#define MAPLOCATIONMODEL_H
#include "core/subsurface-qt/divelistnotifier.h"
#include <vector>
#include <QObject>
#include <QVector>
#include <QHash>
#include <QByteArray>
#include <QAbstractListModel>
@ -13,7 +13,7 @@
class MapLocation
{
public:
explicit MapLocation(struct dive_site *ds, QGeoCoordinate coord, QString name, bool selected);
MapLocation(struct dive_site *ds, QGeoCoordinate coord, QString name, bool selected);
QVariant getRole(int role) const;
@ -46,9 +46,9 @@ public:
// If map is not null, it will be used to place new dive sites without GPS location at the center of the map
void reload(QObject *map);
void selectionChanged();
void setSelected(const QVector<dive_site *> &divesites);
MapLocation *getMapLocation(const struct dive_site *ds);
const QVector<dive_site *> &selectedDs() const;
void setSelected(const std::vector<dive_site *> &divesites);
MapLocation *getMapLocation(const struct dive_site *ds); // Attention: not stable!
const std::vector<dive_site *> &selectedDs() const;
void setSelected(struct dive_site *ds);
protected:
@ -58,8 +58,8 @@ private slots:
void diveSiteChanged(struct dive_site *ds, int field);
private:
QVector<MapLocation *> m_mapLocations;
QVector<dive_site *> m_selectedDs;
std::vector<MapLocation> m_mapLocations;
std::vector<dive_site *> m_selectedDs;
};
#endif