diff --git a/src/libs/vpatterndb/calculator.cpp b/src/libs/vpatterndb/calculator.cpp index 7f8ac74f8..4dcf10795 100644 --- a/src/libs/vpatterndb/calculator.cpp +++ b/src/libs/vpatterndb/calculator.cpp @@ -59,11 +59,6 @@ Calculator::Calculator() SetSepForEval(); } -//--------------------------------------------------------------------------------------------------------------------- -Calculator::~Calculator() -{ -} - //--------------------------------------------------------------------------------------------------------------------- /** * @brief eval calculate formula. diff --git a/src/libs/vpatterndb/calculator.h b/src/libs/vpatterndb/calculator.h index 5bf1ea31b..10eddeca8 100644 --- a/src/libs/vpatterndb/calculator.h +++ b/src/libs/vpatterndb/calculator.h @@ -36,9 +36,6 @@ #include #include "../qmuparser/qmuformulabase.h" -#include "../vmisc/def.h" - -class VContainer; /** * @brief The Calculator class for calculation formula. @@ -62,12 +59,13 @@ class Calculator:public qmu::QmuFormulaBase { public: Calculator(); - virtual ~Calculator() Q_DECL_OVERRIDE; - qreal EvalFormula(const QHash &vars, const QString &formula); + virtual ~Calculator() Q_DECL_EQ_DEFAULT; + + qreal EvalFormula(const QHash &vars, const QString &formula); private: Q_DISABLE_COPY(Calculator) - void InitVariables(const QHash &vars, const QMap &tokens, - const QString &formula); + + void InitVariables(const QHash &vars, const QMap &tokens, const QString &formula); }; #endif // CALCULATOR_H