no longer using namespace std

Mindwerks · Apr 9, 2018 · 348be43 · 348be43
1 parent 0e735ad
commit 348be43
Show file tree

Hide file tree

Showing 137 changed files with 693 additions and 731 deletions.
diff --git a/BloodXL/BloodXL_Game.cpp b/BloodXL/BloodXL_Game.cpp
@@ -145,22 +145,22 @@ void BloodXL_Game::SC_Game_NewGameSettings(int episode, int difficulty)
     s_pGame_Console->NewGame(episode, difficulty);
 }
 
-void BloodXL_Game::SC_Game_LoadMap(const string& mapName)
+void BloodXL_Game::SC_Game_LoadMap(const std::string& mapName)
 {
-    string mapNameFinal = mapName + ".MAP";
+    std::string mapNameFinal = mapName + ".MAP";
     s_pGame_Console->m_pAPI->World_UnloadAllCells();
     s_pGame_Console->m_pAPI->World_LoadCell( CELLTYPE_BLOOD_MAP, ARCHIVETYPE_RFF, "BLOOD.RFF", mapNameFinal.c_str(), 0, 0 );
 }
 
 /************************
  *** Console commands ***
  ************************/
-void BloodXL_Game::CC_GameVersion(const vector<string>& args, void *pUserData)
+void BloodXL_Game::CC_GameVersion(const std::vector<std::string>& args, void *pUserData)
 {
     s_pGame_Console->m_pAPI->PrintToConsole("BloodXL version %d.%03d", s_pGame_Console->m_nVersionMajor, s_pGame_Console->m_nVersionMinor);
 }
 
-void BloodXL_Game::CC_LoadMap(const vector<string>& args, void *pUserData)
+void BloodXL_Game::CC_LoadMap(const std::vector<std::string>& args, void *pUserData)
 {
     BloodXL_Game *pGame = (BloodXL_Game *)pUserData;
     if ( args.size() < 2 )
@@ -169,13 +169,13 @@ void BloodXL_Game::CC_LoadMap(const vector<string>& args, void *pUserData)
     }
     else
     {
-        string mapName = args[1] + ".MAP";
+        std::string mapName = args[1] + ".MAP";
         pGame->m_pAPI->World_UnloadAllCells();
         pGame->m_pAPI->World_LoadCell( CELLTYPE_BLOOD_MAP, ARCHIVETYPE_RFF, "BLOOD.RFF", mapName.c_str(), 0, 0 );
     }
 }
 
-void BloodXL_Game::CC_PassThruAdjoins(const vector<string>& args, void *pUserData)
+void BloodXL_Game::CC_PassThruAdjoins(const std::vector<std::string>& args, void *pUserData)
 {
     BloodXL_Game *pGame = (BloodXL_Game *)pUserData;
 

diff --git a/BloodXL/BloodXL_Game.h b/BloodXL/BloodXL_Game.h
@@ -4,7 +4,6 @@
 #include "../plugin_framework/plugin.h"
 #include <string>
 
-using namespace std;
 class BloodXL_Player;
 
 class BloodXL_Game
@@ -32,13 +31,13 @@ class BloodXL_Game
 
     //Script commands
     static void SC_Game_NewGameSettings(int episode, int difficulty);
-    static void SC_Game_LoadMap(const string& mapName);
+    static void SC_Game_LoadMap(const std::string& mapName);
 
     //Console commands
     static BloodXL_Game *s_pGame_Console;
-    static void CC_GameVersion(const vector<string>& args, void *pUserData);
-    static void CC_LoadMap(const vector<string>& args, void *pUserData);
-    static void CC_PassThruAdjoins(const vector<string>& args, void *pUserData);
+    static void CC_GameVersion(const std::vector<std::string>& args, void *pUserData);
+    static void CC_LoadMap(const std::vector<std::string>& args, void *pUserData);
+    static void CC_PassThruAdjoins(const std::vector<std::string>& args, void *pUserData);
 };
 
 #endif //BLOODXL_GAME_H
diff --git a/CommonTypes.h b/CommonTypes.h
@@ -11,7 +11,7 @@
 //Enable this to check memory allocations.
 //This is currently only available on Windows
 #ifdef _CRTDBG_MAP_ALLOC
-    #include <stdlib.h>
+    #include <cstdlib>
     #include <CRTDBG.h>
 
     #define xlMalloc(s)       _malloc_dbg(s, _NORMAL_BLOCK, __FILE__, __LINE__)

diff --git a/DaggerXL/DaggerXL_Game.cpp b/DaggerXL/DaggerXL_Game.cpp
@@ -224,7 +224,7 @@ void DaggerXL_Game::SC_Game_NewGame()
 /************************
  *** Console commands ***
  ************************/
