From e82cb174e02b2aa1868b7c41d48addd78146b291 Mon Sep 17 00:00:00 2001
From: Guillaume Dupuy <glorf@glorf.fr>
Date: Sun, 4 Dec 2016 13:37:04 +0100
Subject: [PATCH] Use std::string instead of ucstring

--HG--
branch : target_sheet
---
 code/ryzom/client/src/entities.cpp                         | 4 ++--
 code/ryzom/client/src/entities.h                           | 2 +-
 code/ryzom/client/src/interface_v3/action_handler_game.cpp | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/ryzom/client/src/entities.cpp b/code/ryzom/client/src/entities.cpp
index 55c7c6772..ca087a837 100644
--- a/code/ryzom/client/src/entities.cpp
+++ b/code/ryzom/client/src/entities.cpp
@@ -1953,12 +1953,12 @@ CEntityCL *CEntityManager::getEntityByCompressedIndex(TDataSetIndex compressedIn
 // getEntityBySheetName :
 // Return an entity based on its sheet name
 //-----------------------------------------------
-CEntityCL *CEntityManager::getEntityBySheetName (const ucstring &sheet) const
+CEntityCL *CEntityManager::getEntityBySheetName (const std::string &sheet) const
 {
 	if (!sheet.empty())
 	{
 		uint i;
-		const CSheetId& sheetRef = NLMISC::CSheetId(sheet.toUtf8());
+		const CSheetId& sheetRef = NLMISC::CSheetId(sheet);
 		const uint count = (uint)_Entities.size();
 		for (i=0; i<count; i++)
 		{
diff --git a/code/ryzom/client/src/entities.h b/code/ryzom/client/src/entities.h
index 7b41f234e..e96e17e5e 100644
--- a/code/ryzom/client/src/entities.h
+++ b/code/ryzom/client/src/entities.h
@@ -277,7 +277,7 @@ public:
 	  * \param complete : if true, the name must match the full name of the entity.
 	  */
 	CEntityCL *getEntityByName (const ucstring &name, bool caseSensitive, bool complete) const;
-	CEntityCL *getEntityBySheetName (const ucstring &sheet) const;
+	CEntityCL *getEntityBySheetName (const std::string &sheet) const;
 	/// Get an entity by dataset index. Returns NULL if the entity is not found.
 	CEntityCL *getEntityByCompressedIndex(TDataSetIndex compressedIndex) const;
 
diff --git a/code/ryzom/client/src/interface_v3/action_handler_game.cpp b/code/ryzom/client/src/interface_v3/action_handler_game.cpp
index cac69d64c..bd74e76d6 100644
--- a/code/ryzom/client/src/interface_v3/action_handler_game.cpp
+++ b/code/ryzom/client/src/interface_v3/action_handler_game.cpp
@@ -2438,7 +2438,7 @@ class CAHTarget : public IActionHandler
 			if (entity == NULL)
 			{
 				//Get the entity with a sheetName
-				entity = EntitiesMngr.getEntityBySheetName(entityName);
+				entity = EntitiesMngr.getEntityBySheetName(entityName.toUtf8());
 			}
 			
 			if (entity)