ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed some const char* to const std::string& .

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@1951 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2008-05-20 01:24:15 +00:00
parent 01391b26fc
commit c6f377413d
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/char_sel.cpp
View File

@ -82,7 +82,7 @@ CharSel::CharSel(int whichPlayer)
if(unlock_manager->isLocked(kp->getIdent())) continue; if(unlock_manager->isLocked(kp->getIdent())) continue;
widget_manager->addImgButtonWgt( WTOK_RACER0 + i, 8, 11, widget_manager->addImgButtonWgt( WTOK_RACER0 + i, 8, 11,
kp->getIconFile() ); kp->getIconFile() );
} }
} }

6
src/kart_properties.hpp
View File

@ -118,9 +118,9 @@ public:
Material* getIconMaterial () const {return m_icon_material; } Material* getIconMaterial () const {return m_icon_material; }
ssgEntity* getModel () const {return m_model; } ssgEntity* getModel () const {return m_model; }
const std::string& getName () const {return m_name; } const std::string& getName () const {return m_name; }
const char* getIdent () const {return m_ident.c_str(); } const std::string& getIdent () const {return m_ident; }
const char* getShadowFile () const {return m_shadow_file.c_str(); } const std::string& getShadowFile () const {return m_shadow_file; }
const char* getIconFile () const {return m_icon_file.c_str(); } const std::string& getIconFile () const {return m_icon_file; }
const sgVec3* getColor () const {return &m_color; } const sgVec3* getColor () const {return &m_color; }
float getMass () const {return m_mass; } float getMass () const {return m_mass; }
float getKartLength () const {return m_kart_length; } float getKartLength () const {return m_kart_length; }

2
src/main.cpp
View File

@ -238,7 +238,7 @@ int handleCmdLine(int argc, char **argv)
for (unsigned int i = 0; NULL != kart_properties_manager->getKartById(i); i++) for (unsigned int i = 0; NULL != kart_properties_manager->getKartById(i); i++)
{ {
const KartProperties* KP= kart_properties_manager->getKartById(i); const KartProperties* KP= kart_properties_manager->getKartById(i);
fprintf (stdout, "\t%10s: %s\n", KP->getIdent(), KP->getName().c_str()); fprintf (stdout, "\t%10s: %s\n", KP->getIdent().c_str(), KP->getName().c_str());
} }
fprintf ( stdout, "\n" ); fprintf ( stdout, "\n" );

2
src/widget.cpp
View File

@ -250,7 +250,7 @@ void Widget::setFont( const WidgetFont FONT )
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void Widget::setTexture( const char* FILENAME, bool is_full_path ) void Widget::setTexture( const std::string& FILENAME, bool is_full_path )
{ {
Material *m = material_manager->getMaterial( FILENAME, is_full_path ); Material *m = material_manager->getMaterial( FILENAME, is_full_path );
m_texture = m->getState()->getTextureHandle(); m_texture = m->getState()->getTextureHandle();

2
src/widget.hpp
View File

@ -205,7 +205,7 @@ class Widget
void darkenColor(); void darkenColor();
void setFont( const WidgetFont FONT ); void setFont( const WidgetFont FONT );
void setTexture( const char* FILENAME, const bool is_full_path=true ); void setTexture( const std::string& FILENAME, const bool is_full_path=true );
/* Functions created simply to organize the code */ /* Functions created simply to organize the code */
bool createRect(); bool createRect();

4
src/widget_manager.cpp
View File

@ -1047,7 +1047,7 @@ bool WidgetManager::addImgButtonWgt
const int TOKEN, const int TOKEN,
const int MIN_WIDTH, const int MIN_WIDTH,
const int MIN_HEIGHT, const int MIN_HEIGHT,
const char* FILENAME const std::string& FILENAME
) )
{ {
if( !( addWgt( TOKEN, MIN_WIDTH, MIN_HEIGHT ))) return false; if( !( addWgt( TOKEN, MIN_WIDTH, MIN_HEIGHT ))) return false;
@ -1376,7 +1376,7 @@ void WidgetManager::setWgtTexture(const int TOKEN, const int TEXTURE)
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void WidgetManager::setWgtTexture(const int TOKEN, const char* FILENAME, void WidgetManager::setWgtTexture(const int TOKEN, const std::string& FILENAME,
const bool is_full_path) const bool is_full_path)
{ {
const int ID = findId(TOKEN); const int ID = findId(TOKEN);

4
src/widget_manager.hpp
View File

@ -271,7 +271,7 @@ public:
const int TOKEN, const int TOKEN,
const int MIN_WIDTH, const int MIN_WIDTH,
const int MIN_HEIGHT, const int MIN_HEIGHT,
const char* FILENAME const std::string& FILENAME
); );
/* On/off widget switch features. They are all disabled/hidden initially. */ /* On/off widget switch features. They are all disabled/hidden initially. */
@ -349,7 +349,7 @@ public:
//TODO: add initial border colors, if I don't erase those functions. //TODO: add initial border colors, if I don't erase those functions.
void setWgtTexture(const int TOKEN, const int TEXTURE); void setWgtTexture(const int TOKEN, const int TEXTURE);
void setWgtTexture(const int TOKEN, const char* FILENAME, const bool is_full_path=true); void setWgtTexture(const int TOKEN, const std::string& FILENAME, const bool is_full_path=true);
void showWgtTexture(const int TOKEN); void showWgtTexture(const int TOKEN);
void hideWgtTexture(const int TOKEN); void hideWgtTexture(const int TOKEN);