Fixed: Warnings with GCC

This commit is contained in:
kervala 2013-09-22 13:20:19 +02:00
parent 61a5647bdd
commit 82904232d2
5 changed files with 21 additions and 21 deletions

View file

@ -2233,35 +2233,35 @@ namespace NLGUI
if( editorMode ) if( editorMode )
{ {
ptr = xmlGetProp( cur, BAD_CAST "on_open" ); ptr = xmlGetProp( cur, BAD_CAST "on_open" );
if( ptr != NULL ) if( ptr )
mapAHString( "on_open", std::string( (const char*)ptr ) ); mapAHString( "on_open", std::string( (const char*)ptr ) );
ptr = xmlGetProp( cur, BAD_CAST "on_close" ); ptr = xmlGetProp( cur, BAD_CAST "on_close" );
if( ptr != NULL ) if( ptr )
mapAHString( "on_close", std::string( (const char*)ptr ) ); mapAHString( "on_close", std::string( (const char*)ptr ) );
ptr = xmlGetProp( cur, BAD_CAST "on_close_button" ); ptr = xmlGetProp( cur, BAD_CAST "on_close_button" );
if( ptr != NULL ) if( ptr )
mapAHString( "on_close_button", std::string( (const char*)ptr ) ); mapAHString( "on_close_button", std::string( (const char*)ptr ) );
ptr = xmlGetProp( cur, BAD_CAST "on_move" ); ptr = xmlGetProp( cur, BAD_CAST "on_move" );
if( ptr != NULL ) if( ptr )
mapAHString( "on_move", std::string( (const char*)ptr ) ); mapAHString( "on_move", std::string( (const char*)ptr ) );
ptr = xmlGetProp( cur, BAD_CAST "on_deactive_check" ); ptr = xmlGetProp( cur, BAD_CAST "on_deactive_check" );
if( ptr != NULL ) if( ptr )
mapAHString( "on_deactive_check", std::string( (const char*)ptr ) ); mapAHString( "on_deactive_check", std::string( (const char*)ptr ) );
ptr = xmlGetProp( cur, BAD_CAST "on_resize" ); ptr = xmlGetProp( cur, BAD_CAST "on_resize" );
if( ptr != NULL ) if( ptr )
mapAHString( "on_resize", std::string( (const char*)ptr ) ); mapAHString( "on_resize", std::string( (const char*)ptr ) );
ptr = xmlGetProp( cur, BAD_CAST "on_alpha_settings_changed" ); ptr = xmlGetProp( cur, BAD_CAST "on_alpha_settings_changed" );
if( ptr != NULL ) if( ptr )
mapAHString( "on_alpha_settings_changed", std::string( (const char*)ptr ) ); mapAHString( "on_alpha_settings_changed", std::string( (const char*)ptr ) );
ptr = xmlGetProp( cur, BAD_CAST "on_begin_move" ); ptr = xmlGetProp( cur, BAD_CAST "on_begin_move" );
if( ptr != NULL ) if( ptr )
mapAHString( "on_begin_move", std::string( (const char*)ptr ) ); mapAHString( "on_begin_move", std::string( (const char*)ptr ) );
} }

View file

@ -119,11 +119,11 @@ namespace NLGUI
if( editorMode ) if( editorMode )
{ {
CXMLAutoPtr ptr( (char*) xmlGetProp( cur, BAD_CAST "on_wheel_up" ) ); CXMLAutoPtr ptr( (char*) xmlGetProp( cur, BAD_CAST "on_wheel_up" ) );
if( ptr != NULL ) if( ptr )
mapAHString( "on_wheel_up", std::string( (const char*)ptr ) ); mapAHString( "on_wheel_up", std::string( (const char*)ptr ) );
ptr = (char*) xmlGetProp( cur, BAD_CAST "on_wheel_down" ); ptr = (char*) xmlGetProp( cur, BAD_CAST "on_wheel_down" );
if( ptr != NULL ) if( ptr )
mapAHString( "on_wheel_down", std::string( (const char*)ptr ) ); mapAHString( "on_wheel_down", std::string( (const char*)ptr ) );
} }

View file