-void DaggerXL_Game::CC_GameVersion(const vector<string>& args, void *pUserData)
+void DaggerXL_Game::CC_GameVersion(const std::vector<std::string>& args, void *pUserData)
 {
     s_pGame_Console->m_pAPI->PrintToConsole("DaggerXL version %d.%03d", s_pGame_Console->m_nVersionMajor, s_pGame_Console->m_nVersionMinor);
 }

diff --git a/DaggerXL/DaggerXL_Game.h b/DaggerXL/DaggerXL_Game.h
@@ -2,10 +2,10 @@
 #define DAGGERXL_GAME_H
 
 #include "../plugin_framework/plugin.h"
+
 #include <string>
 #include <vector>
 
-using namespace std;
 class DaggerXL_Player;
 class Logic_Door;
 class Logic_Obj_Action;
@@ -71,7 +71,7 @@ class DaggerXL_Game
 
     //Console commands
     static DaggerXL_Game *s_pGame_Console;
-    static void CC_GameVersion(const vector<string>& args, void *pUserData);
+    static void CC_GameVersion(const std::vector<std::string>& args, void *pUserData);
 };
 
 #endif //BLOODXL_GAME_H
diff --git a/DarkXL/CutscenePlayer.cpp b/DarkXL/CutscenePlayer.cpp
@@ -2,9 +2,9 @@
 #include "../plugin_framework/plugin.h"
 #include "../fileformats/ArchiveTypes.h"
 #include "../movieplayback/MovieTypes.h"
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstdio>
+#include <cstring>
 
 bool CutscenePlayer::m_bCutscenePlaying;
 CutscenePlayer::Cutscene CutscenePlayer::m_CutSceneList[256];

diff --git a/DarkXL/DarkXL_Game.cpp b/DarkXL/DarkXL_Game.cpp
@@ -75,7 +75,7 @@ void DarkXL_Game::KeyDown(int32_t key)
 /************************
  *** Console commands ***
  ************************/
-void DarkXL_Game::CC_GameVersion(const vector<string>& args, void *pUserData)
+void DarkXL_Game::CC_GameVersion(const std::vector<std::string>& args, void *pUserData)
 {
     s_pGame_Console->m_pAPI->PrintToConsole("DarkXL version %d.%03d", s_pGame_Console->m_nVersionMajor, s_pGame_Console->m_nVersionMinor);
 }
diff --git a/DarkXL/DarkXL_Game.h b/DarkXL/DarkXL_Game.h
@@ -4,8 +4,6 @@
 #include "../plugin_framework/plugin.h"
 #include <string>
 
-using namespace std;
-
 class DarkXL_Game
 {
 public:
@@ -28,7 +26,7 @@ class DarkXL_Game
 
     //Console commands
     static DarkXL_Game *s_pGame_Console;
-    static void CC_GameVersion(const vector<string>& args, void *pUserData);
+    static void CC_GameVersion(const std::vector<std::string>& args, void *pUserData);
 };
 
 #endif //DARKXL_GAME_H
diff --git a/EngineSettings.cpp b/EngineSettings.cpp
@@ -1,8 +1,8 @@
 #include "EngineSettings.h"
 #include <fstream>
 #include <cctype>
-#include <string.h>
-#include <stdio.h>
+#include <cstring>
+#include <cstdio>
 #include <memory.h>
 
 #if PLATFORM_WIN

diff --git a/EngineSettings.h b/EngineSettings.h
@@ -6,8 +6,6 @@
 #include <string>
 #include <unordered_map>
 
