Browse Source

Fix samples for new String interface

Marco Bortolin 6 years ago
parent
commit
8eaf012599

+ 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);
     file_interface->Close(file_handle);
 
 
     size_t i;
     size_t i;
-    for(i = source.Length() - 1; i > 0; i--)
+    for(i = source.length() - 1; i > 0; i--)
     {
     {
         if(source[i] == '.')
         if(source[i] == '.')
             break;
             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) {
     if (surface) {
         SDL_Texture *texture = SDL_CreateTextureFromSurface(mRenderer, 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;
         break;
 	};
 	};
 
 
-	printf("%s - %s\n", Type.c_str(), message.CString());
+	printf("%s - %s\n", Type.c_str(), message.c_str());
 
 
 	return true;
 	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;
 		break;
 	};
 	};
 
 
-	printf("%s - %s\n", Type.c_str(), message.CString());
+	printf("%s - %s\n", Type.c_str(), message.c_str());
 
 
 	return true;
 	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;
 		break;
 	};
 	};
 
 
-	printf("%s - %s\n", Type.c_str(), message.CString());
+	printf("%s - %s\n", Type.c_str(), message.c_str());
 
 
 	return true;
 	return true;
 };
 };

+ 1 - 1
Samples/basic/treeview/src/FileSystem.cpp

@@ -89,7 +89,7 @@ struct FileSystemNode
 #else
 #else
 			struct dirent** file_list = NULL;
 			struct dirent** file_list = NULL;
 			int file_count = -1;
 			int file_count = -1;
-			file_count = scandir((root + name).CString(), &file_list, 0, alphasort);
+			file_count = scandir((root + name).c_str(), &file_list, 0, alphasort);
 			if (file_count == -1)
 			if (file_count == -1)
 				return;
 				return;
 
 

+ 4 - 4
Samples/luainvaders/src/Game.cpp

@@ -225,7 +225,7 @@ void Game::SetScore(int score)
 
 
 	Rocket::Core::Element* score_element = context->GetDocument("game_window")->GetElementById("score");
 	Rocket::Core::Element* score_element = context->GetDocument("game_window")->GetElementById("score");
 	if (score_element != NULL)
 	if (score_element != NULL)
-		score_element->SetInnerRML(Rocket::Core::String(128, "%d", score).CString());
+		score_element->SetInnerRML(Rocket::Core::String(128, "%d", score).c_str());
 
 
 	// Update the high score if we've beaten it.
 	// Update the high score if we've beaten it.
 	if (score > HighScores::GetHighScore())
 	if (score > HighScores::GetHighScore())
@@ -237,7 +237,7 @@ void Game::SetHighScore(int score)
 {
 {
 	Rocket::Core::Element* high_score_element = context->GetDocument("game_window")->GetElementById("hiscore");
 	Rocket::Core::Element* high_score_element = context->GetDocument("game_window")->GetElementById("hiscore");
 	if (high_score_element != NULL)
 	if (high_score_element != NULL)
-		high_score_element->SetInnerRML(Rocket::Core::String(128, "%d", score).CString());
+		high_score_element->SetInnerRML(Rocket::Core::String(128, "%d", score).c_str());
 }
 }
 
 
 void Game::SetLives(int lives)
 void Game::SetLives(int lives)
@@ -246,7 +246,7 @@ void Game::SetLives(int lives)
 
 
 	Rocket::Core::Element* score_element = context->GetDocument("game_window")->GetElementById("lives");
 	Rocket::Core::Element* score_element = context->GetDocument("game_window")->GetElementById("lives");
 	if (score_element != NULL)
 	if (score_element != NULL)
-		score_element->SetInnerRML(Rocket::Core::String(128, "%d", defender_lives).CString());
+		score_element->SetInnerRML(Rocket::Core::String(128, "%d", defender_lives).c_str());
 }
 }
 
 
 void Game::SetWave(int wave)
 void Game::SetWave(int wave)
@@ -255,7 +255,7 @@ void Game::SetWave(int wave)
 
 
 	Rocket::Core::Element* waves_element = context->GetDocument("game_window")->GetElementById("waves");
 	Rocket::Core::Element* waves_element = context->GetDocument("game_window")->GetElementById("waves");
 	if (waves_element != NULL)
 	if (waves_element != NULL)
-		waves_element->SetInnerRML(Rocket::Core::String(128, "%d", wave).CString());
+		waves_element->SetInnerRML(Rocket::Core::String(128, "%d", wave).c_str());
 }
 }
 
 
 void Game::RemoveLife()
 void Game::RemoveLife()

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

@@ -227,8 +227,8 @@ void HighScores::SaveScores()
 			Rocket::Core::String colour_string;
 			Rocket::Core::String colour_string;
 			Rocket::Core::TypeConverter< Rocket::Core::Colourb, Rocket::Core::String >::Convert(scores[i].colour, colour_string);
 			Rocket::Core::TypeConverter< Rocket::Core::Colourb, Rocket::Core::String >::Convert(scores[i].colour, colour_string);
 
 
-			Rocket::Core::String score(1024, "%s\t%s\t%d\t%d\n", scores[i].name.CString(), colour_string.CString(), scores[i].wave, scores[i].score);
-			fputs(score.CString(), scores_file);		
+			Rocket::Core::String score(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);		
 		}
 		}
 
 
 		fclose(scores_file);
 		fclose(scores_file);