calculatorrunner: Only define help functions for JS evaluation when Qalculate is not available

wilder-5.22
Alexander Lohnau 5 years ago
parent df48864314
commit 4c29d17a88
  1. 2
      runners/calculator/calculatorrunner.cpp
  2. 2
      runners/calculator/calculatorrunner.h

@ -66,6 +66,7 @@ CalculatorRunner::~CalculatorRunner()
#endif #endif
} }
#ifndef ENABLE_QALCULATE
void CalculatorRunner::powSubstitutions(QString &cmd) void CalculatorRunner::powSubstitutions(QString &cmd)
{ {
if (cmd.contains(QLatin1String("e+"), Qt::CaseInsensitive)) { if (cmd.contains(QLatin1String("e+"), Qt::CaseInsensitive)) {
@ -178,6 +179,7 @@ void CalculatorRunner::hexSubstitutions(QString &cmd)
} }
} }
} }
#endif
void CalculatorRunner::userFriendlySubstitutions(QString &cmd) void CalculatorRunner::userFriendlySubstitutions(QString &cmd)
{ {

@ -49,8 +49,10 @@ private:
QString calculate(const QString &term, bool *isApproximate); QString calculate(const QString &term, bool *isApproximate);
void userFriendlyMultiplication(QString &cmd); void userFriendlyMultiplication(QString &cmd);
void userFriendlySubstitutions(QString &cmd); void userFriendlySubstitutions(QString &cmd);
#ifndef ENABLE_QALCULATE
void powSubstitutions(QString &cmd); void powSubstitutions(QString &cmd);
void hexSubstitutions(QString &cmd); void hexSubstitutions(QString &cmd);
#endif
#ifdef ENABLE_QALCULATE #ifdef ENABLE_QALCULATE
QalculateEngine *m_engine; QalculateEngine *m_engine;

Loading…
Cancel
Save