-using namespace std;
-
 class EngineSettings
 {
     public:
@@ -76,8 +74,7 @@ class EngineSettings
         //callback methods
         static const char *GetStartMapCB() { return sSettings.GetStartMap(); }
         static XL_BOOL IsServerCB() { return sSettings.IsServer(); }
-        static void GetStartMap_StrOutCB(string& map_name)
-        { sSettings.GetStartMap_StrOut(map_name); }
+        static void GetStartMap_StrOutCB(std::string& map_name) { sSettings.GetStartMap_StrOut(map_name); }
 
     private:
         static EngineSettings sSettings;

diff --git a/OutlawsXL/OutlawsXL_Game.cpp b/OutlawsXL/OutlawsXL_Game.cpp
@@ -79,13 +79,13 @@ void OutlawsXL_Game::SC_Game_NewGameSettings(int episode, int difficulty)
 /************************
  *** Console commands ***
  ************************/
-void OutlawsXL_Game::CC_GameVersion(const vector<string>& args, void *pUserData)
+void OutlawsXL_Game::CC_GameVersion(const std::vector<std::string>& args, void *pUserData)
 {
     OutlawsXL_Game *pGame = (OutlawsXL_Game *)pUserData;
     pGame->m_pAPI->PrintToConsole("OutlawsXL version %d.%03d", pGame->m_nVersionMajor, pGame->m_nVersionMinor);
 }
 
-void OutlawsXL_Game::CC_LoadMap(const vector<string>& args, void *pUserData)
+void OutlawsXL_Game::CC_LoadMap(const std::vector<std::string>& args, void *pUserData)
 {
     OutlawsXL_Game *pGame = (OutlawsXL_Game *)pUserData;
     if ( args.size() < 2 )
@@ -94,14 +94,14 @@ void OutlawsXL_Game::CC_LoadMap(const vector<string>& args, void *pUserData)
     }
     else
     {
-        string mapName = args[1] + ".LVT";
+        std::string mapName = args[1] + ".LVT";
 
         pGame->m_pAPI->World_UnloadAllCells();
         pGame->m_pAPI->World_LoadCell( CELLTYPE_OUTLAWS_MAP, ARCHIVETYPE_LAB, "OLGEO_1.LAB", mapName.c_str(), 0, 0 );
     }
 }
 
-void OutlawsXL_Game::CC_PassThruAdjoins(const vector<string>& args, void *pUserData)
+void OutlawsXL_Game::CC_PassThruAdjoins(const std::vector<std::string>& args, void *pUserData)
 {
     OutlawsXL_Game *pGame = (OutlawsXL_Game *)pUserData;
 

diff --git a/OutlawsXL/OutlawsXL_Game.h b/OutlawsXL/OutlawsXL_Game.h
@@ -2,9 +2,9 @@
 #define OUTLAWSXL_GAME_H
 
 #include "../plugin_framework/plugin.h"
+
 #include <string>
 
-using namespace std;
 class OutlawsXL_Player;
 
 class OutlawsXL_Game
@@ -34,9 +34,9 @@ class OutlawsXL_Game
 
     //Console commands
     static OutlawsXL_Game *s_pGame_Console;
-    static void CC_GameVersion(const vector<string>& args, void *pUserData);
-    static void CC_LoadMap(const vector<string>& args, void *pUserData);
-    static void CC_PassThruAdjoins(const vector<string>& args, void *pUserData);
+    static void CC_GameVersion(const std::vector<std::string>& args, void *pUserData);
+    static void CC_LoadMap(const std::vector<std::string>& args, void *pUserData);
+    static void CC_PassThruAdjoins(const std::vector<std::string>& args, void *pUserData);
 };
 
 #endif //BLOODXL_GAME_H
diff --git a/fileformats/ART_Reader.cpp b/fileformats/ART_Reader.cpp
@@ -1,9 +1,9 @@
 #include "ART_Reader.h"
 #include "../EngineSettings.h"
 #include "../ui/XL_Console.h"
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdio>
+#include <cstdlib>
 
 #define MAX_NB_TILES 9216
 #define PALETTE_SIZE (256 * 3)

diff --git a/fileformats/ART_Reader.h b/fileformats/ART_Reader.h
@@ -3,7 +3,7 @@
 
 #include "../CommonTypes.h"
 #include "Archive.h"
