summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-04-16 22:32:39 +0200
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-04-16 22:53:10 +0200
commit18cba14c0f80f6ae7db883ce4d6abbf24728f07d (patch)
treefe67a7d059647d23d7285f90fb5b8aca076311de /src/resources
parent255c491375005abb1d2de22fa5aa1a821ac3a4f6 (diff)
downloadmana-client-18cba14c0f80f6ae7db883ce4d6abbf24728f07d.tar.gz
mana-client-18cba14c0f80f6ae7db883ce4d6abbf24728f07d.tar.bz2
mana-client-18cba14c0f80f6ae7db883ce4d6abbf24728f07d.tar.xz
mana-client-18cba14c0f80f6ae7db883ce4d6abbf24728f07d.zip
Some more cleanups
Nothing in particular worth mentioning.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/itemdb.cpp6
-rw-r--r--src/resources/itemdb.h2
2 files changed, 3 insertions, 5 deletions
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index 036bdea8..50eba33d 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -186,7 +186,7 @@ void ItemDB::load()
std::string temp = name;
toLower(trim(temp));
- NamedItemInfoIterator itr = mNamedItemInfos.find(temp);
+ NamedItemInfos::const_iterator itr = mNamedItemInfos.find(temp);
if (itr == mNamedItemInfos.end())
{
mNamedItemInfos[temp] = itemInfo;
@@ -234,7 +234,7 @@ const ItemInfo& ItemDB::get(int id)
{
assert(mLoaded);
- ItemInfoIterator i = mItemInfos.find(id);
+ ItemInfos::const_iterator i = mItemInfos.find(id);
if (i == mItemInfos.end())
{
@@ -251,7 +251,7 @@ const ItemInfo& ItemDB::get(const std::string &name)
{
assert(mLoaded && !name.empty());
- NamedItemInfoIterator i = mNamedItemInfos.find(name);
+ NamedItemInfos::const_iterator i = mNamedItemInfos.find(name);
if (i == mNamedItemInfos.end())
{
diff --git a/src/resources/itemdb.h b/src/resources/itemdb.h
index aa5edab5..770f32dd 100644
--- a/src/resources/itemdb.h
+++ b/src/resources/itemdb.h
@@ -48,8 +48,6 @@ namespace ItemDB
// Items database
typedef std::map<int, ItemInfo*> ItemInfos;
typedef std::map<std::string, ItemInfo*> NamedItemInfos;
- typedef ItemInfos::iterator ItemInfoIterator;
- typedef NamedItemInfos::iterator NamedItemInfoIterator;
}
#endif