diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2015-11-07 22:16:30 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2015-11-07 22:26:33 -0800 |
| commit | 440423ff6476119e090798ae2d59dc59d5253a0a (patch) | |
| tree | 5a8c32678056583e0cc7cd06682bc123d0584e33 /qt-models/divelocationmodel.cpp | |
| parent | bfe24526d35c47c1229a0711882d4e789fb46731 (diff) | |
| parent | 829f7a2ee264b4e25e8ea926a98199f8049a23d6 (diff) | |
| download | subsurface-440423ff6476119e090798ae2d59dc59d5253a0a.tar.gz | |
Merge branch 'warnings' of github.com:neolit123/subsurface
Diffstat (limited to 'qt-models/divelocationmodel.cpp')
| -rw-r--r-- | qt-models/divelocationmodel.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/qt-models/divelocationmodel.cpp b/qt-models/divelocationmodel.cpp index e7c9aa30d..d185de1fe 100644 --- a/qt-models/divelocationmodel.cpp +++ b/qt-models/divelocationmodel.cpp @@ -128,7 +128,7 @@ void LocationInformationModel::update() endResetModel(); } -int32_t LocationInformationModel::addDiveSite(const QString& name, timestamp_t divetime, int lon, int lat) +uint32_t LocationInformationModel::addDiveSite(const QString& name, timestamp_t divetime, int lon, int lat) { degrees_t latitude, longitude; latitude.udeg = lat; @@ -189,10 +189,10 @@ bool filter_same_gps_cb (QAbstractItemModel *model, int sourceRow, const QModelI { int ref_lat = displayed_dive_site.latitude.udeg; int ref_lon = displayed_dive_site.longitude.udeg; - int ref_uuid = displayed_dive_site.uuid; + uint32_t ref_uuid = displayed_dive_site.uuid; QSortFilterProxyModel *self = (QSortFilterProxyModel*) model; - int ds_uuid = self->sourceModel()->index(sourceRow, LocationInformationModel::UUID, parent).data().toInt(); + uint32_t ds_uuid = self->sourceModel()->index(sourceRow, LocationInformationModel::UUID, parent).data().toUInt(); struct dive_site *ds = get_dive_site_by_uuid(ds_uuid); if (!ds) @@ -202,4 +202,4 @@ bool filter_same_gps_cb (QAbstractItemModel *model, int sourceRow, const QModelI return false; return (ds->latitude.udeg == ref_lat && ds->longitude.udeg == ref_lon && ds->uuid != ref_uuid); -}
\ No newline at end of file +} |