From 272f317bb0817ec46ecfae9696457ec84b8ec55c Mon Sep 17 00:00:00 2001
From: Syndamia <kamen@syndamia.com>
Date: Mon, 30 May 2022 17:57:35 +0300
Subject: Autocommit at 30.05.2022 @ 17:57

---
 src/Models/CellFormula.h | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'src/Models/CellFormula.h')

diff --git a/src/Models/CellFormula.h b/src/Models/CellFormula.h
index 3387c4a..9fd07a5 100644
--- a/src/Models/CellFormula.h
+++ b/src/Models/CellFormula.h
@@ -7,24 +7,21 @@
 #include "../Generic/Pair/Pair.hpp"
 
 class CellFormula : public Cell {
-	struct CellLoc {
-		int firstInd;
-		int secondInd;
-	};
 	const List<List<Cell*>>* tableCells;
 	List<CellDouble> localCells;
 
-	List<Pair<CellLoc, char>> formula;
+	List<Pair<Pair<int, int>, char>> formula;
 	String rawFormula;
 
-	double calculate(unsigned index = 0);
+	const Cell* ptrByInd(int firstInd, int secondInd) const;
+	double calculate(unsigned index = 0) const;
 
 public:
 	CellFormula() = default;
 	CellFormula(const char* str, const List<List<Cell*>>* tableCells);
 
-	double getNumeralValue() override;
-	String getValueForPrint() override;
+	double getNumeralValue() const override;
+	String getValueForPrint() const override;
 	void parseAndSetValue(const char* str) override;
 	void readFromFile(std::ifstream& file) override;
 	void writeToFile(std::ofstream& file) override;
-- 
cgit v1.3.1-26-gb76a