[Refactor] #3654 お作法的にconstなイテレータを返すメソッドは元のvector/map でもconst なイテレータを返すメソッドを叩くようにした

diff --git a/src/system/artifact-type-definition.cpp b/src/system/artifact-type-definition.cpp
index 679e5f2..a9c2067 100644 (file)
--- a/src/system/artifact-type-definition.cpp
+++ b/src/system/artifact-type-definition.cpp
@@ -52,12 +52,12 @@ std::map<FixedArtifactId, ArtifactType>::iterator ArtifactList::end()
 
 std::map<FixedArtifactId, ArtifactType>::const_iterator ArtifactList::begin() const
 {
-    return this->artifacts.begin();
+    return this->artifacts.cbegin();
 }
 
 std::map<FixedArtifactId, ArtifactType>::const_iterator ArtifactList::end() const
 {
-    return this->artifacts.end();
+    return this->artifacts.cend();
 }
 
 std::map<FixedArtifactId, ArtifactType>::reverse_iterator ArtifactList::rbegin()
@@ -72,12 +72,12 @@ std::map<FixedArtifactId, ArtifactType>::reverse_iterator ArtifactList::rend()
 
 std::map<FixedArtifactId, ArtifactType>::const_reverse_iterator ArtifactList::rbegin() const
 {
-    return this->artifacts.rbegin();
+    return this->artifacts.crbegin();
 }
 
 std::map<FixedArtifactId, ArtifactType>::const_reverse_iterator ArtifactList::rend() const
 {
-    return this->artifacts.rend();
+    return this->artifacts.crend();
 }
 
 std::map<FixedArtifactId, ArtifactType> &ArtifactList::get_raw_map()

diff --git a/src/system/monster-race-info.cpp b/src/system/monster-race-info.cpp
index 1f3cad7..1ad7b52 100644 (file)
--- a/src/system/monster-race-info.cpp
+++ b/src/system/monster-race-info.cpp
@@ -267,7 +267,7 @@ std::map<MonsterRaceId, MonsterRaceInfo>::iterator MonraceList::begin()
 
 std::map<MonsterRaceId, MonsterRaceInfo>::const_iterator MonraceList::begin() const
 {
-    return monraces_info.begin();
+    return monraces_info.cbegin();
 }
 
 std::map<MonsterRaceId, MonsterRaceInfo>::iterator MonraceList::end()
@@ -277,7 +277,7 @@ std::map<MonsterRaceId, MonsterRaceInfo>::iterator MonraceList::end()
 
 std::map<MonsterRaceId, MonsterRaceInfo>::const_iterator MonraceList::end() const
 {
-    return monraces_info.end();
+    return monraces_info.cend();
 }
 
 std::map<MonsterRaceId, MonsterRaceInfo>::reverse_iterator MonraceList::rbegin()
@@ -287,7 +287,7 @@ std::map<MonsterRaceId, MonsterRaceInfo>::reverse_iterator MonraceList::rbegin()
 
 std::map<MonsterRaceId, MonsterRaceInfo>::const_reverse_iterator MonraceList::rbegin() const
 {
-    return monraces_info.rbegin();
+    return monraces_info.crbegin();
 }
 
 std::map<MonsterRaceId, MonsterRaceInfo>::reverse_iterator MonraceList::rend()
@@ -297,7 +297,7 @@ std::map<MonsterRaceId, MonsterRaceInfo>::reverse_iterator MonraceList::rend()
 
 std::map<MonsterRaceId, MonsterRaceInfo>::const_reverse_iterator MonraceList::rend() const
 {
-    return monraces_info.rend();
+    return monraces_info.crend();
 }
 
 MonsterRaceInfo &MonraceList::get_monrace(MonsterRaceId monrace_id)

diff --git a/src/system/terrain-type-definition.cpp b/src/system/terrain-type-definition.cpp
index 64fc209..f1f8054 100644 (file)
--- a/src/system/terrain-type-definition.cpp
+++ b/src/system/terrain-type-definition.cpp
@@ -86,7 +86,7 @@ std::vector<TerrainType>::iterator TerrainList::begin()
 
 std::vector<TerrainType>::const_iterator TerrainList::begin() const
 {
-    return this->terrains.begin();
+    return this->terrains.cbegin();
 }
 
 std::vector<TerrainType>::reverse_iterator TerrainList::rbegin()
@@ -96,7 +96,7 @@ std::vector<TerrainType>::reverse_iterator TerrainList::rbegin()
 
 std::vector<TerrainType>::const_reverse_iterator TerrainList::rbegin() const
 {
-    return this->terrains.rbegin();
+    return this->terrains.crbegin();
 }
 
 std::vector<TerrainType>::iterator TerrainList::end()
@@ -106,7 +106,7 @@ std::vector<TerrainType>::iterator TerrainList::end()
 
 std::vector<TerrainType>::const_iterator TerrainList::end() const
 {
-    return this->terrains.end();
+    return this->terrains.cend();
 }
 
 std::vector<TerrainType>::reverse_iterator TerrainList::rend()
@@ -116,7 +116,7 @@ std::vector<TerrainType>::reverse_iterator TerrainList::rend()
 
 std::vector<TerrainType>::const_reverse_iterator TerrainList::rend() const
 {
-    return this->terrains.rend();
+    return this->terrains.crend();
 }
 
 size_t TerrainList::size() const