Added logo to settings. Small bugfixes.

This commit is contained in:
2017-05-30 09:12:40 +02:00
parent c3598673c6
commit 37b2dd7246
5 changed files with 53 additions and 5 deletions
+12 -2
View File
@@ -63,7 +63,13 @@ bool ExprEvaluator::evaluate(QObject *object, const QString &exp)
QString oper;
QVariant cond;
parseExpr(exp, value, oper, cond, object);
return m_operations[oper](value, cond);
if (cond.isValid())
{
return m_operations[oper](value, cond);
}
return true;
}
}
@@ -87,6 +93,10 @@ void ExprEvaluator::parseExpr(const QString &exp, QVariant &value, QString &oper
QStringList expCat = exp.trimmed().split(" ");
value = object->property(expCat[0].toStdString().c_str());
oper = expCat[1];
condition = expCat[2].replace("%20", " ");
if (expCat.size() > 2)
{
condition = expCat[2].replace("%20", " ");
}
}