@ -349,27 +349,27 @@ namespace NLGUI
if( editorMode ) if( editorMode )
{ {
ptr = (char*) xmlGetProp( cur, BAD_CAST "on_active" ); ptr = (char*) xmlGetProp( cur, BAD_CAST "on_active" );
if( ptr != NULL ) if( ptr )
mapAHString( "on_active", std::string( (const char*)ptr ) ); mapAHString( "on_active", std::string( (const char*)ptr ) );
ptr = (char*) xmlGetProp( cur, BAD_CAST "on_deactive" ); ptr = (char*) xmlGetProp( cur, BAD_CAST "on_deactive" );
if( ptr != NULL ) if( ptr )
mapAHString( "on_deactive", std::string( (const char*)ptr ) ); mapAHString( "on_deactive", std::string( (const char*)ptr ) );
ptr = (char*) xmlGetProp( cur, BAD_CAST "group_onclick_r" ); ptr = (char*) xmlGetProp( cur, BAD_CAST "group_onclick_r" );
if( ptr != NULL ) if( ptr )
mapAHString( "group_onclick_r", std::string( (const char*)ptr ) ); mapAHString( "group_onclick_r", std::string( (const char*)ptr ) );
ptr = (char*) xmlGetProp( cur, BAD_CAST "group_onclick_l" ); ptr = (char*) xmlGetProp( cur, BAD_CAST "group_onclick_l" );
if( ptr != NULL ) if( ptr )
mapAHString( "group_onclick_l", std::string( (const char*)ptr ) ); mapAHString( "group_onclick_l", std::string( (const char*)ptr ) );
ptr = (char*) xmlGetProp( cur, BAD_CAST "on_enter" ); ptr = (char*) xmlGetProp( cur, BAD_CAST "on_enter" );
if( ptr != NULL ) if( ptr )
mapAHString( "on_enter", std::string( (const char*)ptr ) ); mapAHString( "on_enter", std::string( (const char*)ptr ) );
ptr = (char*) xmlGetProp( cur, BAD_CAST "on_escape" ); ptr = (char*) xmlGetProp( cur, BAD_CAST "on_escape" );
if( ptr != NULL ) if( ptr )
mapAHString( "on_escape", std::string( (const char*)ptr ) ); mapAHString( "on_escape", std::string( (const char*)ptr ) );
} }

View file

@ -1001,7 +1001,7 @@ namespace NLGUI
ptr = (char*) xmlGetProp (cur, (xmlChar*)"target"); ptr = (char*) xmlGetProp (cur, (xmlChar*)"target");
std::string target; std::string target;
if( ptr != NULL ) if( ptr )
{ {
target = std::string( (const char*)ptr ); target = std::string( (const char*)ptr );
if( !editorMode ) if( !editorMode )
@ -1136,17 +1136,17 @@ namespace NLGUI
VariableData data; VariableData data;
ptr = xmlGetProp( cur, BAD_CAST "entry" ); ptr = xmlGetProp( cur, BAD_CAST "entry" );
if( ptr != NULL ) if( ptr )
data.entry = std::string( (const char*)ptr ); data.entry = std::string( (const char*)ptr );
data.type = type; data.type = type;
ptr = xmlGetProp( cur, BAD_CAST "value" ); ptr = xmlGetProp( cur, BAD_CAST "value" );
if( ptr != NULL ) if( ptr )
data.value = std::string( (const char*)ptr ); data.value = std::string( (const char*)ptr );
ptr = xmlGetProp( cur, BAD_CAST "size" ); ptr = xmlGetProp( cur, BAD_CAST "size" );
if( ptr != NULL ) if( ptr )
fromString( std::string( (const char*)ptr ), data.size ); fromString( std::string( (const char*)ptr ), data.size );
variableCache[ data.entry ] = data; variableCache[ data.entry ] = data;

View file

@ -77,7 +77,7 @@ protected:
float TimeOut; float TimeOut;
bool TestNoMoreParticles; bool TestNoMoreParticles;
public: public:
CFX2Remove(NL3D::UParticleSystemInstance instance=NL3D::UParticleSystemInstance(), float timeOut = NULL, bool testNoMoreParticles = false) CFX2Remove(NL3D::UParticleSystemInstance instance=NL3D::UParticleSystemInstance(), float timeOut = 0.f, bool testNoMoreParticles = false)
{ {
Instance = instance; Instance = instance;
TimeOut = timeOut; TimeOut = timeOut;