[Super-tux-commit] supertux/src/screen drawing_context.cpp,1.6,1.7 drawing_context.h,1.5,1.6 font.cpp,1.3,1.4 font.h,1.2,1.3 screen.cpp,1.2,1.3 texture.cpp,1.3,1.4 texture.h,1.4,1.5

[Ryan F. <sik...@us...>]

Update of /cvsroot/super-tux/supertux/src/screen
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19404

Modified Files:
	drawing_context.cpp drawing_context.h font.cpp font.h 
	screen.cpp texture.cpp texture.h 
Log Message:
- just doing some C++ifying

Index: font.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/screen/font.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- font.cpp	2 Jun 2004 20:54:46 -0000	1.3
+++ font.cpp	9 Jun 2004 04:43:15 -0000	1.4
@@ -18,8 +18,9 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //  02111-1307, USA.
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
+
 #include "globals.h"
 #include "defines.h"
 #include "screen.h"

Index: drawing_context.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/screen/drawing_context.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- drawing_context.cpp	8 Jun 2004 22:21:11 -0000	1.6
+++ drawing_context.cpp	9 Jun 2004 04:43:15 -0000	1.7
@@ -16,11 +16,11 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#include <assert.h>
-#include "drawing_context.h"
-
-#include <iostream>
 #include <algorithm>
+#include <cassert>
+#include <iostream>
+
+#include "drawing_context.h"
 #include "texture.h"
 #include "globals.h"
 #include "font.h"

Index: drawing_context.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/screen/drawing_context.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- drawing_context.h	8 Jun 2004 22:21:11 -0000	1.5
+++ drawing_context.h	9 Jun 2004 04:43:15 -0000	1.6
@@ -16,14 +16,16 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#ifndef __DRAWINGCONTEXT_H__
-#define __DRAWINGCONTEXT_H__
+#ifndef SUPERTUX_DRAWINGCONTEXT_H
+#define SUPERTUX_DRAWINGCONTEXT_H
 
 #include <vector>
 #include <string>
+
+#include "SDL.h"
+
 #include "vector.h"
 #include "screen.h"
-#include <SDL.h>
 
 class Surface;
 class Font;
@@ -170,5 +172,5 @@
   DrawingRequests drawingrequests;
 };
 
-#endif
+#endif /*SUPERTUX_DRAWINGCONTEXT_H*/
 

Index: font.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/screen/font.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- font.h	2 Jun 2004 20:06:56 -0000	1.2
+++ font.h	9 Jun 2004 04:43:15 -0000	1.3
@@ -18,10 +18,11 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //  02111-1307, USA.
 
-#ifndef SUPERTUX_TEXT_H
-#define SUPERTUX_TEXT_H
+#ifndef SUPERTUX_FONT_H
+#define SUPERTUX_FONT_H
 
 #include <string>
+
 #include "texture.h"
 #include "vector.h"
 
@@ -69,5 +70,5 @@
   int last_char;
 };
 
-#endif /*SUPERTUX_TEXT_H*/
+#endif /*SUPERTUX_FONT_H*/
 

Index: texture.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/screen/texture.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- texture.cpp	8 Jun 2004 22:21:11 -0000	1.3
+++ texture.cpp	9 Jun 2004 04:43:15 -0000	1.4
@@ -18,11 +18,13 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //  02111-1307, USA.
 
-#include <assert.h>
+#include <cassert>
 #include <iostream>
 #include <algorithm>
+
 #include "SDL.h"
 #include "SDL_image.h"
+
 #include "texture.h"
 #include "globals.h"
 #include "setup.h"

Index: texture.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/screen/texture.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- texture.h	8 Jun 2004 22:21:11 -0000	1.4
+++ texture.h	9 Jun 2004 04:43:15 -0000	1.5
@@ -21,13 +21,15 @@
 #ifndef SUPERTUX_TEXTURE_H
 #define SUPERTUX_TEXTURE_H
 
-#include <SDL.h>
 #include <string>
+#include <list>
+
 #ifndef NOOPENGL
-#include <SDL_opengl.h>
+#include "SDL_opengl.h"
 #endif
 
-#include <list>
+#include "SDL.h"
+
 #include "screen.h"
 #include "vector.h"
 

Index: screen.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/screen/screen.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- screen.cpp	31 May 2004 14:08:10 -0000	1.2
+++ screen.cpp	9 Jun 2004 04:43:15 -0000	1.3
@@ -18,13 +18,15 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <iostream>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <cerrno>
+
 #include <unistd.h>
-#include <SDL.h>
-#include <SDL_image.h>
+
+#include "SDL.h"
+#include "SDL_image.h"
 
 #ifndef WIN32
 #include <sys/types.h>