diff --git a/src/libs/vlayout/vgraphicsfillitem.h b/src/libs/vlayout/vgraphicsfillitem.h index 3862d5d3f..564e36986 100644 --- a/src/libs/vlayout/vgraphicsfillitem.h +++ b/src/libs/vlayout/vgraphicsfillitem.h @@ -38,7 +38,7 @@ public: /** * @brief VGraphicsFillItem Constructor */ - VGraphicsFillItem(QGraphicsItem *parent = nullptr); + explicit VGraphicsFillItem(QGraphicsItem *parent = nullptr); /** * @brief ~VGraphicsFillItem Destructor */ diff --git a/src/libs/vpatterndb/vpiecenode.cpp b/src/libs/vpatterndb/vpiecenode.cpp index a03d7e476..2d74cd4a5 100644 --- a/src/libs/vpatterndb/vpiecenode.cpp +++ b/src/libs/vpatterndb/vpiecenode.cpp @@ -34,6 +34,39 @@ #include #include +namespace +{ +//--------------------------------------------------------------------------------------------------------------------- +qreal EvalFormula(const VContainer *data, QString formula) +{ + if (formula.isEmpty()) + { + return -1; + } + else + { + try + { + // Replace line return character with spaces for calc if exist + formula.replace("\n", " "); + QScopedPointer cal(new Calculator()); + const qreal result = cal->EvalFormula(data->PlainVariables(), formula); + + if (qIsInf(result) || qIsNaN(result)) + { + return -1; + } + return result; + } + catch (qmu::QmuParserError &e) + { + Q_UNUSED(e) + return -1; + } + } +} +} + //--------------------------------------------------------------------------------------------------------------------- VPieceNode::VPieceNode() : d(new VPieceNodeData) @@ -182,36 +215,6 @@ void VPieceNode::SetAngleType(PieceNodeAngle type) } } -//--------------------------------------------------------------------------------------------------------------------- -qreal VPieceNode::EvalFormula(const VContainer *data, QString formula) const -{ - if (formula.isEmpty()) - { - return -1; - } - else - { - try - { - // Replace line return character with spaces for calc if exist - formula.replace("\n", " "); - QScopedPointer cal(new Calculator()); - const qreal result = cal->EvalFormula(data->PlainVariables(), formula); - - if (qIsInf(result) || qIsNaN(result)) - { - return -1; - } - return result; - } - catch (qmu::QmuParserError &e) - { - Q_UNUSED(e) - return -1; - } - } -} - // Friend functions //--------------------------------------------------------------------------------------------------------------------- QDataStream& operator<<(QDataStream& out, const VPieceNode& p) diff --git a/src/libs/vpatterndb/vpiecenode.h b/src/libs/vpatterndb/vpiecenode.h index 9114b6c33..c2e7c9b1c 100644 --- a/src/libs/vpatterndb/vpiecenode.h +++ b/src/libs/vpatterndb/vpiecenode.h @@ -76,8 +76,6 @@ public: void SetAngleType(PieceNodeAngle type); private: QSharedDataPointer d; - - qreal EvalFormula(const VContainer *data, QString formula) const; }; Q_DECLARE_METATYPE(VPieceNode)