diff options
| author |  Lubomir I. Ivanov <neolit123@gmail.com> | 2015-11-07 22:56:55 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2015-11-07 22:26:32 -0800 |
| commit | 9b20a5bd4feb39574d5d82324dadbc9308cd85e3 (patch) | |
| tree | af253704458faebfaf1a1ec39b6f7b5eee108cd9 /qt-models | |
| parent | aee6f0b2c4131ec65c1e1688eb9648d66c0bd506 (diff) | |
| download | subsurface-9b20a5bd4feb39574d5d82324dadbc9308cd85e3.tar.gz | |
divelocationmodel: fix some signed/unsigned warnings
Use uint32_t for divesite UUIDs.
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Diffstat (limited to 'qt-models')
| -rw-r--r-- | qt-models/divelocationmodel.cpp | 8 | ||||
| -rw-r--r-- | qt-models/divelocationmodel.h | 2 |
2 files changed, 5 insertions, 5 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 +} diff --git a/qt-models/divelocationmodel.h b/qt-models/divelocationmodel.h index d5b8705ce..f3e9cac1f 100644 --- a/qt-models/divelocationmodel.h +++ b/qt-models/divelocationmodel.h @@ -22,7 +22,7 @@ public: int columnCount(const QModelIndex &parent) const; int rowCount(const QModelIndex &parent = QModelIndex()) const; QVariant data(const QModelIndex &index = QModelIndex(), int role = Qt::DisplayRole) const; - int32_t addDiveSite(const QString& name, timestamp_t divetime, int lat = 0, int lon = 0); + uint32_t addDiveSite(const QString& name, timestamp_t divetime, int lat = 0, int lon = 0); bool setData(const QModelIndex &index, const QVariant &value, int role); bool removeRows(int row, int count, const QModelIndex & parent = QModelIndex()); void setFirstRowTextField(QLineEdit *textField); |