From e03e7717e9b0c3796cb552a4c9dd08d8d81e1f34 Mon Sep 17 00:00:00 2001 From: Ruben Dashyan Date: Tue, 23 Jul 2019 16:52:18 +0200 Subject: [PATCH] [apps/shared/expression_model] Mark updateNewDataWithExpression's Expression parameter as const --- apps/sequence/sequence.cpp | 2 +- apps/sequence/sequence.h | 2 +- apps/shared/expression_model.cpp | 2 +- apps/shared/expression_model.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/sequence/sequence.cpp b/apps/sequence/sequence.cpp index 3f0a86a29..9f3e5cab7 100644 --- a/apps/sequence/sequence.cpp +++ b/apps/sequence/sequence.cpp @@ -216,7 +216,7 @@ Poincare::Layout Sequence::SequenceModel::name(Sequence * sequence) { return m_name; } -void Sequence::SequenceModel::updateNewDataWithExpression(Ion::Storage::Record * record, Expression & expressionToStore, void * expressionAddress, size_t newExpressionSize, size_t previousExpressionSize) { +void Sequence::SequenceModel::updateNewDataWithExpression(Ion::Storage::Record * record, const Expression & expressionToStore, void * expressionAddress, size_t newExpressionSize, size_t previousExpressionSize) { Ion::Storage::Record::Data newData = record->value(); // Translate expressions located downstream size_t sizeBeforeExpression = (char *)expressionAddress -(char *)newData.buffer; diff --git a/apps/sequence/sequence.h b/apps/sequence/sequence.h index 97b5354d9..749cc93a0 100644 --- a/apps/sequence/sequence.h +++ b/apps/sequence/sequence.h @@ -119,7 +119,7 @@ private: virtual void buildName(Sequence * sequence) = 0; Poincare::Layout m_name; private: - void updateNewDataWithExpression(Ion::Storage::Record * record, Poincare::Expression & newExpression, void * expressionAddress, size_t newExpressionSize, size_t previousExpressionSize) override; + void updateNewDataWithExpression(Ion::Storage::Record * record, const Poincare::Expression & expressionToStore, void * expressionAddress, size_t newExpressionSize, size_t previousExpressionSize) override; virtual void updateMetaData(const Ion::Storage::Record * record, size_t newSize) {} }; diff --git a/apps/shared/expression_model.cpp b/apps/shared/expression_model.cpp index 13219378c..2734b3d12 100644 --- a/apps/shared/expression_model.cpp +++ b/apps/shared/expression_model.cpp @@ -110,7 +110,7 @@ Ion::Storage::Record::ErrorStatus ExpressionModel::setExpressionContent(Ion::Sto return error; } -void ExpressionModel::updateNewDataWithExpression(Ion::Storage::Record * record, Expression & expressionToStore, void * expressionAddress, size_t expressionToStoreSize, size_t previousExpressionSize) { +void ExpressionModel::updateNewDataWithExpression(Ion::Storage::Record * record, const Expression & expressionToStore, void * expressionAddress, size_t expressionToStoreSize, size_t previousExpressionSize) { if (!expressionToStore.isUninitialized()) { memmove(expressionAddress, expressionToStore.addressInPool(), expressionToStoreSize); } diff --git a/apps/shared/expression_model.h b/apps/shared/expression_model.h index c04e7f297..e6a4f08bb 100644 --- a/apps/shared/expression_model.h +++ b/apps/shared/expression_model.h @@ -32,7 +32,7 @@ protected: mutable Poincare::Expression m_expression; mutable Poincare::Layout m_layout; private: - virtual void updateNewDataWithExpression(Ion::Storage::Record * record, Poincare::Expression & expressionToStore, void * expressionAddress, size_t expressionToStoreSize, size_t previousExpressionSize); + virtual void updateNewDataWithExpression(Ion::Storage::Record * record, const Poincare::Expression & expressionToStore, void * expressionAddress, size_t expressionToStoreSize, size_t previousExpressionSize); virtual size_t expressionSize(const Ion::Storage::Record * record) const = 0; mutable int m_circular; };