From 4e27937924766948d7ff9200f04a37fe4d59018c Mon Sep 17 00:00:00 2001 From: Thorbjørn Lindeijer Date: Thu, 2 Jun 2011 00:32:53 +0200 Subject: Arbitrary code cleanups Just some stuff that piles up while "looking" at the code, which eventually gets annoying to ignore while staging real changes. * Replaced a few NULL occurrences with 0 * Rely on default parameter for std::vector::resize. * Replaced a few "" with std::string() * Prefer .empty() to == "" * Removed a few comparisons with NULL * Don't check pointers before deleting them * Removed a bunch of redundant semicolons * Made some global variables static (local to their compilation unit) * Prefer prefix ++/-- operators to postfix versions when possible * Corrected location of a comment --- src/resources/itemdb.h | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'src/resources/itemdb.h') diff --git a/src/resources/itemdb.h b/src/resources/itemdb.h index e80f2cd0..aa6e62c0 100644 --- a/src/resources/itemdb.h +++ b/src/resources/itemdb.h @@ -33,9 +33,13 @@ class ItemInfo; class SpriteDisplay; -// Used to make the compiler uderstand the iteminfo friendship. -namespace TmwAthena { class TaItemDB; }; -namespace ManaServ { class ManaServItemDB; }; +namespace TmwAthena { +class TaItemDB; +} + +namespace ManaServ { +class ManaServItemDB; +} /** * Nano-description functions @@ -48,10 +52,10 @@ class ItemStat public: ItemStat(const std::string &tag, - const std::string &format): + const std::string &format): mTag(tag), mFormat(format) {} - bool operator ==(std::string &name) const + bool operator ==(const std::string &name) const { return mTag == name; } private: @@ -176,7 +180,7 @@ class TaItemDB: public ItemDB void checkItemInfo(ItemInfo* itemInfo); }; -}; // namespace TmwAthena +} // namespace TmwAthena namespace ManaServ { @@ -203,7 +207,7 @@ class ManaServItemDB: public ItemDB void checkItemInfo(ItemInfo* itemInfo); }; -}; // namespace ManaServ +} // namespace ManaServ extern ItemDB *itemDb; -- cgit v1.2.3-60-g2f50