[Scummvm-git-logs] scummvm master -> 7121da63b9f0a82ae558ca806d6bc5766089f09e
mduggan
mgithub at guarana.org
Sat Mar 28 09:23:39 UTC 2020
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
7121da63b9 ULTIMA8: Constify every iterator where it makes sense
Commit: 7121da63b9f0a82ae558ca806d6bc5766089f09e
https://github.com/scummvm/scummvm/commit/7121da63b9f0a82ae558ca806d6bc5766089f09e
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-03-28T18:18:24+09:00
Commit Message:
ULTIMA8: Constify every iterator where it makes sense
Changed paths:
engines/ultima/ultima8/filesys/file_system.cpp
engines/ultima/ultima8/games/game_data.cpp
engines/ultima/ultima8/games/treasure_loader.cpp
engines/ultima/ultima8/graphics/fonts/font_shape_archive.cpp
engines/ultima/ultima8/graphics/fonts/jp_rendered_text.cpp
engines/ultima/ultima8/graphics/fonts/shape_rendered_text.cpp
engines/ultima/ultima8/gumps/gump.h
engines/ultima/ultima8/kernel/allocator.h
engines/ultima/ultima8/kernel/kernel.cpp
engines/ultima/ultima8/kernel/object_manager.cpp
engines/ultima/ultima8/kernel/segmented_allocator.cpp
engines/ultima/ultima8/kernel/segmented_allocator.h
engines/ultima/ultima8/misc/debugger.cpp
engines/ultima/ultima8/usecode/uc_machine.cpp
engines/ultima/ultima8/usecode/uc_machine.h
engines/ultima/ultima8/world/actors/actor.cpp
engines/ultima/ultima8/world/world.cpp
diff --git a/engines/ultima/ultima8/filesys/file_system.cpp b/engines/ultima/ultima8/filesys/file_system.cpp
index e83be8f94c..34c4b3c86f 100644
--- a/engines/ultima/ultima8/filesys/file_system.cpp
+++ b/engines/ultima/ultima8/filesys/file_system.cpp
@@ -256,7 +256,7 @@ bool FileSystem::RemoveVirtualPath(const string &vpath) {
IDataSource *FileSystem::checkBuiltinData(const Std::string &vfn, bool is_text) {
// Is it a Memory file?
- Std::map<Common::String, MemoryFile *>::iterator mf = _memoryFiles.find(vfn);
+ Std::map<Common::String, MemoryFile *>::const_iterator mf = _memoryFiles.find(vfn);
if (mf != _memoryFiles.end())
return new IBufferDataSource(mf->_value->_data,
diff --git a/engines/ultima/ultima8/games/game_data.cpp b/engines/ultima/ultima8/games/game_data.cpp
index 41cf3c91c3..a5ec71c25a 100644
--- a/engines/ultima/ultima8/games/game_data.cpp
+++ b/engines/ultima/ultima8/games/game_data.cpp
@@ -373,7 +373,7 @@ void GameData::setupJPOverrides() {
ConfigFileManager *config = ConfigFileManager::get_instance();
FontManager *fontmanager = FontManager::get_instance();
KeyMap jpkeyvals;
- KeyMap::iterator iter;
+ KeyMap::const_iterator iter;
jpkeyvals = config->listKeyValues("language/jpfonts");
for (iter = jpkeyvals.begin(); iter != jpkeyvals.end(); ++iter) {
@@ -407,7 +407,7 @@ void GameData::setupTTFOverrides(const char *configkey, bool SJIS) {
SettingManager *settingman = SettingManager::get_instance();
FontManager *fontmanager = FontManager::get_instance();
KeyMap ttfkeyvals;
- KeyMap::iterator iter;
+ KeyMap::const_iterator iter;
bool ttfoverrides = false;
settingman->get("ttf", ttfoverrides);
diff --git a/engines/ultima/ultima8/games/treasure_loader.cpp b/engines/ultima/ultima8/games/treasure_loader.cpp
index 3611add12a..aa198bb9f9 100644
--- a/engines/ultima/ultima8/games/treasure_loader.cpp
+++ b/engines/ultima/ultima8/games/treasure_loader.cpp
@@ -41,7 +41,7 @@ void TreasureLoader::loadDefaults() {
// load default treasure types
lootkeyvals = config->listKeyValues("game/treasure");
- KeyMap::iterator defaultiter;
+ KeyMap::const_iterator defaultiter;
for (defaultiter = lootkeyvals.begin();
defaultiter != lootkeyvals.end(); ++defaultiter) {
TreasureInfo ti;
@@ -121,7 +121,7 @@ bool TreasureLoader::internalParse(const Std::string &desc, TreasureInfo &ti,
} else if (key == "type" && !loadingDefault) {
if (loadedDefault)
return false;
- TreasureMap::iterator iter;
+ TreasureMap::const_iterator iter;
iter = _defaultTreasure.find(val);
if (iter != _defaultTreasure.end())
ti = iter->_value;
diff --git a/engines/ultima/ultima8/graphics/fonts/font_shape_archive.cpp b/engines/ultima/ultima8/graphics/fonts/font_shape_archive.cpp
index dd614b3ba1..7afa0e318d 100644
--- a/engines/ultima/ultima8/graphics/fonts/font_shape_archive.cpp
+++ b/engines/ultima/ultima8/graphics/fonts/font_shape_archive.cpp
@@ -67,7 +67,7 @@ void FontShapeArchive::setHVLeads() {
ConfigFileManager *config = ConfigFileManager::get_instance();
KeyMap leadkeyvals = config->listKeyValues("game/fontleads");
- KeyMap::iterator iter;
+ KeyMap::const_iterator iter;
for (iter = leadkeyvals.begin(); iter != leadkeyvals.end(); ++iter) {
int fontnum = Std::atoi(iter->_key.c_str());
diff --git a/engines/ultima/ultima8/graphics/fonts/jp_rendered_text.cpp b/engines/ultima/ultima8/graphics/fonts/jp_rendered_text.cpp
index 1926fd6da4..cdca4cfd19 100644
--- a/engines/ultima/ultima8/graphics/fonts/jp_rendered_text.cpp
+++ b/engines/ultima/ultima8/graphics/fonts/jp_rendered_text.cpp
@@ -55,7 +55,7 @@ void JPRenderedText::draw(RenderSurface *surface, int x, int y, bool /*destmaske
const Palette *savepal = _font->getPalette();
_font->setPalette(pal);
- Std::list<PositionedText>::iterator iter;
+ Std::list<PositionedText>::const_iterator iter;
for (iter = _lines.begin(); iter != _lines.end(); ++iter) {
int line_x = x + iter->_dims.x;
@@ -100,7 +100,7 @@ void JPRenderedText::drawBlended(RenderSurface *surface, int x, int y,
const Palette *savepal = _font->getPalette();
_font->setPalette(pal);
- Std::list<PositionedText>::iterator iter;
+ Std::list<PositionedText>::const_iterator iter;
for (iter = _lines.begin(); iter != _lines.end(); ++iter) {
int line_x = x + iter->_dims.x;
diff --git a/engines/ultima/ultima8/graphics/fonts/shape_rendered_text.cpp b/engines/ultima/ultima8/graphics/fonts/shape_rendered_text.cpp
index 87e83aea5b..ffa9ad3430 100644
--- a/engines/ultima/ultima8/graphics/fonts/shape_rendered_text.cpp
+++ b/engines/ultima/ultima8/graphics/fonts/shape_rendered_text.cpp
@@ -47,7 +47,7 @@ ShapeRenderedText::~ShapeRenderedText() {
void ShapeRenderedText::draw(RenderSurface *surface, int x, int y, bool /*destmasked*/) {
// TODO support masking here???
- Std::list<PositionedText>::iterator iter;
+ Std::list<PositionedText>::const_iterator iter;
for (iter = _lines.begin(); iter != _lines.end(); ++iter) {
int line_x = x + iter->_dims.x;
@@ -78,7 +78,7 @@ void ShapeRenderedText::drawBlended(RenderSurface *surface, int x, int y,
uint32 col, bool /*destmasked*/) {
// TODO Support masking here ????
- Std::list<PositionedText>::iterator iter;
+ Std::list<PositionedText>::const_iterator iter;
for (iter = _lines.begin(); iter != _lines.end(); ++iter) {
int line_x = x + iter->_dims.x;
diff --git a/engines/ultima/ultima8/gumps/gump.h b/engines/ultima/ultima8/gumps/gump.h
index 6d7983f789..169c1281b1 100644
--- a/engines/ultima/ultima8/gumps/gump.h
+++ b/engines/ultima/ultima8/gumps/gump.h
@@ -195,7 +195,7 @@ public:
virtual void Close(bool no_del = false);
//! Check to see if a Gump is Closing
- bool IsClosing() {
+ bool IsClosing() const {
return (_flags & FLAG_CLOSING) != 0;
}
diff --git a/engines/ultima/ultima8/kernel/allocator.h b/engines/ultima/ultima8/kernel/allocator.h
index 92b5a1ea2b..87197678df 100644
--- a/engines/ultima/ultima8/kernel/allocator.h
+++ b/engines/ultima/ultima8/kernel/allocator.h
@@ -45,7 +45,7 @@ public:
virtual size_t getCapacity() = 0;
- virtual void printInfo() = 0;
+ virtual void printInfo() const = 0;
};
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/kernel/kernel.cpp b/engines/ultima/ultima8/kernel/kernel.cpp
index 197f5616d0..708029be2d 100644
--- a/engines/ultima/ultima8/kernel/kernel.cpp
+++ b/engines/ultima/ultima8/kernel/kernel.cpp
@@ -249,7 +249,7 @@ void Kernel::processTypes() {
Process *p = *it;
processtypes[p->GetClassType()._className]++;
}
- Std::map<Common::String, unsigned int>::iterator iter;
+ Std::map<Common::String, unsigned int>::const_iterator iter;
for (iter = processtypes.begin(); iter != processtypes.end(); ++iter) {
g_debugger->debugPrintf("%s: %u\n", (*iter)._key.c_str(), (*iter)._value);
}
diff --git a/engines/ultima/ultima8/kernel/object_manager.cpp b/engines/ultima/ultima8/kernel/object_manager.cpp
index fe3a38e7c7..8666f25f03 100644
--- a/engines/ultima/ultima8/kernel/object_manager.cpp
+++ b/engines/ultima/ultima8/kernel/object_manager.cpp
@@ -150,7 +150,7 @@ void ObjectManager::objectTypes() {
objecttypes[o->GetClassType()._className]++;
}
- Std::map<Common::String, unsigned int>::iterator iter;
+ Std::map<Common::String, unsigned int>::const_iterator iter;
for (iter = objecttypes.begin(); iter != objecttypes.end(); ++iter) {
g_debugger->debugPrintf("%s: %u\n", (*iter)._key.c_str(), (*iter)._value);
}
diff --git a/engines/ultima/ultima8/kernel/segmented_allocator.cpp b/engines/ultima/ultima8/kernel/segmented_allocator.cpp
index d1c628083c..4b30661c97 100644
--- a/engines/ultima/ultima8/kernel/segmented_allocator.cpp
+++ b/engines/ultima/ultima8/kernel/segmented_allocator.cpp
@@ -93,8 +93,8 @@ void SegmentedAllocator::freeResources() {
}
}
-void SegmentedAllocator::printInfo() {
- Std::vector<SegmentedPool *>::iterator it;
+void SegmentedAllocator::printInfo() const {
+ Std::vector<SegmentedPool *>::const_iterator it;
int i = 0;
pout << "Pools: " << _pools.size() << Std::endl;
diff --git a/engines/ultima/ultima8/kernel/segmented_allocator.h b/engines/ultima/ultima8/kernel/segmented_allocator.h
index ecd39e0245..59443d9709 100644
--- a/engines/ultima/ultima8/kernel/segmented_allocator.h
+++ b/engines/ultima/ultima8/kernel/segmented_allocator.h
@@ -48,7 +48,7 @@ public:
return _nodeCapacity;
}
- void printInfo() override;
+ void printInfo() const override;
private:
Std::vector<SegmentedPool *> _pools;
diff --git a/engines/ultima/ultima8/misc/debugger.cpp b/engines/ultima/ultima8/misc/debugger.cpp
index 38d67edeb7..1d36bb2e99 100644
--- a/engines/ultima/ultima8/misc/debugger.cpp
+++ b/engines/ultima/ultima8/misc/debugger.cpp
@@ -262,9 +262,9 @@ bool Debugger::cmdListGames(int argc, const char **argv) {
Ultima8Engine *app = Ultima8Engine::get_instance();
Std::vector<istring> games;
games = app->_settingMan->listGames();
- Std::vector<istring>::iterator iter;
+ Std::vector<istring>::const_iterator iter;
for (iter = games.begin(); iter != games.end(); ++iter) {
- istring _game = *iter;
+ const istring &_game = *iter;
GameInfo *info = app->getGameInfo(_game);
debugPrintf("%s: ", _game.c_str());
if (info) {
@@ -392,7 +392,7 @@ bool Debugger::cmdListSFX(int argc, const char **argv) {
debugPrintf("Error: No AudioProcess\n");
} else {
- Std::list<AudioProcess::SampleInfo>::iterator it;
+ Std::list<AudioProcess::SampleInfo>::const_iterator it;
for (it = ap->_sampleInfo.begin(); it != ap->_sampleInfo.end(); ++it) {
debugPrintf("Sample: num %d, obj %d, loop %d, prio %d",
it->_sfxNum, it->_objId, it->_loops, it->_priority);
@@ -1041,7 +1041,7 @@ bool Debugger::cmdListMarks(int argc, const char **argv) {
SettingManager *settings = SettingManager::get_instance();
Std::vector<istring> marks;
marks = settings->listDataKeys("marks");
- for (Std::vector<istring>::iterator iter = marks.begin();
+ for (Std::vector<istring>::const_iterator iter = marks.begin();
iter != marks.end(); ++iter) {
debugPrintf("%s\n", iter->c_str());
}
diff --git a/engines/ultima/ultima8/usecode/uc_machine.cpp b/engines/ultima/ultima8/usecode/uc_machine.cpp
index 206be79772..8b4d4719b8 100644
--- a/engines/ultima/ultima8/usecode/uc_machine.cpp
+++ b/engines/ultima/ultima8/usecode/uc_machine.cpp
@@ -2199,17 +2199,17 @@ uint16 UCMachine::ptrToObject(uint32 ptr) {
}
}
-void UCMachine::usecodeStats() {
+void UCMachine::usecodeStats() const {
g_debugger->debugPrintf("Usecode Machine memory stats:\n");
g_debugger->debugPrintf("Strings : %u/65534\n", _stringHeap.size());
#ifdef DUMPHEAP
- Std::map<uint16, Std::string>::iterator iter;
+ Std::map<uint16, Std::string>::const_iterator iter;
for (iter = _stringHeap.begin(); iter != _stringHeap.end(); ++iter)
g_debugger->debugPrintf("%d:%s\n", iter->_key << ":" << iter->_value.c_str());
#endif
g_debugger->debugPrintf("Lists : %u/65534\n", _listHeap.size());
#ifdef DUMPHEAP
- Std::map<uint16, UCList *>::iterator iterl;
+ Std::map<uint16, UCList *>::const_iterator iterl;
for (iterl = _listHeap.begin(); iterl != _listHeap.end(); ++iterl) {
if (!iterl->_value) {
g_debugger->debugPrintf("%d: <null>\n", iterl->_key);
diff --git a/engines/ultima/ultima8/usecode/uc_machine.h b/engines/ultima/ultima8/usecode/uc_machine.h
index 2b282c33f2..6370540962 100644
--- a/engines/ultima/ultima8/usecode/uc_machine.h
+++ b/engines/ultima/ultima8/usecode/uc_machine.h
@@ -63,7 +63,7 @@ public:
uint16 duplicateString(uint16 str);
- void usecodeStats();
+ void usecodeStats() const;
static uint32 listToPtr(uint16 l);
static uint32 stringToPtr(uint16 s);
diff --git a/engines/ultima/ultima8/world/actors/actor.cpp b/engines/ultima/ultima8/world/actors/actor.cpp
index 60ae48fcf4..03fefebfb0 100644
--- a/engines/ultima/ultima8/world/actors/actor.cpp
+++ b/engines/ultima/ultima8/world/actors/actor.cpp
@@ -366,8 +366,7 @@ bool Actor::setEquip(Item *item, bool checkwghtvol) {
// now check 'equipment slots'
// we can have one item of each equipment type, plus one backpack
- Std::list<Item *>::iterator iter;
- for (iter = _contents.begin(); iter != _contents.end(); ++iter) {
+ for (Std::list<Item *>::const_iterator iter = _contents.begin(); iter != _contents.end(); ++iter) {
if ((*iter)->getObjId() == item->getObjId()) continue;
uint32 cet = (*iter)->getShapeInfo()->_equipType;
diff --git a/engines/ultima/ultima8/world/world.cpp b/engines/ultima/ultima8/world/world.cpp
index cb38db4938..74619c77c5 100644
--- a/engines/ultima/ultima8/world/world.cpp
+++ b/engines/ultima/ultima8/world/world.cpp
@@ -346,7 +346,7 @@ void World::save(ODataSource *ods) {
// empty stack and refill it again
uint16 *e = new uint16[es];
- Std::list<ObjId>::iterator it = _ethereal.begin();
+ Std::list<ObjId>::const_iterator it = _ethereal.begin();
unsigned int i;
for (i = 0; i < es; ++i) {
e[es - i] = *it;
More information about the Scummvm-git-logs
mailing list