From 74619411390c90ac27257f96c901e3910f7c6cf9 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Tue, 18 Feb 2014 22:43:06 +0100
Subject: [PATCH] Rename CSheets in GPM to CGpmSheets

---
 code/ryzom/server/src/gpm_service/gpm_service.cpp  |  4 ++--
 code/ryzom/server/src/gpm_service/sheets.cpp       | 14 +++++++-------
 code/ryzom/server/src/gpm_service/sheets.h         |  4 ++--
 code/ryzom/server/src/gpm_service/world_entity.cpp |  2 +-
 .../sheets_packer_shard/sheets_packer_shard.cpp    |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/code/ryzom/server/src/gpm_service/gpm_service.cpp b/code/ryzom/server/src/gpm_service/gpm_service.cpp
index 9f30f2d58..0756f641e 100644
--- a/code/ryzom/server/src/gpm_service/gpm_service.cpp
+++ b/code/ryzom/server/src/gpm_service/gpm_service.cpp
@@ -298,7 +298,7 @@ void CGlobalPositionManagerService::init()
 	GET_VAR_FROM_CF(LoadPacsPrims, true);
 
 
-	CSheets::init();
+	CGpmSheets::init();
 
 	// World Position Manager init
 	if (!IsRingShard)
@@ -707,7 +707,7 @@ void CGlobalPositionManagerService::release()
 		CWorldPositionManager::release();
 	}
 
-	CSheets::release();
+	CGpmSheets::release();
 
 }// release //
 
diff --git a/code/ryzom/server/src/gpm_service/sheets.cpp b/code/ryzom/server/src/gpm_service/sheets.cpp
index 6c6048258..a65aa4456 100644
--- a/code/ryzom/server/src/gpm_service/sheets.cpp
+++ b/code/ryzom/server/src/gpm_service/sheets.cpp
@@ -45,14 +45,14 @@ using namespace NLGEORGES;
 //-------------------------------------------------------------------------
 // the singleton data
 
-std::map<CSheetId,CSheets::CSheet> CSheets::_sheets;
-bool CSheets::_initialised=false;
+std::map<CSheetId,CGpmSheets::CSheet> CGpmSheets::_sheets;
+bool CGpmSheets::_initialised=false;
 
 
 //-------------------------------------------------------------------------
 // init
 
-void CSheets::init()
+void CGpmSheets::init()
 {
 	if (_initialised)
 		return;
@@ -72,11 +72,11 @@ void CSheets::init()
 //-------------------------------------------------------------------------
 // display
 
-void CSheets::display()
+void CGpmSheets::display()
 {
 	nlassert(_initialised);
 
-	std::map<CSheetId,CSheets::CSheet>::iterator it;
+	std::map<CSheetId,CGpmSheets::CSheet>::iterator it;
 	for(it=_sheets.begin();it!=_sheets.end();++it)
 	{
 		nlinfo("SHEET:%s Walk:%f Run:%f Radius:%f Height:%f Bounding:%f Scale:%f",(*it).first.toString().c_str(),
@@ -88,12 +88,12 @@ void CSheets::display()
 //-------------------------------------------------------------------------
 // lookup
 
-const CSheets::CSheet *CSheets::lookup( CSheetId id )
+const CGpmSheets::CSheet *CGpmSheets::lookup( CSheetId id )
 {
 	nlassert(_initialised);
 
 	// setup an iterator and lookup the sheet id in the map
-	std::map<CSheetId,CSheets::CSheet>::iterator it;
+	std::map<CSheetId,CGpmSheets::CSheet>::iterator it;
 	it=_sheets.find(id);
 
 	// if we found a valid entry return a pointer to the creature record otherwise 0
diff --git a/code/ryzom/server/src/gpm_service/sheets.h b/code/ryzom/server/src/gpm_service/sheets.h
index 1f711e1a5..78130d970 100644
--- a/code/ryzom/server/src/gpm_service/sheets.h
+++ b/code/ryzom/server/src/gpm_service/sheets.h
@@ -34,7 +34,7 @@
  * \author Nevrax France
  * \date 2002
  */
-class CSheets
+class CGpmSheets
 {
 public:
 	class CSheet
@@ -85,7 +85,7 @@ public:
 
 private:
 	// prohibit cnstructor as this is a singleton
-	CSheets();
+	CGpmSheets();
 
 	static std::map<NLMISC::CSheetId,CSheet> _sheets;
 	static bool _initialised;
diff --git a/code/ryzom/server/src/gpm_service/world_entity.cpp b/code/ryzom/server/src/gpm_service/world_entity.cpp
index 99396bfb3..d9976a1c4 100644
--- a/code/ryzom/server/src/gpm_service/world_entity.cpp
+++ b/code/ryzom/server/src/gpm_service/world_entity.cpp
@@ -309,7 +309,7 @@ void CWorldEntity::createPrimitive(NLPACS::UMoveContainer *pMoveContainer, uint8
 	Primitive = NULL;
 	MoveContainer = NULL;
 
-	const CSheets::CSheet	*sheet = CSheets::lookup(CSheetId(Sheet()));
+	const CGpmSheets::CSheet	*sheet = CGpmSheets::lookup(CSheetId(Sheet()));
 
 	float	primRadius = 0.5f;
 	float	primHeight = 2.0f;
diff --git a/code/ryzom/tools/sheets_packer_shard/sheets_packer_shard.cpp b/code/ryzom/tools/sheets_packer_shard/sheets_packer_shard.cpp
index 2fc2a9a4c..1d146758a 100644
--- a/code/ryzom/tools/sheets_packer_shard/sheets_packer_shard.cpp
+++ b/code/ryzom/tools/sheets_packer_shard/sheets_packer_shard.cpp
@@ -113,7 +113,7 @@ int main(int nNbArg, char **ppArgs)
 
 	// GPMS
 	{
-		std::map<NLMISC::CSheetId, CSheets::CSheet> container;
+		std::map<NLMISC::CSheetId, CGpmSheets::CSheet> container;
 		std::vector<std::string> filters;
 		filters.push_back("creature");
 		filters.push_back("player");