diff --git a/src/libs/vpatterndb/vformula.cpp b/src/libs/vpatterndb/vformula.cpp index 5a764c7d7..301d331e7 100644 --- a/src/libs/vpatterndb/vformula.cpp +++ b/src/libs/vpatterndb/vformula.cpp @@ -32,6 +32,7 @@ #include #include #include +#include #include "../qmuparser/qmuparsererror.h" #include "../vmisc/def.h" @@ -273,6 +274,6 @@ void VFormula::ResetState() { d->strValue = tr("Error"); d->error = true; - d->dValue = NAN; + d->dValue = std::numeric_limits::quiet_NaN(); d->reason = tr("Not evaluated"); } diff --git a/src/libs/vpatterndb/vformula_p.h b/src/libs/vpatterndb/vformula_p.h index ef4d3be1a..54408bbf4 100644 --- a/src/libs/vpatterndb/vformula_p.h +++ b/src/libs/vpatterndb/vformula_p.h @@ -30,6 +30,7 @@ #include #include +#include #if QT_VERSION < QT_VERSION_CHECK(5, 5, 0) #include "../vmisc/diagnostic.h" @@ -53,16 +54,16 @@ public: VFormulaData(const VFormulaData &formula) = default; ~VFormulaData() = default; - QString formula{}; // NOLINT(misc-non-private-member-variables-in-classes) - QString strValue{tr("Error")}; // NOLINT(misc-non-private-member-variables-in-classes) - bool checkZero{true}; // NOLINT(misc-non-private-member-variables-in-classes) - bool checkLessThanZero{false}; // NOLINT(misc-non-private-member-variables-in-classes) - const VContainer *data{nullptr}; // NOLINT(misc-non-private-member-variables-in-classes) - quint32 toolId{NULL_ID}; // NOLINT(misc-non-private-member-variables-in-classes) - QString postfix{}; // NOLINT(misc-non-private-member-variables-in-classes) - bool error{true}; // NOLINT(misc-non-private-member-variables-in-classes) - qreal dValue{NAN}; // NOLINT(misc-non-private-member-variables-in-classes) - QString reason{tr("Formula is empty")}; // NOLINT(misc-non-private-member-variables-in-classes) + QString formula{}; // NOLINT(misc-non-private-member-variables-in-classes) + QString strValue{tr("Error")}; // NOLINT(misc-non-private-member-variables-in-classes) + bool checkZero{true}; // NOLINT(misc-non-private-member-variables-in-classes) + bool checkLessThanZero{false}; // NOLINT(misc-non-private-member-variables-in-classes) + const VContainer *data{nullptr}; // NOLINT(misc-non-private-member-variables-in-classes) + quint32 toolId{NULL_ID}; // NOLINT(misc-non-private-member-variables-in-classes) + QString postfix{}; // NOLINT(misc-non-private-member-variables-in-classes) + bool error{true}; // NOLINT(misc-non-private-member-variables-in-classes) + qreal dValue{std::numeric_limits::quiet_NaN()}; // NOLINT(misc-non-private-member-variables-in-classes) + QString reason{tr("Formula is empty")}; // NOLINT(misc-non-private-member-variables-in-classes) private: Q_DISABLE_ASSIGN_MOVE(VFormulaData) // NOLINT