-#include <stdio.h>
+#include <cstdio>
 
 class ART_Reader : public Archive
 {

diff --git a/fileformats/Archive.h b/fileformats/Archive.h
@@ -1,7 +1,7 @@
 #ifndef ARCHIVE_H
 #define ARCHIVE_H
 
-#include <stdio.h>
+#include <cstdio>
 
 class Archive
 {

diff --git a/fileformats/ArchiveManager.cpp b/fileformats/ArchiveManager.cpp
@@ -19,8 +19,8 @@ const char *ArchiveManager::m_apszArchiveExt[]=
     "BSA",
 };
 
-map<string, Archive *> ArchiveManager::m_OpenArchives;
-vector<Archive *> ArchiveManager::m_ArchiveList;
+std::map<std::string, Archive *> ArchiveManager::m_OpenArchives;
+std::vector<Archive *> ArchiveManager::m_ArchiveList;
 Archive *ArchiveManager::m_pCurArchive;
 FILE *ArchiveManager::s_pCurrentSysFile;
 
@@ -34,9 +34,9 @@ void ArchiveManager::Init()
 void ArchiveManager::Destroy()
 {
     m_OpenArchives.clear();
-    
-    vector<Archive *>::iterator iArchive = m_ArchiveList.begin();
-    vector<Archive *>::iterator eArchive = m_ArchiveList.end();
+
+    std::vector<Archive *>::iterator iArchive = m_ArchiveList.begin();
+    std::vector<Archive *>::iterator eArchive = m_ArchiveList.end();
     for (; iArchive != eArchive; ++iArchive)
     {
         (*iArchive)->Close();
@@ -48,7 +48,7 @@ void ArchiveManager::Destroy()
 
 Archive *ArchiveManager::OpenArchive(uint32_t uArchiveType, const char *pszArchiveName)
 {
-    map<string, Archive *>::iterator iArchive = m_OpenArchives.find(pszArchiveName);
+    std::map<std::string, Archive *>::iterator iArchive = m_OpenArchives.find(pszArchiveName);
     if ( iArchive != m_OpenArchives.end() )
     {
         Archive *pArchive = iArchive->second;

diff --git a/fileformats/ArchiveManager.h b/fileformats/ArchiveManager.h
@@ -7,7 +7,6 @@
 #include <vector>
 #include <map>
 
-using namespace std;
 class Archive;
 
 class ArchiveManager
@@ -36,8 +35,8 @@ class ArchiveManager
 
 private:
     static const char *m_apszArchiveExt[];
-    static map<string, Archive *> m_OpenArchives;
-    static vector<Archive *> m_ArchiveList;
+    static std::map<std::string, Archive *> m_OpenArchives;
+    static std::vector<Archive *> m_ArchiveList;
     static Archive *m_pCurArchive;
     static FILE *s_pCurrentSysFile;
 };

diff --git a/fileformats/BSA_Reader.cpp b/fileformats/BSA_Reader.cpp
@@ -1,9 +1,9 @@
 #include "BSA_Reader.h"
 #include "../EngineSettings.h"
 #include "../ui/XL_Console.h"
-#include <string.h>
-#include <stdio.h>
-#include <assert.h>
+#include <cstring>
+#include <cstdio>
+#include <cassert>
 
 BSA_Reader::BSA_Reader() : Archive()
 {

diff --git a/fileformats/BSA_Reader.h b/fileformats/BSA_Reader.h
@@ -3,7 +3,7 @@
 
 #include "../CommonTypes.h"
 #include "Archive.h"
-#include <stdio.h>
+#include <cstdio>
 
 class BSA_Reader : public Archive
 {

diff --git a/fileformats/CellLoader.h b/fileformats/CellLoader.h
@@ -7,8 +7,6 @@ class WorldCell;
 class IDriver3D;
 class World;
 
-using namespace std;
-
 class CellLoader
 {
 public:
@@ -18,7 +16,7 @@ class CellLoader
     //returns true if this CellLoader handles file handling itself.
     virtual bool UsesOwnFiles() { return false; }
     //load (normal)
-    virtual WorldCell *Load( IDriver3D *pDriver, World *pWorld, uint8_t *pData, uint32_t uLen, const string& sFile, int32_t worldX, int32_t worldY ) {return 0;}
+    virtual WorldCell *Load( IDriver3D *pDriver, World *pWorld, uint8_t *pData, uint32_t uLen, const std::string& sFile, int32_t worldX, int32_t worldY ) {return 0;}
     virtual WorldCell *LoadFromLocation(IDriver3D *pDriver, World *pWorld, void *pLocPtr) {return 0;}
 };
 

diff --git a/fileformats/CellLoader_BloodMap.cpp b/fileformats/CellLoader_BloodMap.cpp
@@ -7,18 +7,15 @@
 #include "../world/Sprite_ZAxis.h"
 #include "../world/LevelFuncMgr.h"
 #include "../render/TextureCache.h"
-
 #include "../fileformats/TextureTypes.h"
 #include "../fileformats/ArchiveTypes.h"
-
 #include "../math/Math.h"
-
 #include "../ui/XL_Console.h"
-
 #include "../EngineSettings.h"
-#include <string.h>
-#include <stdio.h>
-#include <assert.h>
+
+#include <string>
+#include <cstdio>
+#include <cassert>
 
 #define MAX_TILES 9216
 
@@ -389,7 +386,7 @@ TextureHandle CellLoader_BloodMap::AddBloodTile(int32_t picnum, uint32_t uPalIdx
     return hTex;
 }
 
-WorldCell *CellLoader_BloodMap::Load( IDriver3D *pDriver, World *pWorld, uint8_t *pData, uint32_t uLen, const string& sFile, int32_t worldX, int32_t worldY )
+WorldCell *CellLoader_BloodMap::Load( IDriver3D *pDriver, World *pWorld, uint8_t *pData, uint32_t uLen, const std::string& sFile, int32_t worldX, int32_t worldY )
 {
     WorldCell *pCell = NULL;
     ObjectManager::FreeAllObjects();