Browse Source

Merge pull request #28 from barotto/rmlui-perf

Fix samples for new String interface
Michael R. P. Ragazzon 6 years ago
parent
commit
71256eeec1

+ 3 - 3
Samples/basic/sdl2/src/RenderInterfaceSDL2.cpp

@@ -133,15 +133,15 @@ bool RocketSDL2Renderer::LoadTexture(Rocket::Core::TextureHandle& texture_handle
     file_interface->Close(file_handle);
 
     size_t i;
-    for(i = source.Length() - 1; i > 0; i--)
+    for(i = source.length() - 1; i > 0; i--)
     {
         if(source[i] == '.')
             break;
     }
 
-    Rocket::Core::String extension = source.Substring(i+1, source.Length()-i);
+    Rocket::Core::String extension = source.substr(i+1, source.length()-i);
 
-    SDL_Surface* surface = IMG_LoadTyped_RW(SDL_RWFromMem(buffer, buffer_size), 1, extension.CString());
+    SDL_Surface* surface = IMG_LoadTyped_RW(SDL_RWFromMem(buffer, buffer_size), 1, extension.c_str());
 
     if (surface) {
         SDL_Texture *texture = SDL_CreateTextureFromSurface(mRenderer, surface);

+ 1 - 1
Samples/basic/sdl2/src/SystemInterfaceSDL2.cpp

@@ -435,7 +435,7 @@ bool RocketSDL2SystemInterface::LogMessage(Rocket::Core::Log::Type type, const R
         break;
 	};
 
-	printf("%s - %s\n", Type.c_str(), message.CString());
+	printf("%s - %s\n", Type.c_str(), message.c_str());
 
 	return true;
 };

+ 1 - 1
Samples/basic/sfml/src/SystemInterfaceSFML.cpp

@@ -335,7 +335,7 @@ bool RocketSFMLSystemInterface::LogMessage(Rocket::Core::Log::Type type, const R
 		break;
 	};
 
-	printf("%s - %s\n", Type.c_str(), message.CString());
+	printf("%s - %s\n", Type.c_str(), message.c_str());
 
 	return true;
 };

+ 1 - 1
Samples/basic/sfml2/src/SystemInterfaceSFML.cpp

@@ -335,7 +335,7 @@ bool RocketSFMLSystemInterface::LogMessage(Rocket::Core::Log::Type type, const R
 		break;
 	};
 
-	printf("%s - %s\n", Type.c_str(), message.CString());
+	printf("%s - %s\n", Type.c_str(), message.c_str());
 
 	return true;
 };

+ 1 - 1
Samples/luainvaders/src/HighScores.cpp

@@ -226,7 +226,7 @@ void HighScores::SaveScores()
 		{
 			Rocket::Core::String colour_string;
 			Rocket::Core::TypeConverter< Rocket::Core::Colourb, Rocket::Core::String >::Convert(scores[i].colour, colour_string);
-
+      
 			Rocket::Core::String score = Rocket::Core::CreateString(1024, "%s\t%s\t%d\t%d\n", scores[i].name.c_str(), colour_string.c_str(), scores[i].wave, scores[i].score);
 			fputs(score.c_str(), scores_file);		
 		}