Const correctness

otland · Nov 6, 2024 · 4d314b9 · 4d314b9
1 parent d63140f
commit 4d314b9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/container.cpp b/src/container.cpp
@@ -103,7 +103,7 @@ void Container::unserializeItemNode(OTB::iterator& first, const OTB::iterator la
 {
 	Item::unserializeItemNode(first, last, node);
 
-	for (auto& itemNode : node.children) {
+	for (const auto& itemNode : node.children) {
 		// load container items
 		if (itemNode.type != tfs::io::map::OTBM_ITEM) [[unlikely]] {
 			throw std::invalid_argument("Invalid node type");

diff --git a/src/iomap.cpp b/src/iomap.cpp
@@ -134,7 +134,7 @@ void parseTileArea(const OTB::Node& node, Map& map)
 	auto first = node.propsBegin;
 	auto [base_x, base_y, z] = read_coords(first, node.propsEnd);
 
-	for (auto& tileNode : node.children) {
+	for (const auto& tileNode : node.children) {
 		if (tileNode.type != OTBM_TILE && tileNode.type != OTBM_HOUSETILE) [[unlikely]] {
 			throw std::invalid_argument(fmt::format("Unknown tile node: {:d}.", static_cast<uint16_t>(node.type)));
 		}
@@ -264,7 +264,7 @@ void parseTileArea(const OTB::Node& node, Map& map)
 
 void parseTowns(const OTB::Node& townsNode, Map& map)
 {
-	for (auto& node : townsNode.children) {
+	for (const auto& node : townsNode.children) {
 		if (node.type != OTBM_TOWN) [[unlikely]] {
 			throw std::invalid_argument(fmt::format("Unknown town node: {:d}.", static_cast<uint16_t>(node.type)));
 		}
@@ -280,8 +280,7 @@ void parseTowns(const OTB::Node& townsNode, Map& map)
 
 void parseWaypoints(const OTB::Node& waypointsNode, Map& map)
 {
-	PropStream propStream;
-	for (auto& node : waypointsNode.children) {
+	for (const auto& node : waypointsNode.children) {
 		if (node.type != OTBM_WAYPOINT) [[unlikely]] {
 			throw std::invalid_argument(fmt::format("Unknown waypoint node: {:d}.", static_cast<uint16_t>(node.type)));
 		}
@@ -360,7 +359,7 @@ MapAttributes loadMap(Map& map, std::filesystem::path fileName)
 		houses = fileName.stem().concat("-house.xml");
 	}
 
-	for (auto& node : mapNode.children) {
+	for (const auto& node : mapNode.children) {
 		switch (node.type) {
 			case OTBM_TILE_AREA:
 				parseTileArea(node, map);