From 4da04fdfaa1f0527a4e829c614138ed38eda5e6d Mon Sep 17 00:00:00 2001 From: kervala Date: Thu, 24 Apr 2014 18:11:16 +0200 Subject: [PATCH] Changed: Replaced strlwr by toLower --- code/nel/src/gui/ctrl_col_pick.cpp | 4 ++-- code/nel/src/gui/interface_element.cpp | 3 +-- code/nel/src/gui/view_bitmap.cpp | 4 +--- code/nel/src/gui/view_renderer.cpp | 4 ++-- code/ryzom/client/src/client_sheets/sbrick_sheet.cpp | 3 +-- 5 files changed, 7 insertions(+), 11 deletions(-) diff --git a/code/nel/src/gui/ctrl_col_pick.cpp b/code/nel/src/gui/ctrl_col_pick.cpp index 3b5145e20..3d248164d 100644 --- a/code/nel/src/gui/ctrl_col_pick.cpp +++ b/code/nel/src/gui/ctrl_col_pick.cpp @@ -205,12 +205,12 @@ namespace NLGUI CViewRenderer &rVR = *CViewRenderer::getInstance(); if(prop) { - string sTmp = NLMISC::strlwr((const char*)prop); + string sTmp = NLMISC::toLower((const char*)prop); _Texture = rVR.createTexture (sTmp, 0, 0, 256, 64, false, false); } prop = (char*) xmlGetProp( node, (xmlChar*)"onchange" ); - if (prop) _AHOnChange = NLMISC::strlwr(prop); + if (prop) _AHOnChange = NLMISC::toLower(prop); prop = (char*) xmlGetProp( node, (xmlChar*)"onchange_params" ); if (prop) _AHOnChangeParams = string((const char*)prop); diff --git a/code/nel/src/gui/interface_element.cpp b/code/nel/src/gui/interface_element.cpp index c7a0c234b..2907df471 100644 --- a/code/nel/src/gui/interface_element.cpp +++ b/code/nel/src/gui/interface_element.cpp @@ -993,8 +993,7 @@ namespace NLGUI // ------------------------------------------------------------------------------------------------ bool CInterfaceElement::convertBool (const char *ptr) { - std::string str = ptr; - NLMISC::strlwr( str ); + std::string str = toLower(ptr); bool b = false; fromString( str, b ); return b; diff --git a/code/nel/src/gui/view_bitmap.cpp b/code/nel/src/gui/view_bitmap.cpp index 01c2e8232..21c0c2cd4 100644 --- a/code/nel/src/gui/view_bitmap.cpp +++ b/code/nel/src/gui/view_bitmap.cpp @@ -307,8 +307,7 @@ namespace NLGUI prop = (char*) xmlGetProp( cur, (xmlChar*)"texture" ); if (prop) { - string TxName = (const char *) prop; - TxName = strlwr (TxName); + string TxName = toLower((const char *) prop); setTexture (TxName); //CInterfaceManager *pIM = CInterfaceManager::getInstance(); //CViewRenderer &rVR = *CViewRenderer::getInstance(); @@ -450,7 +449,6 @@ namespace NLGUI // ---------------------------------------------------------------------------- void CViewBitmap::setTexture(const std::string & TxName) { - _TextureId.setTexture (TxName.c_str (), _TxtOffsetX, _TxtOffsetY, _TxtWidth, _TxtHeight, false); } diff --git a/code/nel/src/gui/view_renderer.cpp b/code/nel/src/gui/view_renderer.cpp index 6d3ef62e7..b2758c634 100644 --- a/code/nel/src/gui/view_renderer.cpp +++ b/code/nel/src/gui/view_renderer.cpp @@ -894,11 +894,11 @@ namespace NLGUI { if (sGlobalTextureName.empty()) return -1; // Look if already existing - string sLwrGTName = strlwr(sGlobalTextureName); + string sLwrGTName = toLower(sGlobalTextureName); TGlobalTextureList::iterator ite = _GlobalTextures.begin(); while (ite != _GlobalTextures.end()) { - std::string sText = strlwr(ite->Name); + std::string sText = toLower(ite->Name); if (sText == sLwrGTName) break; ite++; diff --git a/code/ryzom/client/src/client_sheets/sbrick_sheet.cpp b/code/ryzom/client/src/client_sheets/sbrick_sheet.cpp index d48b82669..4d5901358 100644 --- a/code/ryzom/client/src/client_sheets/sbrick_sheet.cpp +++ b/code/ryzom/client/src/client_sheets/sbrick_sheet.cpp @@ -312,8 +312,7 @@ void CSBrickSheet::build (const NLGEORGES::UFormElm &root) BrickRequiredFlags= 0; for(i=0;i