kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Base: Use explicit pointer syntax for freecad_cast (#20694)

Browse Source 
* Base: Use explicit pointer syntax for freecad_cast

This aligns our custom cast with other casts

* All: Use explicit pointer syntax for freecad_cast
This commit is contained in:
Kacper Donat
2025-04-11 16:11:33 +02:00
committed by GitHub
parent 02bb799209
commit 77e40b9747
73 changed files with 305 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/Mod/Spreadsheet/App/Cell.cpp
View File

@@ -250,14 +250,14 @@ bool Cell::getStringContent(std::string& s, bool persistent) const
if (expression->hasComponent()) {
s = "=" + expression->toString(persistent);
}
else if (freecad_cast<App::StringExpression>(expression.get())) {
else if (freecad_cast<App::StringExpression*>(expression.get())) {
s = static_cast<App::StringExpression*>(expression.get())->getText();
s = "'" + s;
}
else if (freecad_cast<App::ConstantExpression>(expression.get())) {
else if (freecad_cast<App::ConstantExpression*>(expression.get())) {
s = "=" + expression->toString();
}
else if (freecad_cast<App::NumberExpression>(expression.get())) {
else if (freecad_cast<App::NumberExpression*>(expression.get())) {
s = expression->toString();
}
else {
@@ -274,7 +274,7 @@ bool Cell::getStringContent(std::string& s, bool persistent) const
void Cell::afterRestore()
{
auto expr = freecad_cast<StringExpression>(expression.get());
auto expr = freecad_cast<StringExpression*>(expression.get());
if (expr) {
setContent(expr->getText().c_str());
}
@@ -331,10 +331,10 @@ void Cell::setContent(const char* value)
try {
ExpressionPtr parsedExpr(App::ExpressionParser::parse(owner->sheet(), value));
if (const auto fraction = freecad_cast<OperatorExpression>(parsedExpr.get())) {
if (const auto fraction = freecad_cast<OperatorExpression*>(parsedExpr.get())) {
if (fraction->getOperator() == OperatorExpression::UNIT) {
const auto left = freecad_cast<NumberExpression>(fraction->getLeft());
const auto right = freecad_cast<UnitExpression>(fraction->getRight());
const auto left = freecad_cast<NumberExpression*>(fraction->getLeft());
const auto right = freecad_cast<UnitExpression*>(fraction->getRight());
if (left && right) {
newExpr = std::move(parsedExpr);
}
@@ -345,22 +345,22 @@ void Cell::setContent(const char* value)
// check for numbers in (de)nominator
const bool isNumberNom =
freecad_cast<NumberExpression>(fraction->getLeft());
freecad_cast<NumberExpression*>(fraction->getLeft());
const bool isNumberDenom =
freecad_cast<NumberExpression>(fraction->getRight());
freecad_cast<NumberExpression*>(fraction->getRight());
// check for numbers with units in (de)nominator
const auto opNom =
freecad_cast<OperatorExpression>(fraction->getLeft());
freecad_cast<OperatorExpression*>(fraction->getLeft());
const auto opDenom =
freecad_cast<OperatorExpression>(fraction->getRight());
freecad_cast<OperatorExpression*>(fraction->getRight());
const bool isQuantityNom =
opNom && opNom->getOperator() == OperatorExpression::UNIT;
const bool isQuantityDenom =
opDenom && opDenom->getOperator() == OperatorExpression::UNIT;
// check for units in denomainator
const auto uDenom = freecad_cast<UnitExpression>(fraction->getRight());
const auto uDenom = freecad_cast<UnitExpression*>(fraction->getRight());
const bool isUnitDenom = uDenom && uDenom->is<UnitExpression>();
const bool isNomValid = isNumberNom || isQuantityNom;
@@ -371,7 +371,8 @@ void Cell::setContent(const char* value)
}
}
}
else if (const auto number = freecad_cast<NumberExpression>(parsedExpr.get())) {
else if (const auto number =
freecad_cast<NumberExpression*>(parsedExpr.get())) {
// NumbersExpressions can accept more than can be parsed with strtod.
// Example: 12.34 and 12,34 are both valid NumberExpressions
newExpr = std::move(parsedExpr);