diff src/modules/window/sdl/Window.cpp @ 1418:357697c2e2a8

More internal code cleanup
author Alex Szpakowski <slime73@gmail.com>
date Sun, 31 Mar 2013 19:02:27 -0300
parents 9115e52f5350
children
line wrap: on
line diff
--- a/src/modules/window/sdl/Window.cpp	Sun Mar 31 04:55:03 2013 -0300
+++ b/src/modules/window/sdl/Window.cpp	Sun Mar 31 19:02:27 2013 -0300
@@ -211,7 +211,7 @@
 
 typedef Window::WindowSize WindowSize;
 
-WindowSize **Window::getFullscreenSizes(int &n) const
+WindowSize *Window::getFullscreenSizes(int &n) const
 {
 	SDL_Rect **modes = SDL_ListModes(0, SDL_OPENGL | SDL_FULLSCREEN);
 
@@ -225,13 +225,12 @@
 	for (int i = 0; modes[i]; i++)
 		n++;
 
-	WindowSize **sizes = new WindowSize*[n];
+	WindowSize *sizes = new WindowSize[n];
 
 	for (int i = 0; i < n; i++)
 	{
-		sizes[i] = new WindowSize;
-		sizes[i]->width = modes[i]->w;
-		sizes[i]->height = modes[i]->h;
+		WindowSize w = {modes[i]->w, modes[i]->h};
+		sizes[i] = w;
 	}
 	return sizes;
 }
@@ -251,7 +250,7 @@
 	return created;
 }
 
-void Window::setWindowTitle(std::string &title)
+void Window::setWindowTitle(const std::string &title)
 {
 	windowTitle = title;
 	SDL_WM_SetCaption(windowTitle.c_str(), 0);