- just doing some C++ifying

SVN-Revision: 1452

diff --git a/src/screen/drawing_context.cpp b/src/screen/drawing_context.cpp
index 480b8bd..c5903f5 100644 (file)
--- a/src/screen/drawing_context.cpp
+++ b/src/screen/drawing_context.cpp
@@ -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"

diff --git a/src/screen/drawing_context.h b/src/screen/drawing_context.h
index c71fda1..0051301 100644 (file)
--- a/src/screen/drawing_context.h
+++ b/src/screen/drawing_context.h
@@ -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 @@ private:
   DrawingRequests drawingrequests;
 };
 
-#endif
+#endif /*SUPERTUX_DRAWINGCONTEXT_H*/
 

diff --git a/src/screen/font.cpp b/src/screen/font.cpp
index b0c3ecb..af159b9 100644 (file)
--- a/src/screen/font.cpp
+++ b/src/screen/font.cpp
@@ -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"

diff --git a/src/screen/font.h b/src/screen/font.h
index 00b5041..5b44f6e 100644 (file)
--- a/src/screen/font.h
+++ b/src/screen/font.h
@@ -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 @@ private:
   int last_char;
 };
 
-#endif /*SUPERTUX_TEXT_H*/
+#endif /*SUPERTUX_FONT_H*/
 

diff --git a/src/screen/screen.cpp b/src/screen/screen.cpp
index 8a442b2..a89f025 100644 (file)
--- a/src/screen/screen.cpp
+++ b/src/screen/screen.cpp
@@ -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>

diff --git a/src/screen/texture.cpp b/src/screen/texture.cpp
index c82b10d..fbb9a10 100644 (file)
--- a/src/screen/texture.cpp
+++ b/src/screen/texture.cpp
@@ -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"

diff --git a/src/screen/texture.h b/src/screen/texture.h
index e39b3ee..469b309 100644 (file)
--- a/src/screen/texture.h
+++ b/src/screen/texture.h
@@ -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"