summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Lubomir I. Ivanov <neolit123@gmail.com>2014-03-18 20:26:29 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2014-03-18 11:56:06 -0700
commit6d6721dc9b622fda17b0c2c08e7d646b7e2044e1 (patch)
tree6751e1a9a7621214185c6abf9268d52d24025bb4
parenta90818671693fd87f7d76c59a68fe1e3262fc32c (diff)
downloadsubsurface-6d6721dc9b622fda17b0c2c08e7d646b7e2044e1.tar.gz
Profile2: use unsigned int for the divecomputer number
display.h: dc_number is unsigned int, thus a couple of warnings may pop-out. Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--qt-ui/profile/diveplotdatamodel.cpp2
-rw-r--r--qt-ui/profile/diveplotdatamodel.h4
-rw-r--r--qt-ui/profile/profilewidget2.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/qt-ui/profile/diveplotdatamodel.cpp b/qt-ui/profile/diveplotdatamodel.cpp
index 755dd9264..2a183a671 100644
--- a/qt-ui/profile/diveplotdatamodel.cpp
+++ b/qt-ui/profile/diveplotdatamodel.cpp
@@ -153,7 +153,7 @@ int DivePlotDataModel::id() const
return diveId;
}
-int DivePlotDataModel::dcShown() const
+unsigned int DivePlotDataModel::dcShown() const
{
return dcNr;
}
diff --git a/qt-ui/profile/diveplotdatamodel.h b/qt-ui/profile/diveplotdatamodel.h
index 272c0d1c3..35805256d 100644
--- a/qt-ui/profile/diveplotdatamodel.h
+++ b/qt-ui/profile/diveplotdatamodel.h
@@ -55,7 +55,7 @@ public:
void setDive(struct dive *d, const plot_info &pInfo);
const plot_info &data() const;
int id() const;
- int dcShown() const;
+ unsigned int dcShown() const;
double pheMax();
double pn2Max();
double po2Max();
@@ -65,7 +65,7 @@ public:
private:
plot_info pInfo;
int diveId;
- int dcNr;
+ unsigned int dcNr;
};
#endif // DIVEPLOTDATAMODEL_H
diff --git a/qt-ui/profile/profilewidget2.cpp b/qt-ui/profile/profilewidget2.cpp
index 59d7454ac..cfb696de3 100644
--- a/qt-ui/profile/profilewidget2.cpp
+++ b/qt-ui/profile/profilewidget2.cpp
@@ -770,7 +770,7 @@ void ProfileWidget2::changeGas()
QPointF scenePos = mapToScene(mapFromGlobal(action->data().toPoint()));
QString gas = action->text();
// backup the things on the dataModel, since we will clear that out.
- int diveComputer = dataModel->dcShown();
+ unsigned int diveComputer = dataModel->dcShown();
int diveId = dataModel->id();
int o2, he;
int seconds = timeAxis->valueAt(scenePos);