summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-06-07 20:41:37 +0300
committerAndrei Karas <akaras@inbox.ru>2017-06-07 21:18:22 +0300
commit28f62ac9504bc5e912cd94c302295d4dcc47e41c (patch)
treee54975711c001716663bd9daff6f81ebd2a61706 /src/resources
parent51d743a33dceb114244269cfe6fe6e80afbf41cc (diff)
downloadmanaplus-28f62ac9504bc5e912cd94c302295d4dcc47e41c.tar.gz
manaplus-28f62ac9504bc5e912cd94c302295d4dcc47e41c.tar.bz2
manaplus-28f62ac9504bc5e912cd94c302295d4dcc47e41c.tar.xz
manaplus-28f62ac9504bc5e912cd94c302295d4dcc47e41c.zip
Fix namespace comments.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/beinginfo.h2
-rw-r--r--src/resources/cursors.h2
-rw-r--r--src/resources/db/avatardb.cpp2
-rw-r--r--src/resources/db/badgesdb.cpp2
-rw-r--r--src/resources/db/colordb.cpp2
-rw-r--r--src/resources/db/commandsdb.cpp2
-rw-r--r--src/resources/db/elementaldb.cpp2
-rw-r--r--src/resources/db/emotedb.cpp2
-rw-r--r--src/resources/db/homunculusdb.cpp2
-rw-r--r--src/resources/db/horsedb.cpp2
-rw-r--r--src/resources/db/languagedb.h2
-rw-r--r--src/resources/db/mapdb.cpp4
-rw-r--r--src/resources/db/mercenarydb.cpp2
-rw-r--r--src/resources/db/moddb.cpp2
-rw-r--r--src/resources/db/monsterdb.cpp2
-rw-r--r--src/resources/db/npcdb.cpp2
-rw-r--r--src/resources/db/npcdialogdb.cpp2
-rw-r--r--src/resources/db/palettedb.cpp2
-rw-r--r--src/resources/db/petdb.cpp2
-rw-r--r--src/resources/db/questdb.cpp2
-rw-r--r--src/resources/db/skillunitdb.cpp2
-rw-r--r--src/resources/db/sounddb.cpp2
-rw-r--r--src/resources/db/textdb.h2
-rw-r--r--src/resources/db/weaponsdb.cpp2
-rw-r--r--src/resources/iteminfo.h2
-rw-r--r--src/resources/sdlgfxblitfunc.cpp2
26 files changed, 27 insertions, 27 deletions
diff --git a/src/resources/beinginfo.h b/src/resources/beinginfo.h
index 0b1b0e7b4..6b359cec1 100644
--- a/src/resources/beinginfo.h
+++ b/src/resources/beinginfo.h
@@ -41,7 +41,7 @@ struct Attack;
namespace ColorDB
{
class ItemColorData;
-}
+} // namespace ColorDB
typedef std::map<int, Attack*> Attacks;
diff --git a/src/resources/cursors.h b/src/resources/cursors.h
index 4dfeab87c..bf233fc0e 100644
--- a/src/resources/cursors.h
+++ b/src/resources/cursors.h
@@ -38,6 +38,6 @@ namespace Cursors
};
CursorT stringToCursor(const std::string &name) A_WARN_UNUSED;
-} // namespace Cursor
+} // namespace Cursors
#endif // RESOURCES_CURSOR_H
diff --git a/src/resources/db/avatardb.cpp b/src/resources/db/avatardb.cpp
index 86c2ff5aa..a3abf5fec 100644
--- a/src/resources/db/avatardb.cpp
+++ b/src/resources/db/avatardb.cpp
@@ -40,7 +40,7 @@ namespace
{
BeingInfos mAvatarInfos;
bool mLoaded = false;
-}
+} // namespace
void AvatarDB::load()
{
diff --git a/src/resources/db/badgesdb.cpp b/src/resources/db/badgesdb.cpp
index 4b6bd85d2..48034e3a3 100644
--- a/src/resources/db/badgesdb.cpp
+++ b/src/resources/db/badgesdb.cpp
@@ -34,7 +34,7 @@ namespace
BadgesInfos mNames;
BadgesInfos mParties;
bool mLoaded = false;
-}
+} // namespace
static void loadXmlFile(const std::string &file,
const std::string &name,
diff --git a/src/resources/db/colordb.cpp b/src/resources/db/colordb.cpp
index 15e66bb5b..088bb8832 100644
--- a/src/resources/db/colordb.cpp
+++ b/src/resources/db/colordb.cpp
@@ -35,7 +35,7 @@ namespace
bool mLoaded = false;
std::string mFail("#ffffff");
ColorDB::ColorLists mColorLists;
-}
+} // namespace
void ColorDB::load()
{
diff --git a/src/resources/db/commandsdb.cpp b/src/resources/db/commandsdb.cpp
index eec3eb7ce..0f3046047 100644
--- a/src/resources/db/commandsdb.cpp
+++ b/src/resources/db/commandsdb.cpp
@@ -34,7 +34,7 @@ namespace
{
CommandsMap mCommands;
bool mLoaded = false;
-}
+} // namespace
void CommandsDB::load()
{
diff --git a/src/resources/db/elementaldb.cpp b/src/resources/db/elementaldb.cpp
index 8701081a3..9624366f6 100644
--- a/src/resources/db/elementaldb.cpp
+++ b/src/resources/db/elementaldb.cpp
@@ -36,7 +36,7 @@ namespace
{
BeingInfos mElementalInfos;
bool mLoaded = false;
-}
+} // namespace
void ElementalDb::load()
{
diff --git a/src/resources/db/emotedb.cpp b/src/resources/db/emotedb.cpp
index 085f81abe..72b7f0092 100644
--- a/src/resources/db/emotedb.cpp
+++ b/src/resources/db/emotedb.cpp
@@ -42,7 +42,7 @@ namespace
EmoteInfo mUnknown;
bool mLoaded = false;
int mLastEmote = 0;
-}
+} // namespace
void EmoteDB::load()
{
diff --git a/src/resources/db/homunculusdb.cpp b/src/resources/db/homunculusdb.cpp
index 3fdced887..bedc7c319 100644
--- a/src/resources/db/homunculusdb.cpp
+++ b/src/resources/db/homunculusdb.cpp
@@ -37,7 +37,7 @@ namespace
{
BeingInfos mHomunculusInfos;
bool mLoaded = false;
-}
+} // namespace
void HomunculusDB::load()
{
diff --git a/src/resources/db/horsedb.cpp b/src/resources/db/horsedb.cpp
index 961fbca32..c9f363246 100644
--- a/src/resources/db/horsedb.cpp
+++ b/src/resources/db/horsedb.cpp
@@ -38,7 +38,7 @@ namespace
HorseInfos mHorseInfos;
HorseInfo mUnknown;
bool mLoaded = false;
-}
+} // namespace
#define loadSprite(name) \
{ \
diff --git a/src/resources/db/languagedb.h b/src/resources/db/languagedb.h
index 8f33576a6..6b73d455e 100644
--- a/src/resources/db/languagedb.h
+++ b/src/resources/db/languagedb.h
@@ -39,6 +39,6 @@ namespace LanguageDb
const std::string &getIcon(const int id);
const std::string &getPo(const int id);
-} // namespace LanguageDB
+} // namespace LanguageDb
#endif // RESOURCES_DB_LANGUAGEDB_H
diff --git a/src/resources/db/mapdb.cpp b/src/resources/db/mapdb.cpp
index e96f31e52..7ae90815e 100644
--- a/src/resources/db/mapdb.cpp
+++ b/src/resources/db/mapdb.cpp
@@ -34,13 +34,13 @@ namespace
MapDB::Maps mMaps;
MapDB::MapInfos mInfos;
MapDB::Atlases mAtlases;
-}
+} // namespace
namespace MapDB
{
void readMap(XmlNodePtrConst node);
void readAtlas(XmlNodePtrConst node);
-}
+} // namespace MapDB
void MapDB::load()
{
diff --git a/src/resources/db/mercenarydb.cpp b/src/resources/db/mercenarydb.cpp
index a528c7def..ca1b950f9 100644
--- a/src/resources/db/mercenarydb.cpp
+++ b/src/resources/db/mercenarydb.cpp
@@ -37,7 +37,7 @@ namespace
{
BeingInfos mMercenaryInfos;
bool mLoaded = false;
-}
+} // namespace
void MercenaryDB::load()
{
diff --git a/src/resources/db/moddb.cpp b/src/resources/db/moddb.cpp
index 5932d9b19..9f69c9891 100644
--- a/src/resources/db/moddb.cpp
+++ b/src/resources/db/moddb.cpp
@@ -36,7 +36,7 @@ namespace
{
ModInfos mModInfos;
bool mLoaded = false;
-}
+} // namespace
void ModDB::load()
{
diff --git a/src/resources/db/monsterdb.cpp b/src/resources/db/monsterdb.cpp
index 44b430144..a8a040973 100644
--- a/src/resources/db/monsterdb.cpp
+++ b/src/resources/db/monsterdb.cpp
@@ -41,7 +41,7 @@ namespace
{
BeingInfos mMonsterInfos;
bool mLoaded = false;
-}
+} // namespace
void MonsterDB::load()
{
diff --git a/src/resources/db/npcdb.cpp b/src/resources/db/npcdb.cpp
index 44a0bc747..08038d796 100644
--- a/src/resources/db/npcdb.cpp
+++ b/src/resources/db/npcdb.cpp
@@ -41,7 +41,7 @@ namespace
{
BeingInfos mNPCInfos;
bool mLoaded = false;
-}
+} // namespace
void NPCDB::load()
{
diff --git a/src/resources/db/npcdialogdb.cpp b/src/resources/db/npcdialogdb.cpp
index 7411faca9..0e4ab5ffc 100644
--- a/src/resources/db/npcdialogdb.cpp
+++ b/src/resources/db/npcdialogdb.cpp
@@ -34,7 +34,7 @@ namespace
{
bool mLoaded = false;
NpcDialogDB::Dialogs mDialogs;
-}
+} // namespace
void NpcDialogDB::load()
{
diff --git a/src/resources/db/palettedb.cpp b/src/resources/db/palettedb.cpp
index f6f54a875..0390550d4 100644
--- a/src/resources/db/palettedb.cpp
+++ b/src/resources/db/palettedb.cpp
@@ -34,7 +34,7 @@ namespace
{
bool mLoaded = false;
std::map<std::string, DyeColor> mColors;
-}
+} // namespace
void PaletteDB::load()
{
diff --git a/src/resources/db/petdb.cpp b/src/resources/db/petdb.cpp
index a47956e7f..ccfaecda9 100644
--- a/src/resources/db/petdb.cpp
+++ b/src/resources/db/petdb.cpp
@@ -39,7 +39,7 @@ namespace
{
BeingInfos mPETInfos;
bool mLoaded = false;
-}
+} // namespace
void PETDB::load()
{
diff --git a/src/resources/db/questdb.cpp b/src/resources/db/questdb.cpp
index db67e5138..6ac2c7f34 100644
--- a/src/resources/db/questdb.cpp
+++ b/src/resources/db/questdb.cpp
@@ -41,7 +41,7 @@ namespace
// quests: var, quests
std::map<int, std::vector<QuestItem*> > mQuests;
std::vector<QuestEffect*> mAllEffects;
-}
+} // namespace
void QuestDb::load()
{
diff --git a/src/resources/db/skillunitdb.cpp b/src/resources/db/skillunitdb.cpp
index b5c4592ad..33f41cacb 100644
--- a/src/resources/db/skillunitdb.cpp
+++ b/src/resources/db/skillunitdb.cpp
@@ -39,7 +39,7 @@ namespace
{
BeingInfos mSkillUnitInfos;
bool mLoaded = false;
-}
+} // namespace
void SkillUnitDb::load()
{
diff --git a/src/resources/db/sounddb.cpp b/src/resources/db/sounddb.cpp
index 47eb99232..0907f5cdc 100644
--- a/src/resources/db/sounddb.cpp
+++ b/src/resources/db/sounddb.cpp
@@ -33,7 +33,7 @@ namespace
{
std::string mDefault;
std::vector<std::string> mSounds;
-}
+} // namespace
void SoundDB::load()
{
diff --git a/src/resources/db/textdb.h b/src/resources/db/textdb.h
index c61bb0c7a..2eb438336 100644
--- a/src/resources/db/textdb.h
+++ b/src/resources/db/textdb.h
@@ -39,6 +39,6 @@ namespace TextDb
const StringVect &getTexts();
void unload();
-} // namespace LanguageDB
+} // namespace TextDb
#endif // RESOURCES_DB_TEXTDB_H
diff --git a/src/resources/db/weaponsdb.cpp b/src/resources/db/weaponsdb.cpp
index 262199d6f..e75b15f02 100644
--- a/src/resources/db/weaponsdb.cpp
+++ b/src/resources/db/weaponsdb.cpp
@@ -32,7 +32,7 @@ namespace
WeaponsInfos mSwords;
WeaponsInfos mShields;
bool mLoaded = false;
-}
+} // namespace
static void loadDB(const std::string &name,
WeaponsInfos &arr)
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index 502fbfbf7..3df93e978 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -40,7 +40,7 @@
namespace ColorDB
{
class ItemColorData;
-}
+} // namespace ColorDB
// sprite, <itemfrom, itemto>
typedef std::map<int, IntMap> SpriteToItemMap;
diff --git a/src/resources/sdlgfxblitfunc.cpp b/src/resources/sdlgfxblitfunc.cpp
index 109ddaa2e..f419893a6 100644
--- a/src/resources/sdlgfxblitfunc.cpp
+++ b/src/resources/sdlgfxblitfunc.cpp
@@ -327,7 +327,7 @@ namespace
254, /* 254 */
255 /* 255 */
};
-}
+} // namespace
static void _SDL_gfxBlitBlitterRGBA(SDL_gfxBlitInfo *info)
{