Fix all compile errors, remove OperateIOProxy requirement from DataStream api

1 files changed, 6 insertions, 9 deletions

diff --git a/core/src/Model/Template/TableTemplate.hpp b/core/src/Model/Template/TableTemplate.hpp
index c6617b0..8771867 100644
--- a/core/src/Model/Template/TableTemplate.hpp
+++ b/core/src/Model/Template/TableTemplate.hpp
@@ -54,8 +54,8 @@ public:
 	/// Return whether this cell is a part of a merged range or not. Includes the primary cell.
 	bool IsMergedCell() const;
 
-	template <class TProxy>
-	void OperateIOProxy(TProxy& proxy);
+	void ReadFromDataStream(InputDataStream& stream);
+	void WriteToDataStream(OutputDataStream& stream) const;
 };
 
 // TODO support reverse (bottom to top) filling order
@@ -109,8 +109,8 @@ public:
 	Vec2i FindCell(std::string_view name);
 	bool UpdateCellName(std::string_view oldName, std::string_view newName);
 
-	template <class TProxy>
-	void OperateIOProxy(TProxy& proxy);
+	void ReadFromDataStream(InputDataStream& stream);
+	void WriteToDataStream(OutputDataStream& stream) const;
 };
 
 // Forward declaration of libxlsxwriter structs
@@ -148,6 +148,7 @@ class TableTemplate : public Template
 {
 	friend class TableSingleParamsIter;
 	friend class TableArrayGroupsIter;
+	class Private;
 
 private:
 	/// Map from parameter name to index of the parameter cell (stored in mCells).
@@ -218,9 +219,5 @@ public:
 	lxw_worksheet* InstantiateToExcelWorksheet(lxw_workbook* workbook, const TableInstantiationParameters& params) const;
 
 	void ReadFromDataStream(InputDataStream& stream) override;
-	void WriteToDataStream(OutputDataStream& stream) override;
-
-private:
-	template <class TProxy>
-	void OperateIOProxy(TProxy& proxy);
+	void WriteToDataStream(OutputDataStream& stream) const override;
 };