use auto keyword

This commit is contained in:
Eduardo Bart 2011-04-02 18:36:45 -03:00
parent d29b139321
commit 15147c4d2c
2 changed files with 5 additions and 5 deletions

View File

@ -111,7 +111,7 @@ void ConfigManager::setValue(const std::string &key, bool value)
const std::string &ConfigManager::getString(const std::string &key) const std::string &ConfigManager::getString(const std::string &key)
{ {
std::map<std::string, std::string>::iterator iter = m_confsMap.find(key); auto iter = m_confsMap.find(key);
if(iter == m_confsMap.end()) { if(iter == m_confsMap.end()) {
warning("Config value %s not found", key.c_str()); warning("Config value %s not found", key.c_str());
static std::string emptystr; static std::string emptystr;
@ -122,7 +122,7 @@ const std::string &ConfigManager::getString(const std::string &key)
float ConfigManager::getFloat(const std::string &key) float ConfigManager::getFloat(const std::string &key)
{ {
std::map<std::string, std::string>::iterator iter = m_confsMap.find(key); auto iter = m_confsMap.find(key);
if(iter == m_confsMap.end()) { if(iter == m_confsMap.end()) {
warning("Config value %s not found", key.c_str()); warning("Config value %s not found", key.c_str());
return 0; return 0;
@ -132,7 +132,7 @@ float ConfigManager::getFloat(const std::string &key)
bool ConfigManager::getBoolean(const std::string &key) bool ConfigManager::getBoolean(const std::string &key)
{ {
std::map<std::string, std::string>::iterator iter = m_confsMap.find(key); auto iter = m_confsMap.find(key);
if(iter == m_confsMap.end()) { if(iter == m_confsMap.end()) {
warning("Config value %s not found", key.c_str()); warning("Config value %s not found", key.c_str());
return 0; return 0;
@ -142,7 +142,7 @@ bool ConfigManager::getBoolean(const std::string &key)
int ConfigManager::getInteger(const std::string &key) int ConfigManager::getInteger(const std::string &key)
{ {
std::map<std::string, std::string>::iterator iter = m_confsMap.find(key); auto iter = m_confsMap.find(key);
if(iter == m_confsMap.end()) { if(iter == m_confsMap.end()) {
warning("Config value %s not found", key.c_str()); warning("Config value %s not found", key.c_str());
return 0; return 0;

View File

@ -43,7 +43,7 @@ TexturePtr TextureManager::get(const std::string& textureFile)
TexturePtr texture; TexturePtr texture;
// check if the texture is already loaded // check if the texture is already loaded
TexturesMap::iterator it = m_texturesMap.find(textureFile); auto it = m_texturesMap.find(textureFile);
if(it != m_texturesMap.end()) { if(it != m_texturesMap.end()) {
if(it->second.expired()) if(it->second.expired())
m_texturesMap.erase(it); m_texturesMap.erase(it);