From 82c4936e04bcdd3764386a53ce3756f21204e7f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89milie=20Feral?= Date: Wed, 8 Apr 2020 17:08:48 +0200 Subject: [PATCH] Coding style: remove unecessary 'virtual' keyword when 'override' is present 1/2 --- poincare/include/poincare/absolute_value.h | 2 +- poincare/include/poincare/absolute_value_layout.h | 2 +- poincare/include/poincare/addition.h | 2 +- poincare/include/poincare/arc_cosine.h | 2 +- poincare/include/poincare/arc_sine.h | 2 +- poincare/include/poincare/arc_tangent.h | 2 +- poincare/include/poincare/based_integer.h | 2 +- poincare/include/poincare/binom_cdf.h | 2 +- poincare/include/poincare/binom_pdf.h | 2 +- poincare/include/poincare/binomial_coefficient.h | 2 +- poincare/include/poincare/binomial_coefficient_layout.h | 2 +- poincare/include/poincare/ceiling.h | 2 +- poincare/include/poincare/ceiling_layout.h | 2 +- poincare/include/poincare/code_point_layout.h | 2 +- poincare/include/poincare/complex.h | 2 +- poincare/include/poincare/complex_argument.h | 2 +- poincare/include/poincare/complex_cartesian.h | 2 +- poincare/include/poincare/condensed_sum_layout.h | 2 +- poincare/include/poincare/confidence_interval.h | 2 +- poincare/include/poincare/conjugate.h | 2 +- poincare/include/poincare/conjugate_layout.h | 2 +- poincare/include/poincare/constant.h | 2 +- poincare/include/poincare/cosine.h | 2 +- poincare/include/poincare/decimal.h | 2 +- poincare/include/poincare/derivative.h | 2 +- poincare/include/poincare/determinant.h | 2 +- poincare/include/poincare/division.h | 2 +- poincare/include/poincare/division_quotient.h | 2 +- poincare/include/poincare/division_remainder.h | 2 +- poincare/include/poincare/empty_expression.h | 2 +- poincare/include/poincare/empty_layout.h | 2 +- poincare/include/poincare/equal.h | 2 +- poincare/include/poincare/factor.h | 2 +- poincare/include/poincare/factorial.h | 2 +- poincare/include/poincare/float.h | 2 +- poincare/include/poincare/floor.h | 2 +- poincare/include/poincare/floor_layout.h | 2 +- poincare/include/poincare/frac_part.h | 2 +- poincare/include/poincare/fraction_layout.h | 2 +- poincare/include/poincare/function.h | 2 +- poincare/include/poincare/ghost_node.h | 2 +- poincare/include/poincare/great_common_divisor.h | 2 +- poincare/include/poincare/grid_layout.h | 2 +- poincare/include/poincare/horizontal_layout.h | 2 +- poincare/include/poincare/hyperbolic_arc_cosine.h | 2 +- poincare/include/poincare/hyperbolic_arc_sine.h | 2 +- poincare/include/poincare/hyperbolic_arc_tangent.h | 2 +- poincare/include/poincare/hyperbolic_cosine.h | 2 +- poincare/include/poincare/hyperbolic_sine.h | 2 +- poincare/include/poincare/hyperbolic_tangent.h | 2 +- poincare/include/poincare/imaginary_part.h | 2 +- poincare/include/poincare/infinity.h | 2 +- poincare/include/poincare/integer.h | 2 +- poincare/include/poincare/integral.h | 2 +- poincare/include/poincare/integral_layout.h | 2 +- poincare/include/poincare/inv_binom.h | 2 +- poincare/include/poincare/inv_norm.h | 2 +- poincare/include/poincare/least_common_multiple.h | 2 +- poincare/include/poincare/left_parenthesis_layout.h | 2 +- poincare/include/poincare/left_square_bracket_layout.h | 2 +- poincare/include/poincare/logarithm.h | 2 +- poincare/include/poincare/matrix.h | 2 +- poincare/include/poincare/matrix_complex.h | 2 +- poincare/include/poincare/matrix_dimension.h | 2 +- poincare/include/poincare/matrix_identity.h | 2 +- poincare/include/poincare/matrix_inverse.h | 2 +- poincare/include/poincare/matrix_layout.h | 2 +- poincare/include/poincare/matrix_trace.h | 2 +- poincare/include/poincare/matrix_transpose.h | 2 +- poincare/include/poincare/multiplication.h | 2 +- poincare/include/poincare/naperian_logarithm.h | 2 +- poincare/include/poincare/norm_cdf.h | 2 +- poincare/include/poincare/norm_cdf2.h | 2 +- poincare/include/poincare/norm_pdf.h | 2 +- poincare/include/poincare/nth_root.h | 2 +- poincare/include/poincare/nth_root_layout.h | 2 +- poincare/include/poincare/opposite.h | 2 +- poincare/include/poincare/parenthesis.h | 2 +- poincare/include/poincare/parenthesis_layout.h | 2 +- poincare/include/poincare/permute_coefficient.h | 2 +- poincare/include/poincare/power.h | 2 +- poincare/include/poincare/prediction_interval.h | 2 +- poincare/include/poincare/product.h | 2 +- poincare/include/poincare/product_layout.h | 2 +- poincare/include/poincare/randint.h | 2 +- poincare/include/poincare/random.h | 2 +- poincare/include/poincare/rational.h | 2 +- poincare/include/poincare/real_part.h | 2 +- poincare/include/poincare/right_parenthesis_layout.h | 2 +- poincare/include/poincare/right_square_bracket_layout.h | 2 +- poincare/include/poincare/round.h | 2 +- poincare/include/poincare/sign_function.h | 2 +- poincare/include/poincare/sine.h | 2 +- poincare/include/poincare/square_root.h | 2 +- poincare/include/poincare/store.h | 2 +- poincare/include/poincare/subtraction.h | 2 +- poincare/include/poincare/sum.h | 2 +- poincare/include/poincare/sum_layout.h | 2 +- poincare/include/poincare/symbol.h | 2 +- poincare/include/poincare/symbol_abstract.h | 2 +- poincare/include/poincare/tangent.h | 2 +- poincare/include/poincare/undefined.h | 2 +- poincare/include/poincare/unit.h | 2 +- poincare/include/poincare/unit_convert.h | 2 +- poincare/include/poincare/unreal.h | 2 +- poincare/include/poincare/vertical_offset_layout.h | 2 +- poincare/test/tree/blob_node.h | 2 +- poincare/test/tree/pair_node.h | 2 +- 108 files changed, 108 insertions(+), 108 deletions(-) diff --git a/poincare/include/poincare/absolute_value.h b/poincare/include/poincare/absolute_value.h index 411259dd8..8f146daae 100644 --- a/poincare/include/poincare/absolute_value.h +++ b/poincare/include/poincare/absolute_value.h @@ -13,7 +13,7 @@ public: size_t size() const override { return sizeof(AbsoluteValueNode); } int numberOfChildren() const override; #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "AbsoluteValue"; } #endif diff --git a/poincare/include/poincare/absolute_value_layout.h b/poincare/include/poincare/absolute_value_layout.h index 0aa42cb75..d2abc1ed7 100644 --- a/poincare/include/poincare/absolute_value_layout.h +++ b/poincare/include/poincare/absolute_value_layout.h @@ -22,7 +22,7 @@ public: // TreeNode size_t size() const override { return sizeof(AbsoluteValueLayoutNode); } #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "AbsoluteValueLayout"; } #endif diff --git a/poincare/include/poincare/addition.h b/poincare/include/poincare/addition.h index 1cb04f8a8..bdf00b499 100644 --- a/poincare/include/poincare/addition.h +++ b/poincare/include/poincare/addition.h @@ -15,7 +15,7 @@ public: // Tree size_t size() const override { return sizeof(AdditionNode); } #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "Addition"; } #endif diff --git a/poincare/include/poincare/arc_cosine.h b/poincare/include/poincare/arc_cosine.h index 8a5d04a76..8b7df06bb 100644 --- a/poincare/include/poincare/arc_cosine.h +++ b/poincare/include/poincare/arc_cosine.h @@ -14,7 +14,7 @@ public: size_t size() const override { return sizeof(ArcCosineNode); } int numberOfChildren() const override; #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "ArcCosine"; } #endif diff --git a/poincare/include/poincare/arc_sine.h b/poincare/include/poincare/arc_sine.h index 228c798fc..74d73c14d 100644 --- a/poincare/include/poincare/arc_sine.h +++ b/poincare/include/poincare/arc_sine.h @@ -14,7 +14,7 @@ public: size_t size() const override { return sizeof(ArcSineNode); } int numberOfChildren() const override; #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "ArcSine"; } #endif diff --git a/poincare/include/poincare/arc_tangent.h b/poincare/include/poincare/arc_tangent.h index 9fa7e1c90..5ee3b046e 100644 --- a/poincare/include/poincare/arc_tangent.h +++ b/poincare/include/poincare/arc_tangent.h @@ -14,7 +14,7 @@ public: size_t size() const override { return sizeof(ArcTangentNode); } int numberOfChildren() const override; #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "ArcTangent"; } #endif diff --git a/poincare/include/poincare/based_integer.h b/poincare/include/poincare/based_integer.h index 74ee6fb5a..566a334a4 100644 --- a/poincare/include/poincare/based_integer.h +++ b/poincare/include/poincare/based_integer.h @@ -16,7 +16,7 @@ public: // TreeNode size_t size() const override; #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "Based Integer"; } virtual void logAttributes(std::ostream & stream) const override; diff --git a/poincare/include/poincare/binom_cdf.h b/poincare/include/poincare/binom_cdf.h index 48f491256..773e1ead6 100644 --- a/poincare/include/poincare/binom_cdf.h +++ b/poincare/include/poincare/binom_cdf.h @@ -13,7 +13,7 @@ public: size_t size() const override { return sizeof(BinomCDFNode); } int numberOfChildren() const override; #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "BinomCDF"; } #endif diff --git a/poincare/include/poincare/binom_pdf.h b/poincare/include/poincare/binom_pdf.h index cfd89b6ec..bdd936bee 100644 --- a/poincare/include/poincare/binom_pdf.h +++ b/poincare/include/poincare/binom_pdf.h @@ -13,7 +13,7 @@ public: size_t size() const override { return sizeof(BinomPDFNode); } int numberOfChildren() const override; #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "BinomPDF"; } #endif diff --git a/poincare/include/poincare/binomial_coefficient.h b/poincare/include/poincare/binomial_coefficient.h index 0d98aed25..cb11495b3 100644 --- a/poincare/include/poincare/binomial_coefficient.h +++ b/poincare/include/poincare/binomial_coefficient.h @@ -13,7 +13,7 @@ public: size_t size() const override { return sizeof(BinomialCoefficientNode); } int numberOfChildren() const override; #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "BinomialCoefficient"; } #endif diff --git a/poincare/include/poincare/binomial_coefficient_layout.h b/poincare/include/poincare/binomial_coefficient_layout.h index 210207062..4f9369402 100644 --- a/poincare/include/poincare/binomial_coefficient_layout.h +++ b/poincare/include/poincare/binomial_coefficient_layout.h @@ -27,7 +27,7 @@ public: size_t size() const override { return sizeof(BinomialCoefficientLayoutNode); } int numberOfChildren() const override { return 2; } #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "BinomialCoefficientLayout"; } #endif diff --git a/poincare/include/poincare/ceiling.h b/poincare/include/poincare/ceiling.h index 31f5db941..2f77b3952 100644 --- a/poincare/include/poincare/ceiling.h +++ b/poincare/include/poincare/ceiling.h @@ -13,7 +13,7 @@ public: size_t size() const override { return sizeof(CeilingNode); } int numberOfChildren() const override; #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "Ceiling"; } #endif diff --git a/poincare/include/poincare/ceiling_layout.h b/poincare/include/poincare/ceiling_layout.h index a0f553aeb..e62a5b281 100644 --- a/poincare/include/poincare/ceiling_layout.h +++ b/poincare/include/poincare/ceiling_layout.h @@ -22,7 +22,7 @@ public: // TreeNode size_t size() const override { return sizeof(CeilingLayoutNode); } #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "CeilingLayout"; } #endif diff --git a/poincare/include/poincare/code_point_layout.h b/poincare/include/poincare/code_point_layout.h index d8d4dfbbf..8c5ec928c 100644 --- a/poincare/include/poincare/code_point_layout.h +++ b/poincare/include/poincare/code_point_layout.h @@ -39,7 +39,7 @@ public: size_t size() const override { return sizeof(CodePointLayoutNode); } int numberOfChildren() const override { return 0; } #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "CodePointLayout"; } virtual void logAttributes(std::ostream & stream) const override { diff --git a/poincare/include/poincare/complex.h b/poincare/include/poincare/complex.h index e8e92690d..5f4aec757 100644 --- a/poincare/include/poincare/complex.h +++ b/poincare/include/poincare/complex.h @@ -17,7 +17,7 @@ public: size_t size() const override { return sizeof(ComplexNode); } int numberOfChildren() const override { return 0; } #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "Complex"; } virtual void logAttributes(std::ostream & stream) const override { diff --git a/poincare/include/poincare/complex_argument.h b/poincare/include/poincare/complex_argument.h index 44b27147a..4507507b6 100644 --- a/poincare/include/poincare/complex_argument.h +++ b/poincare/include/poincare/complex_argument.h @@ -13,7 +13,7 @@ public: size_t size() const override { return sizeof(ComplexArgumentNode); } int numberOfChildren() const override; #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "ComplexArgument"; } #endif diff --git a/poincare/include/poincare/complex_cartesian.h b/poincare/include/poincare/complex_cartesian.h index bc8b61328..917fe89e8 100644 --- a/poincare/include/poincare/complex_cartesian.h +++ b/poincare/include/poincare/complex_cartesian.h @@ -13,7 +13,7 @@ public: size_t size() const override { return sizeof(ComplexCartesianNode); } int numberOfChildren() const override { return 2; } #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "ComplexCartesian"; } #endif diff --git a/poincare/include/poincare/condensed_sum_layout.h b/poincare/include/poincare/condensed_sum_layout.h index 6f5bb5e88..a1031e00a 100644 --- a/poincare/include/poincare/condensed_sum_layout.h +++ b/poincare/include/poincare/condensed_sum_layout.h @@ -36,7 +36,7 @@ public: size_t size() const override { return sizeof(CondensedSumLayoutNode); } int numberOfChildren() const override { return 3; } #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "CondensedSumLayout"; } #endif diff --git a/poincare/include/poincare/confidence_interval.h b/poincare/include/poincare/confidence_interval.h index f9ea855c9..6aa6f90ca 100644 --- a/poincare/include/poincare/confidence_interval.h +++ b/poincare/include/poincare/confidence_interval.h @@ -12,7 +12,7 @@ public: size_t size() const override { return sizeof(ConfidenceIntervalNode); } int numberOfChildren() const override; #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "ConfidenceInterval"; } #endif diff --git a/poincare/include/poincare/conjugate.h b/poincare/include/poincare/conjugate.h index 07434ef90..8a52b7d8e 100644 --- a/poincare/include/poincare/conjugate.h +++ b/poincare/include/poincare/conjugate.h @@ -13,7 +13,7 @@ public: size_t size() const override { return sizeof(ConjugateNode); } int numberOfChildren() const override; #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "Conjugate"; } #endif diff --git a/poincare/include/poincare/conjugate_layout.h b/poincare/include/poincare/conjugate_layout.h index e56187c77..8cf2f5f04 100644 --- a/poincare/include/poincare/conjugate_layout.h +++ b/poincare/include/poincare/conjugate_layout.h @@ -23,7 +23,7 @@ public: size_t size() const override { return sizeof(ConjugateLayoutNode); } int numberOfChildren() const override { return 1; } #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "ConjugateLayout"; } #endif diff --git a/poincare/include/poincare/constant.h b/poincare/include/poincare/constant.h index 591ca7e2d..0fd25bda3 100644 --- a/poincare/include/poincare/constant.h +++ b/poincare/include/poincare/constant.h @@ -17,7 +17,7 @@ public: // TreeNode int numberOfChildren() const override { return 0; } #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "Constant"; } #endif diff --git a/poincare/include/poincare/cosine.h b/poincare/include/poincare/cosine.h index 9b79621c0..4af257591 100644 --- a/poincare/include/poincare/cosine.h +++ b/poincare/include/poincare/cosine.h @@ -14,7 +14,7 @@ public: size_t size() const override { return sizeof(CosineNode); } int numberOfChildren() const override; #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "Cosine"; } #endif diff --git a/poincare/include/poincare/decimal.h b/poincare/include/poincare/decimal.h index 60b7e69ba..5cddbd93b 100644 --- a/poincare/include/poincare/decimal.h +++ b/poincare/include/poincare/decimal.h @@ -27,7 +27,7 @@ public: // TreeNode size_t size() const override; #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "Decimal"; } virtual void logAttributes(std::ostream & stream) const override { diff --git a/poincare/include/poincare/derivative.h b/poincare/include/poincare/derivative.h index 6211e86ce..174a59d96 100644 --- a/poincare/include/poincare/derivative.h +++ b/poincare/include/poincare/derivative.h @@ -14,7 +14,7 @@ public: size_t size() const override { return sizeof(DerivativeNode); } int numberOfChildren() const override; #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "Derivative"; } #endif diff --git a/poincare/include/poincare/determinant.h b/poincare/include/poincare/determinant.h index 8ea361c60..14a4326a7 100644 --- a/poincare/include/poincare/determinant.h +++ b/poincare/include/poincare/determinant.h @@ -12,7 +12,7 @@ public: size_t size() const override { return sizeof(DeterminantNode); } int numberOfChildren() const override; #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "Determinant"; } #endif diff --git a/poincare/include/poincare/division.h b/poincare/include/poincare/division.h index 5c2bb56b2..b9c6be652 100644 --- a/poincare/include/poincare/division.h +++ b/poincare/include/poincare/division.h @@ -17,7 +17,7 @@ public: size_t size() const override { return sizeof(DivisionNode); } int numberOfChildren() const override { return 2; } #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "Division"; } #endif diff --git a/poincare/include/poincare/division_quotient.h b/poincare/include/poincare/division_quotient.h index 654059c1b..cdc1f5461 100644 --- a/poincare/include/poincare/division_quotient.h +++ b/poincare/include/poincare/division_quotient.h @@ -13,7 +13,7 @@ public: size_t size() const override { return sizeof(DivisionQuotientNode); } int numberOfChildren() const override; #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "DivisionQuotient"; } #endif diff --git a/poincare/include/poincare/division_remainder.h b/poincare/include/poincare/division_remainder.h index 5fcfc7271..53bdde967 100644 --- a/poincare/include/poincare/division_remainder.h +++ b/poincare/include/poincare/division_remainder.h @@ -14,7 +14,7 @@ public: size_t size() const override { return sizeof(DivisionRemainderNode); } int numberOfChildren() const override; #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "DivisionRemainder"; } #endif diff --git a/poincare/include/poincare/empty_expression.h b/poincare/include/poincare/empty_expression.h index eb2824fb8..3814f3e91 100644 --- a/poincare/include/poincare/empty_expression.h +++ b/poincare/include/poincare/empty_expression.h @@ -14,7 +14,7 @@ public: size_t size() const override { return sizeof(EmptyExpressionNode); } int numberOfChildren() const override { return 0; } #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "EmptyExpression"; } #endif diff --git a/poincare/include/poincare/empty_layout.h b/poincare/include/poincare/empty_layout.h index 8361c09b5..14cd3bb15 100644 --- a/poincare/include/poincare/empty_layout.h +++ b/poincare/include/poincare/empty_layout.h @@ -42,7 +42,7 @@ public: size_t size() const override { return sizeof(EmptyLayoutNode); } int numberOfChildren() const override { return 0; } #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "EmptyLayout"; } #endif diff --git a/poincare/include/poincare/equal.h b/poincare/include/poincare/equal.h index fd40f1bfe..4e84b2a7e 100644 --- a/poincare/include/poincare/equal.h +++ b/poincare/include/poincare/equal.h @@ -12,7 +12,7 @@ public: size_t size() const override { return sizeof(EqualNode); } int numberOfChildren() const override { return 2; } #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "Equal"; } #endif diff --git a/poincare/include/poincare/factor.h b/poincare/include/poincare/factor.h index 7f8dc7668..1da23d068 100644 --- a/poincare/include/poincare/factor.h +++ b/poincare/include/poincare/factor.h @@ -14,7 +14,7 @@ public: size_t size() const override { return sizeof(FactorNode); } int numberOfChildren() const override; #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "Factor"; } #endif diff --git a/poincare/include/poincare/factorial.h b/poincare/include/poincare/factorial.h index 0a06b71f0..3b9fc1520 100644 --- a/poincare/include/poincare/factorial.h +++ b/poincare/include/poincare/factorial.h @@ -13,7 +13,7 @@ public: size_t size() const override { return sizeof(FactorialNode); } int numberOfChildren() const override { return 1; } #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "Factorial"; } #endif diff --git a/poincare/include/poincare/float.h b/poincare/include/poincare/float.h index 8c6db2d73..814651693 100644 --- a/poincare/include/poincare/float.h +++ b/poincare/include/poincare/float.h @@ -27,7 +27,7 @@ public: // TreeNode size_t size() const override { return sizeof(FloatNode); } #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "Float"; } virtual void logAttributes(std::ostream & stream) const override { diff --git a/poincare/include/poincare/floor.h b/poincare/include/poincare/floor.h index e2462efff..e017c515c 100644 --- a/poincare/include/poincare/floor.h +++ b/poincare/include/poincare/floor.h @@ -13,7 +13,7 @@ public: size_t size() const override { return sizeof(FloorNode); } int numberOfChildren() const override; #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "Floor"; } #endif diff --git a/poincare/include/poincare/floor_layout.h b/poincare/include/poincare/floor_layout.h index f3f0cab60..b696f55d3 100644 --- a/poincare/include/poincare/floor_layout.h +++ b/poincare/include/poincare/floor_layout.h @@ -22,7 +22,7 @@ public: // TreeNode size_t size() const override { return sizeof(FloorLayoutNode); } #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "FloorLayout"; } #endif diff --git a/poincare/include/poincare/frac_part.h b/poincare/include/poincare/frac_part.h index d25baf0b7..46c0af2e5 100644 --- a/poincare/include/poincare/frac_part.h +++ b/poincare/include/poincare/frac_part.h @@ -13,7 +13,7 @@ public: size_t size() const override { return sizeof(FracPartNode); } int numberOfChildren() const override; #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "FracPart"; } #endif diff --git a/poincare/include/poincare/fraction_layout.h b/poincare/include/poincare/fraction_layout.h index 68b7cbb12..bd3ab2eb5 100644 --- a/poincare/include/poincare/fraction_layout.h +++ b/poincare/include/poincare/fraction_layout.h @@ -39,7 +39,7 @@ public: size_t size() const override { return sizeof(FractionLayoutNode); } int numberOfChildren() const override { return 2; } #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "FractionLayout"; } #endif diff --git a/poincare/include/poincare/function.h b/poincare/include/poincare/function.h index 999321f8d..bb2d2f92c 100644 --- a/poincare/include/poincare/function.h +++ b/poincare/include/poincare/function.h @@ -16,7 +16,7 @@ public: // TreeNode int numberOfChildren() const override { return 1; } //TODO allow any number of children? Needs templating #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "Function"; } #endif diff --git a/poincare/include/poincare/ghost_node.h b/poincare/include/poincare/ghost_node.h index fd3f491bb..69ca981d6 100644 --- a/poincare/include/poincare/ghost_node.h +++ b/poincare/include/poincare/ghost_node.h @@ -11,7 +11,7 @@ public: int numberOfChildren() const override { return 0; } size_t size() const override { return sizeof(GhostNode); } #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "Ghost"; } #endif diff --git a/poincare/include/poincare/great_common_divisor.h b/poincare/include/poincare/great_common_divisor.h index 66a86ca97..e6e12b6d9 100644 --- a/poincare/include/poincare/great_common_divisor.h +++ b/poincare/include/poincare/great_common_divisor.h @@ -12,7 +12,7 @@ public: size_t size() const override { return sizeof(GreatCommonDivisorNode); } int numberOfChildren() const override; #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "GreatCommonDivisor"; } #endif diff --git a/poincare/include/poincare/grid_layout.h b/poincare/include/poincare/grid_layout.h index 8a7534386..9f5ec3296 100644 --- a/poincare/include/poincare/grid_layout.h +++ b/poincare/include/poincare/grid_layout.h @@ -52,7 +52,7 @@ public: m_numberOfColumns = 0; } #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "GridLayout"; } #endif diff --git a/poincare/include/poincare/horizontal_layout.h b/poincare/include/poincare/horizontal_layout.h index 7c9b5ae2c..accd2eb87 100644 --- a/poincare/include/poincare/horizontal_layout.h +++ b/poincare/include/poincare/horizontal_layout.h @@ -47,7 +47,7 @@ public: } void eraseNumberOfChildren() override { m_numberOfChildren = 0; } #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "HorizontalLayout"; } #endif diff --git a/poincare/include/poincare/hyperbolic_arc_cosine.h b/poincare/include/poincare/hyperbolic_arc_cosine.h index c49ca9617..dae97d4fe 100644 --- a/poincare/include/poincare/hyperbolic_arc_cosine.h +++ b/poincare/include/poincare/hyperbolic_arc_cosine.h @@ -12,7 +12,7 @@ public: // TreeNode size_t size() const override { return sizeof(HyperbolicArcCosineNode); } #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "HyperbolicArcCosine"; } #endif diff --git a/poincare/include/poincare/hyperbolic_arc_sine.h b/poincare/include/poincare/hyperbolic_arc_sine.h index 6e05ccd4e..0e7136898 100644 --- a/poincare/include/poincare/hyperbolic_arc_sine.h +++ b/poincare/include/poincare/hyperbolic_arc_sine.h @@ -12,7 +12,7 @@ public: // TreeNode size_t size() const override { return sizeof(HyperbolicArcSineNode); } #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "HyperbolicArcSine"; } #endif diff --git a/poincare/include/poincare/hyperbolic_arc_tangent.h b/poincare/include/poincare/hyperbolic_arc_tangent.h index 0280ab98b..92867bc81 100644 --- a/poincare/include/poincare/hyperbolic_arc_tangent.h +++ b/poincare/include/poincare/hyperbolic_arc_tangent.h @@ -12,7 +12,7 @@ public: // TreeNode size_t size() const override { return sizeof(HyperbolicArcTangentNode); } #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "HyperbolicArcTangent"; } #endif diff --git a/poincare/include/poincare/hyperbolic_cosine.h b/poincare/include/poincare/hyperbolic_cosine.h index efd9e632d..82537ef0a 100644 --- a/poincare/include/poincare/hyperbolic_cosine.h +++ b/poincare/include/poincare/hyperbolic_cosine.h @@ -12,7 +12,7 @@ public: // TreeNode size_t size() const override { return sizeof(HyperbolicCosineNode); } #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "HyperbolicCosine"; } #endif diff --git a/poincare/include/poincare/hyperbolic_sine.h b/poincare/include/poincare/hyperbolic_sine.h index 2f29c8cc9..94f2964e8 100644 --- a/poincare/include/poincare/hyperbolic_sine.h +++ b/poincare/include/poincare/hyperbolic_sine.h @@ -12,7 +12,7 @@ public: // TreeNode size_t size() const override { return sizeof(HyperbolicSineNode); } #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "HyperbolicSine"; } #endif diff --git a/poincare/include/poincare/hyperbolic_tangent.h b/poincare/include/poincare/hyperbolic_tangent.h index 4e76beccf..eb0cc9091 100644 --- a/poincare/include/poincare/hyperbolic_tangent.h +++ b/poincare/include/poincare/hyperbolic_tangent.h @@ -12,7 +12,7 @@ public: // TreeNode size_t size() const override { return sizeof(HyperbolicTangentNode); } #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "HyperbolicTangent"; } #endif diff --git a/poincare/include/poincare/imaginary_part.h b/poincare/include/poincare/imaginary_part.h index 726e22858..2a10da6a0 100644 --- a/poincare/include/poincare/imaginary_part.h +++ b/poincare/include/poincare/imaginary_part.h @@ -13,7 +13,7 @@ public: size_t size() const override { return sizeof(ImaginaryPartNode); } int numberOfChildren() const override; #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "ImaginaryPart"; } #endif diff --git a/poincare/include/poincare/infinity.h b/poincare/include/poincare/infinity.h index cc400bfed..2d434f266 100644 --- a/poincare/include/poincare/infinity.h +++ b/poincare/include/poincare/infinity.h @@ -12,7 +12,7 @@ public: // TreeNode size_t size() const override { return sizeof(InfinityNode); } #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "Infinity"; } virtual void logAttributes(std::ostream & stream) const override { diff --git a/poincare/include/poincare/integer.h b/poincare/include/poincare/integer.h index bb31b9624..181193a75 100644 --- a/poincare/include/poincare/integer.h +++ b/poincare/include/poincare/integer.h @@ -37,7 +37,7 @@ public: int numberOfChildren() const override { return 0; } #if POINCARE_TREE_LOG void log(std::ostream & stream) const; - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "Integer"; } virtual void logAttributes(std::ostream & stream) const override; diff --git a/poincare/include/poincare/integral.h b/poincare/include/poincare/integral.h index cd57361c7..513c10ac5 100644 --- a/poincare/include/poincare/integral.h +++ b/poincare/include/poincare/integral.h @@ -13,7 +13,7 @@ public: size_t size() const override { return sizeof(IntegralNode); } int numberOfChildren() const override; #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "Integral"; } #endif diff --git a/poincare/include/poincare/integral_layout.h b/poincare/include/poincare/integral_layout.h index c714c8327..af1003495 100644 --- a/poincare/include/poincare/integral_layout.h +++ b/poincare/include/poincare/integral_layout.h @@ -31,7 +31,7 @@ public: size_t size() const override { return sizeof(IntegralLayoutNode); } int numberOfChildren() const override { return 4; } #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "IntegralLayout"; } #endif diff --git a/poincare/include/poincare/inv_binom.h b/poincare/include/poincare/inv_binom.h index db0767503..00051645a 100644 --- a/poincare/include/poincare/inv_binom.h +++ b/poincare/include/poincare/inv_binom.h @@ -13,7 +13,7 @@ public: size_t size() const override { return sizeof(InvBinomNode); } int numberOfChildren() const override; #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "InvBinom"; } #endif diff --git a/poincare/include/poincare/inv_norm.h b/poincare/include/poincare/inv_norm.h index edf0a60a6..c1c36b81a 100644 --- a/poincare/include/poincare/inv_norm.h +++ b/poincare/include/poincare/inv_norm.h @@ -13,7 +13,7 @@ public: size_t size() const override { return sizeof(InvNormNode); } int numberOfChildren() const override; #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "InvNorm"; } #endif diff --git a/poincare/include/poincare/least_common_multiple.h b/poincare/include/poincare/least_common_multiple.h index 6efdcc071..15621d757 100644 --- a/poincare/include/poincare/least_common_multiple.h +++ b/poincare/include/poincare/least_common_multiple.h @@ -12,7 +12,7 @@ public: size_t size() const override { return sizeof(LeastCommonMultipleNode); } int numberOfChildren() const override; #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "LeastCommonMultiple"; } #endif diff --git a/poincare/include/poincare/left_parenthesis_layout.h b/poincare/include/poincare/left_parenthesis_layout.h index 7f535042e..96c9726d1 100644 --- a/poincare/include/poincare/left_parenthesis_layout.h +++ b/poincare/include/poincare/left_parenthesis_layout.h @@ -26,7 +26,7 @@ public: // TreeNode #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "LeftParenthesisLayout"; } #endif diff --git a/poincare/include/poincare/left_square_bracket_layout.h b/poincare/include/poincare/left_square_bracket_layout.h index 99630a785..27d28176d 100644 --- a/poincare/include/poincare/left_square_bracket_layout.h +++ b/poincare/include/poincare/left_square_bracket_layout.h @@ -21,7 +21,7 @@ public: // TreeNode size_t size() const override { return sizeof(LeftSquareBracketLayoutNode); } #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "LeftSquareBracketLayout"; } #endif diff --git a/poincare/include/poincare/logarithm.h b/poincare/include/poincare/logarithm.h index d799ab0b3..21722c26a 100644 --- a/poincare/include/poincare/logarithm.h +++ b/poincare/include/poincare/logarithm.h @@ -15,7 +15,7 @@ public: size_t size() const override { return sizeof(LogarithmNode); } int numberOfChildren() const override; #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "Logarithm"; } #endif diff --git a/poincare/include/poincare/matrix.h b/poincare/include/poincare/matrix.h index 96f6e73cf..6d8937e3f 100644 --- a/poincare/include/poincare/matrix.h +++ b/poincare/include/poincare/matrix.h @@ -22,7 +22,7 @@ public: int numberOfChildren() const override { return m_numberOfRows*m_numberOfColumns; } void didAddChildAtIndex(int newNumberOfChildren) override; #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "Matrix"; } virtual void logAttributes(std::ostream & stream) const override { diff --git a/poincare/include/poincare/matrix_complex.h b/poincare/include/poincare/matrix_complex.h index a18e74f2f..b895f3151 100644 --- a/poincare/include/poincare/matrix_complex.h +++ b/poincare/include/poincare/matrix_complex.h @@ -25,7 +25,7 @@ public: int numberOfChildren() const override { return m_numberOfRows*m_numberOfColumns; } void didAddChildAtIndex(int newNumberOfChildren) override; #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "MatrixComplex"; } virtual void logAttributes(std::ostream & stream) const override { diff --git a/poincare/include/poincare/matrix_dimension.h b/poincare/include/poincare/matrix_dimension.h index 2a8e693b5..ade407bfa 100644 --- a/poincare/include/poincare/matrix_dimension.h +++ b/poincare/include/poincare/matrix_dimension.h @@ -12,7 +12,7 @@ public: size_t size() const override { return sizeof(MatrixDimensionNode); } int numberOfChildren() const override; #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "MatrixDimension"; } #endif diff --git a/poincare/include/poincare/matrix_identity.h b/poincare/include/poincare/matrix_identity.h index e998c0f15..3f35ab64f 100644 --- a/poincare/include/poincare/matrix_identity.h +++ b/poincare/include/poincare/matrix_identity.h @@ -11,7 +11,7 @@ public: size_t size() const override { return sizeof(MatrixIdentityNode); } int numberOfChildren() const override; #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "MatrixIdentity"; } #endif diff --git a/poincare/include/poincare/matrix_inverse.h b/poincare/include/poincare/matrix_inverse.h index 347688fe2..17b10dd01 100644 --- a/poincare/include/poincare/matrix_inverse.h +++ b/poincare/include/poincare/matrix_inverse.h @@ -12,7 +12,7 @@ public: size_t size() const override { return sizeof(MatrixInverseNode); } int numberOfChildren() const override; #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "MatrixInverse"; } #endif diff --git a/poincare/include/poincare/matrix_layout.h b/poincare/include/poincare/matrix_layout.h index cda42e202..6cded4cee 100644 --- a/poincare/include/poincare/matrix_layout.h +++ b/poincare/include/poincare/matrix_layout.h @@ -34,7 +34,7 @@ public: // TreeNode size_t size() const override { return sizeof(MatrixLayoutNode); } #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "MatrixLayout"; } #endif diff --git a/poincare/include/poincare/matrix_trace.h b/poincare/include/poincare/matrix_trace.h index f4db9b56a..ec8af6591 100644 --- a/poincare/include/poincare/matrix_trace.h +++ b/poincare/include/poincare/matrix_trace.h @@ -12,7 +12,7 @@ public: size_t size() const override { return sizeof(MatrixTraceNode); } int numberOfChildren() const override; #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "MatrixTrace"; } #endif diff --git a/poincare/include/poincare/matrix_transpose.h b/poincare/include/poincare/matrix_transpose.h index 96970249c..5a730ea41 100644 --- a/poincare/include/poincare/matrix_transpose.h +++ b/poincare/include/poincare/matrix_transpose.h @@ -12,7 +12,7 @@ public: size_t size() const override { return sizeof(MatrixTransposeNode); } int numberOfChildren() const override; #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "MatrixTranspose"; } #endif diff --git a/poincare/include/poincare/multiplication.h b/poincare/include/poincare/multiplication.h index c75144cf4..a62ec77c0 100644 --- a/poincare/include/poincare/multiplication.h +++ b/poincare/include/poincare/multiplication.h @@ -14,7 +14,7 @@ public: // Tree size_t size() const override { return sizeof(MultiplicationNode); } #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "Multiplication"; } #endif diff --git a/poincare/include/poincare/naperian_logarithm.h b/poincare/include/poincare/naperian_logarithm.h index 1c3287bbb..8ce012b1f 100644 --- a/poincare/include/poincare/naperian_logarithm.h +++ b/poincare/include/poincare/naperian_logarithm.h @@ -12,7 +12,7 @@ public: size_t size() const override { return sizeof(NaperianLogarithmNode); } int numberOfChildren() const override; #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "NaperianLogarithm"; } #endif diff --git a/poincare/include/poincare/norm_cdf.h b/poincare/include/poincare/norm_cdf.h index f6d117547..d88448b4f 100644 --- a/poincare/include/poincare/norm_cdf.h +++ b/poincare/include/poincare/norm_cdf.h @@ -13,7 +13,7 @@ public: size_t size() const override { return sizeof(NormCDFNode); } int numberOfChildren() const override; #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "NormCDF"; } #endif diff --git a/poincare/include/poincare/norm_cdf2.h b/poincare/include/poincare/norm_cdf2.h index 08167c0bd..4282a432f 100644 --- a/poincare/include/poincare/norm_cdf2.h +++ b/poincare/include/poincare/norm_cdf2.h @@ -13,7 +13,7 @@ public: size_t size() const override { return sizeof(NormCDF2Node); } int numberOfChildren() const override; #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "NormCDF2"; } #endif diff --git a/poincare/include/poincare/norm_pdf.h b/poincare/include/poincare/norm_pdf.h index e7c8ac58c..c1b66a5c4 100644 --- a/poincare/include/poincare/norm_pdf.h +++ b/poincare/include/poincare/norm_pdf.h @@ -13,7 +13,7 @@ public: size_t size() const override { return sizeof(NormPDFNode); } int numberOfChildren() const override; #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "NormPDF"; } #endif diff --git a/poincare/include/poincare/nth_root.h b/poincare/include/poincare/nth_root.h index 3edec4e1c..4a4d4f5c8 100644 --- a/poincare/include/poincare/nth_root.h +++ b/poincare/include/poincare/nth_root.h @@ -14,7 +14,7 @@ public: size_t size() const override { return sizeof(NthRootNode); } int numberOfChildren() const override; #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "NthRoot"; } #endif diff --git a/poincare/include/poincare/nth_root_layout.h b/poincare/include/poincare/nth_root_layout.h index ba5cff8ce..b7644f993 100644 --- a/poincare/include/poincare/nth_root_layout.h +++ b/poincare/include/poincare/nth_root_layout.h @@ -38,7 +38,7 @@ public: size_t size() const override { return sizeof(NthRootLayoutNode); } int numberOfChildren() const override { return m_hasIndex ? 2 : 1; } #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "NthRootLayout"; } #endif diff --git a/poincare/include/poincare/opposite.h b/poincare/include/poincare/opposite.h index 58d0462c0..91f72be17 100644 --- a/poincare/include/poincare/opposite.h +++ b/poincare/include/poincare/opposite.h @@ -17,7 +17,7 @@ public: size_t size() const override { return sizeof(OppositeNode); } int numberOfChildren() const override { return 1; } #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "Opposite"; } #endif diff --git a/poincare/include/poincare/parenthesis.h b/poincare/include/poincare/parenthesis.h index ec203e55b..492bbf424 100644 --- a/poincare/include/poincare/parenthesis.h +++ b/poincare/include/poincare/parenthesis.h @@ -13,7 +13,7 @@ public: size_t size() const override { return sizeof(ParenthesisNode); } int numberOfChildren() const override { return 1; } #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "Parenthesis"; } #endif diff --git a/poincare/include/poincare/parenthesis_layout.h b/poincare/include/poincare/parenthesis_layout.h index f35679205..8d2330139 100644 --- a/poincare/include/poincare/parenthesis_layout.h +++ b/poincare/include/poincare/parenthesis_layout.h @@ -21,7 +21,7 @@ public: // TreeNode size_t size() const override { return sizeof(ParenthesisLayoutNode); } #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "ParenthesisLayout"; } #endif diff --git a/poincare/include/poincare/permute_coefficient.h b/poincare/include/poincare/permute_coefficient.h index 63ee987fa..a4eee719f 100644 --- a/poincare/include/poincare/permute_coefficient.h +++ b/poincare/include/poincare/permute_coefficient.h @@ -13,7 +13,7 @@ public: size_t size() const override { return sizeof(PermuteCoefficientNode); } int numberOfChildren() const override; #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "PermuteCoefficient"; } #endif diff --git a/poincare/include/poincare/power.h b/poincare/include/poincare/power.h index 77f2dda77..2e3f5ad4a 100644 --- a/poincare/include/poincare/power.h +++ b/poincare/include/poincare/power.h @@ -16,7 +16,7 @@ public: size_t size() const override { return sizeof(PowerNode); } int numberOfChildren() const override { return 2; } #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "Power"; } #endif diff --git a/poincare/include/poincare/prediction_interval.h b/poincare/include/poincare/prediction_interval.h index de628ec01..1863e74c5 100644 --- a/poincare/include/poincare/prediction_interval.h +++ b/poincare/include/poincare/prediction_interval.h @@ -12,7 +12,7 @@ public: size_t size() const override { return sizeof(PredictionIntervalNode); } int numberOfChildren() const override; #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "PredictionInterval"; } #endif diff --git a/poincare/include/poincare/product.h b/poincare/include/poincare/product.h index c70d2bfbb..6b5641850 100644 --- a/poincare/include/poincare/product.h +++ b/poincare/include/poincare/product.h @@ -10,7 +10,7 @@ public: // TreeNode size_t size() const override { return sizeof(ProductNode); } #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "Product"; } #endif diff --git a/poincare/include/poincare/product_layout.h b/poincare/include/poincare/product_layout.h index 85035cfe8..2375503f6 100644 --- a/poincare/include/poincare/product_layout.h +++ b/poincare/include/poincare/product_layout.h @@ -16,7 +16,7 @@ public: int serialize(char * buffer, int bufferSize, Preferences::PrintFloatMode floatDisplayMode, int numberOfSignificantDigits) const override; size_t size() const override { return sizeof(ProductLayoutNode); } #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "ProductLayout"; } #endif diff --git a/poincare/include/poincare/randint.h b/poincare/include/poincare/randint.h index 62870714e..8959ec826 100644 --- a/poincare/include/poincare/randint.h +++ b/poincare/include/poincare/randint.h @@ -13,7 +13,7 @@ public: size_t size() const override { return sizeof(RandintNode); } int numberOfChildren() const override; #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "Randint"; } #endif diff --git a/poincare/include/poincare/random.h b/poincare/include/poincare/random.h index fcb93572f..564a758ed 100644 --- a/poincare/include/poincare/random.h +++ b/poincare/include/poincare/random.h @@ -13,7 +13,7 @@ public: size_t size() const override { return sizeof(RandomNode); } int numberOfChildren() const override; #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "Random"; } #endif diff --git a/poincare/include/poincare/rational.h b/poincare/include/poincare/rational.h index 84da9e017..c9dc1463b 100644 --- a/poincare/include/poincare/rational.h +++ b/poincare/include/poincare/rational.h @@ -21,7 +21,7 @@ public: // TreeNode size_t size() const override; #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "Rational"; } virtual void logAttributes(std::ostream & stream) const override; diff --git a/poincare/include/poincare/real_part.h b/poincare/include/poincare/real_part.h index 787ad80b1..efdd3d1cb 100644 --- a/poincare/include/poincare/real_part.h +++ b/poincare/include/poincare/real_part.h @@ -13,7 +13,7 @@ public: size_t size() const override { return sizeof(RealPartNode); } int numberOfChildren() const override; #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "RealPart"; } #endif diff --git a/poincare/include/poincare/right_parenthesis_layout.h b/poincare/include/poincare/right_parenthesis_layout.h index fac6ad338..1f30b6140 100644 --- a/poincare/include/poincare/right_parenthesis_layout.h +++ b/poincare/include/poincare/right_parenthesis_layout.h @@ -27,7 +27,7 @@ public: // TreeNode size_t size() const override { return sizeof(RightParenthesisLayoutNode); } #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "RightParenthesisLayout"; } #endif diff --git a/poincare/include/poincare/right_square_bracket_layout.h b/poincare/include/poincare/right_square_bracket_layout.h index 62fabddb1..760e95fe9 100644 --- a/poincare/include/poincare/right_square_bracket_layout.h +++ b/poincare/include/poincare/right_square_bracket_layout.h @@ -21,7 +21,7 @@ public: // TreeNode size_t size() const override { return sizeof(RightSquareBracketLayoutNode); } #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "RightSquareBracketLayout"; } #endif diff --git a/poincare/include/poincare/round.h b/poincare/include/poincare/round.h index 158c2b36d..2d9ace90f 100644 --- a/poincare/include/poincare/round.h +++ b/poincare/include/poincare/round.h @@ -13,7 +13,7 @@ public: size_t size() const override { return sizeof(RoundNode); } int numberOfChildren() const override; #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "Round"; } #endif diff --git a/poincare/include/poincare/sign_function.h b/poincare/include/poincare/sign_function.h index f11b0fb13..fc3fc0da6 100644 --- a/poincare/include/poincare/sign_function.h +++ b/poincare/include/poincare/sign_function.h @@ -13,7 +13,7 @@ public: size_t size() const override { return sizeof(SignFunctionNode); } int numberOfChildren() const override; #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "SignFunction"; } #endif diff --git a/poincare/include/poincare/sine.h b/poincare/include/poincare/sine.h index 0239b50e0..2700c2211 100644 --- a/poincare/include/poincare/sine.h +++ b/poincare/include/poincare/sine.h @@ -14,7 +14,7 @@ public: size_t size() const override { return sizeof(SineNode); } int numberOfChildren() const override; #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "Sine"; } #endif diff --git a/poincare/include/poincare/square_root.h b/poincare/include/poincare/square_root.h index aeca57862..f92f0fc05 100644 --- a/poincare/include/poincare/square_root.h +++ b/poincare/include/poincare/square_root.h @@ -16,7 +16,7 @@ public: size_t size() const override { return sizeof(SquareRootNode); } int numberOfChildren() const override; #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "SquareRoot"; } #endif diff --git a/poincare/include/poincare/store.h b/poincare/include/poincare/store.h index 5c48f1b38..7a27bfa4c 100644 --- a/poincare/include/poincare/store.h +++ b/poincare/include/poincare/store.h @@ -12,7 +12,7 @@ public: // TreeNode size_t size() const override { return sizeof(StoreNode); } #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "Store"; } #endif diff --git a/poincare/include/poincare/subtraction.h b/poincare/include/poincare/subtraction.h index 53b77bc60..54bd71906 100644 --- a/poincare/include/poincare/subtraction.h +++ b/poincare/include/poincare/subtraction.h @@ -13,7 +13,7 @@ public: size_t size() const override { return sizeof(SubtractionNode); } int numberOfChildren() const override { return 2; } #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "Subtraction"; } #endif diff --git a/poincare/include/poincare/sum.h b/poincare/include/poincare/sum.h index e2dfcec88..72368e1f3 100644 --- a/poincare/include/poincare/sum.h +++ b/poincare/include/poincare/sum.h @@ -10,7 +10,7 @@ public: // TreeNode size_t size() const override { return sizeof(SumNode); } #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "Sum"; } #endif diff --git a/poincare/include/poincare/sum_layout.h b/poincare/include/poincare/sum_layout.h index 15a15fbff..382ab0ec5 100644 --- a/poincare/include/poincare/sum_layout.h +++ b/poincare/include/poincare/sum_layout.h @@ -16,7 +16,7 @@ public: int serialize(char * buffer, int bufferSize, Preferences::PrintFloatMode floatDisplayMode, int numberOfSignificantDigits) const override; size_t size() const override { return sizeof(SumLayoutNode); } #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "SumLayout"; } #endif diff --git a/poincare/include/poincare/symbol.h b/poincare/include/poincare/symbol.h index e441c8e27..9c78b8c43 100644 --- a/poincare/include/poincare/symbol.h +++ b/poincare/include/poincare/symbol.h @@ -14,7 +14,7 @@ public: // TreeNode int numberOfChildren() const override { return 0; } #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "Symbol"; } #endif diff --git a/poincare/include/poincare/symbol_abstract.h b/poincare/include/poincare/symbol_abstract.h index fab4c79a9..30d1edeb9 100644 --- a/poincare/include/poincare/symbol_abstract.h +++ b/poincare/include/poincare/symbol_abstract.h @@ -37,7 +37,7 @@ public: // TreeNode #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "SymbolAbstract"; } virtual void logAttributes(std::ostream & stream) const override { diff --git a/poincare/include/poincare/tangent.h b/poincare/include/poincare/tangent.h index 879d8b679..159f0acb1 100644 --- a/poincare/include/poincare/tangent.h +++ b/poincare/include/poincare/tangent.h @@ -13,7 +13,7 @@ public: size_t size() const override { return sizeof(TangentNode); } int numberOfChildren() const override; #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "Tangent"; } #endif diff --git a/poincare/include/poincare/undefined.h b/poincare/include/poincare/undefined.h index 83a7d8e3f..90f0078e3 100644 --- a/poincare/include/poincare/undefined.h +++ b/poincare/include/poincare/undefined.h @@ -11,7 +11,7 @@ public: // TreeNode size_t size() const override { return sizeof(UndefinedNode); } #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "Undefined"; } #endif diff --git a/poincare/include/poincare/unit.h b/poincare/include/poincare/unit.h index 97021c50c..81e9932c8 100644 --- a/poincare/include/poincare/unit.h +++ b/poincare/include/poincare/unit.h @@ -102,7 +102,7 @@ public: size_t size() const override { return sizeof(UnitNode); } int numberOfChildren() const override { return 0; } #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "Unit"; } virtual void logAttributes(std::ostream & stream) const override { diff --git a/poincare/include/poincare/unit_convert.h b/poincare/include/poincare/unit_convert.h index 7125b6ed3..5bad4df54 100644 --- a/poincare/include/poincare/unit_convert.h +++ b/poincare/include/poincare/unit_convert.h @@ -12,7 +12,7 @@ public: // TreeNode size_t size() const override { return sizeof(UnitConvertNode); } #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "UnivtConvert"; } #endif diff --git a/poincare/include/poincare/unreal.h b/poincare/include/poincare/unreal.h index 283013752..4b31ef182 100644 --- a/poincare/include/poincare/unreal.h +++ b/poincare/include/poincare/unreal.h @@ -11,7 +11,7 @@ public: // TreeNode size_t size() const override { return sizeof(UnrealNode); } #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "Unreal"; } #endif diff --git a/poincare/include/poincare/vertical_offset_layout.h b/poincare/include/poincare/vertical_offset_layout.h index 5a36cc666..4411667e3 100644 --- a/poincare/include/poincare/vertical_offset_layout.h +++ b/poincare/include/poincare/vertical_offset_layout.h @@ -38,7 +38,7 @@ public: size_t size() const override { return sizeof(VerticalOffsetLayoutNode); } int numberOfChildren() const override { return 1; } #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << (m_position == Position::Subscript ? "Subscript" : "Superscript"); } #endif diff --git a/poincare/test/tree/blob_node.h b/poincare/test/tree/blob_node.h index 6bbd86395..d5584ee73 100644 --- a/poincare/test/tree/blob_node.h +++ b/poincare/test/tree/blob_node.h @@ -13,7 +13,7 @@ public: int data() { return m_data; } virtual int numberOfChildren() const override { return 0; } #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "Blob"; } #endif diff --git a/poincare/test/tree/pair_node.h b/poincare/test/tree/pair_node.h index a6eb9dd06..0d9229eff 100644 --- a/poincare/test/tree/pair_node.h +++ b/poincare/test/tree/pair_node.h @@ -12,7 +12,7 @@ public: virtual size_t size() const override { return sizeof(PairNode); } virtual int numberOfChildren() const override { return 2; } #if POINCARE_TREE_LOG - virtual void logNodeName(std::ostream & stream) const override { + void logNodeName(std::ostream & stream) const override { stream << "Pair"; } #endif