diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2019-09-01 00:26:51 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-09-06 11:48:47 -0700 |
| commit | c5f355ee8bb44e7047e93583e4810ae574873e70 (patch) | |
| tree | 2fbf483097bed22013ddebc649dd6c690755b3b5 | |
| parent | 0c374af176f961c45fadb716af55789984d257b6 (diff) | |
| download | subsurface-c5f355ee8bb44e7047e93583e4810ae574873e70.tar.gz | |
Cleanup: remove default constructor from MapLocation
Since this is no longer a Q_METATYPE, nobody will try to
default construct this object. Remove the default constructor
and guarantee that there will be no null divesite.
Of course, the lack of default constructor means that the
default argument to the "selected" member variable should
be removed.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
| -rw-r--r-- | qt-models/maplocationmodel.cpp | 4 | ||||
| -rw-r--r-- | qt-models/maplocationmodel.h | 3 |
2 files changed, 1 insertions, 6 deletions
diff --git a/qt-models/maplocationmodel.cpp b/qt-models/maplocationmodel.cpp index 5ee55069c..1d1ae6c12 100644 --- a/qt-models/maplocationmodel.cpp +++ b/qt-models/maplocationmodel.cpp @@ -12,10 +12,6 @@ #define MIN_DISTANCE_BETWEEN_DIVE_SITES_M 50.0 -MapLocation::MapLocation() : divesite(nullptr), selected(false) -{ -} - MapLocation::MapLocation(struct dive_site *dsIn, QGeoCoordinate coordIn, QString nameIn, bool selectedIn) : divesite(dsIn), coordinate(coordIn), name(nameIn), selected(selectedIn) { diff --git a/qt-models/maplocationmodel.h b/qt-models/maplocationmodel.h index cb8252a3a..2aef697a2 100644 --- a/qt-models/maplocationmodel.h +++ b/qt-models/maplocationmodel.h @@ -13,7 +13,6 @@ class MapLocation { public: - explicit MapLocation(); explicit MapLocation(struct dive_site *ds, QGeoCoordinate coord, QString name, bool selected); QVariant getRole(int role) const; @@ -30,7 +29,7 @@ public: struct dive_site *divesite; QGeoCoordinate coordinate; QString name; - bool selected = false; + bool selected; }; class MapLocationModel : public QAbstractListModel |