aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--qt-ui/diveplanner.cpp4
-rw-r--r--qt-ui/profile/divecartesianaxis.cpp10
-rw-r--r--qt-ui/profilegraphics.cpp2
3 files changed, 8 insertions, 8 deletions
diff --git a/qt-ui/diveplanner.cpp b/qt-ui/diveplanner.cpp
index d75e065b8..33cb80ff9 100644
--- a/qt-ui/diveplanner.cpp
+++ b/qt-ui/diveplanner.cpp
@@ -246,7 +246,7 @@ void DivePlannerGraphics::keyLeftAction()
double xpos = timeLine->posAtValue((dp.time - 60) / 60);
bool nextStep = false;
Q_FOREACH(DiveHandler *h, handles) {
- if (h->pos().x() == xpos) {
+ if (IS_FP_SAME(h->pos().x(), xpos)) {
nextStep = true;
break;
}
@@ -274,7 +274,7 @@ void DivePlannerGraphics::keyRightAction()
double xpos = timeLine->posAtValue((dp.time + 60) / 60);
bool nextStep = false;
Q_FOREACH(DiveHandler *h, handles) {
- if (h->pos().x() == xpos) {
+ if (IS_FP_SAME(h->pos().x(), xpos)) {
nextStep = true;
break;
}
diff --git a/qt-ui/profile/divecartesianaxis.cpp b/qt-ui/profile/divecartesianaxis.cpp
index 9a4966fef..c780b7a63 100644
--- a/qt-ui/profile/divecartesianaxis.cpp
+++ b/qt-ui/profile/divecartesianaxis.cpp
@@ -42,7 +42,7 @@ double DiveCartesianAxis::tickSize() const
void DiveCartesianAxis::setMaximum(double maximum)
{
- if (max == maximum)
+ if (IS_FP_SAME(max, maximum))
return;
max = maximum;
emit maxChanged();
@@ -50,7 +50,7 @@ void DiveCartesianAxis::setMaximum(double maximum)
void DiveCartesianAxis::setMinimum(double minimum)
{
- if (min == minimum)
+ if (IS_FP_SAME(min, minimum))
return;
min = minimum;
}
@@ -348,7 +348,7 @@ QLineF DiveCartesianPlane::horizontalLine() const
void DiveCartesianPlane::setHorizontalLine(QLineF line)
{
- if ( horizontalSize == line.length())
+ if (IS_FP_SAME(horizontalSize, line.length()))
return;
horizontalSize = line.length();
setup();
@@ -356,7 +356,7 @@ void DiveCartesianPlane::setHorizontalLine(QLineF line)
void DiveCartesianPlane::setVerticalLine(QLineF line)
{
- if (verticalSize == line.length())
+ if (IS_FP_SAME(verticalSize, line.length()))
return;
verticalSize = line.length();
setup();
@@ -439,7 +439,7 @@ void PartialGasPressureAxis::preferencesChanged()
max = model->po2Max();
qreal pp = floor(max * 10.0) / 10.0 + 0.2;
- if (maximum() == pp)
+ if (IS_FP_SAME(maximum(), pp))
return;
setMaximum(pp);
diff --git a/qt-ui/profilegraphics.cpp b/qt-ui/profilegraphics.cpp
index 65266d31e..14df03eb1 100644
--- a/qt-ui/profilegraphics.cpp
+++ b/qt-ui/profilegraphics.cpp
@@ -571,7 +571,7 @@ void ProfileGraphicsView::plot_pp_text()
QGraphicsLineItem *item = new QGraphicsLineItem(SCALEGC(0, m), SCALEGC(hpos, m));
QPen pen(defaultPen);
pen.setColor(c);
- if ( QString::number(m).toDouble() != QString::number(m).toInt()) {
+ if ( IS_FP_SAME(QString::number(m).toDouble(), QString::number(m).toInt())) {
pen.setStyle(Qt::DashLine);
pen.setWidthF(1.2);
}