[Supertux-Commit] r5778 - in trunk/supertux/src: addon object scripting squirrel squirrel/sqdbg tinygettext

mathnerd314 at millhouse.dreamhost.com mathnerd314 at millhouse.dreamhost.com
Thu Sep 18 17:06:44 PDT 2008


Author: mathnerd314
Date: 2008-09-18 17:06:43 -0700 (Thu, 18 Sep 2008)
New Revision: 5778

Modified:
   trunk/supertux/src/addon/addon.cpp
   trunk/supertux/src/addon/addon.hpp
   trunk/supertux/src/addon/addon_manager.cpp
   trunk/supertux/src/addon/md5.cpp
   trunk/supertux/src/addon/md5.hpp
   trunk/supertux/src/object/decal.cpp
   trunk/supertux/src/object/decal.hpp
   trunk/supertux/src/object/icecrusher.cpp
   trunk/supertux/src/object/icecrusher.hpp
   trunk/supertux/src/object/lantern.hpp
   trunk/supertux/src/object/magicblock.hpp
   trunk/supertux/src/object/pushbutton.hpp
   trunk/supertux/src/scripting/camera.hpp
   trunk/supertux/src/scripting/squirrel_util.cpp
   trunk/supertux/src/squirrel/CMakeLists.txt
   trunk/supertux/src/squirrel/sqdbg/serialize_state.inl
   trunk/supertux/src/tinygettext/findlocale.cpp
Log:
more svn:eol-style = native and header fixes


Modified: trunk/supertux/src/addon/addon.cpp
===================================================================
--- trunk/supertux/src/addon/addon.cpp	2008-09-18 23:59:57 UTC (rev 5777)
+++ trunk/supertux/src/addon/addon.cpp	2008-09-19 00:06:43 UTC (rev 5778)
@@ -23,6 +23,9 @@
 #include <sstream>
 #include <stdexcept>
 #include <physfs.h>
+#include "lisp/lisp.hpp"
+#include "lisp/writer.hpp"
+#include "lisp/parser.hpp"
 #include "addon/addon.hpp"
 #include "addon/addon_manager.hpp"
 #include "log.hpp"

Modified: trunk/supertux/src/addon/addon.hpp
===================================================================
--- trunk/supertux/src/addon/addon.hpp	2008-09-18 23:59:57 UTC (rev 5777)
+++ trunk/supertux/src/addon/addon.hpp	2008-09-19 00:06:43 UTC (rev 5778)
@@ -23,11 +23,11 @@
 
 #include <string>
 #include <vector>
-#include "lisp/parser.hpp"
-#include "lisp/lisp.hpp"
-#include "lisp/writer.hpp"
 
-class Addon;
+namespace lisp {
+class Writer;
+class Lisp;
+}
 
 #include "addon/addon_manager.hpp"
 

Modified: trunk/supertux/src/addon/addon_manager.cpp
===================================================================
--- trunk/supertux/src/addon/addon_manager.cpp	2008-09-18 23:59:57 UTC (rev 5777)
+++ trunk/supertux/src/addon/addon_manager.cpp	2008-09-19 00:06:43 UTC (rev 5778)
@@ -28,17 +28,19 @@
 #include <sys/stat.h>
 #include <stdio.h>
 #include "addon/addon_manager.hpp"
+#include "addon/addon.hpp"
 #include "config.h"
 #include "log.hpp"
 #include "lisp/parser.hpp"
 #include "lisp/lisp.hpp"
 #include "lisp/list_iterator.hpp"
+#include "lisp/writer.hpp"
 #include "physfs/physfs_stream.hpp"
 
 #ifdef HAVE_LIBCURL
-#include <curl/curl.h>
-#include <curl/types.h>
-#include <curl/easy.h>
+#include <curl.h>
+#include <types.h>
+#include <easy.h>
 #endif
 
 #ifdef HAVE_LIBCURL


Property changes on: trunk/supertux/src/addon/addon_manager.cpp
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: trunk/supertux/src/addon/md5.cpp
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: trunk/supertux/src/addon/md5.hpp
===================================================================
--- trunk/supertux/src/addon/md5.hpp	2008-09-18 23:59:57 UTC (rev 5777)
+++ trunk/supertux/src/addon/md5.hpp	2008-09-19 00:06:43 UTC (rev 5778)
@@ -41,6 +41,9 @@
 // documentation and/or software.
 // 
 
+#ifndef SUPERTUX_ADDON_MD5_HPP
+#define SUPERTUX_ADDON_MD5_HPP
+
 #include <stdio.h>
 #include <fstream>
 #include <iostream>
@@ -92,3 +95,5 @@
     static inline void II(uint32_t& a, uint32_t b, uint32_t c, uint32_t d, uint32_t x, uint32_t s, uint32_t ac);
 
 };
+
+#endif /*SUPERTUX_ADDON_MD5_HPP*/


Property changes on: trunk/supertux/src/addon/md5.hpp
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: trunk/supertux/src/object/decal.cpp
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: trunk/supertux/src/object/decal.hpp
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: trunk/supertux/src/object/icecrusher.cpp
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: trunk/supertux/src/object/icecrusher.hpp
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: trunk/supertux/src/object/lantern.hpp
===================================================================
--- trunk/supertux/src/object/lantern.hpp	2008-09-18 23:59:57 UTC (rev 5777)
+++ trunk/supertux/src/object/lantern.hpp	2008-09-19 00:06:43 UTC (rev 5778)
@@ -18,7 +18,7 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #ifndef __SUPERTUX_LANTERN_H__
-#define __SUPERTUX_LANTERN_H___
+#define __SUPERTUX_LANTERN_H__
 
 #include "object/moving_sprite.hpp"
 #include "object/rock.hpp"

Modified: trunk/supertux/src/object/magicblock.hpp
===================================================================
--- trunk/supertux/src/object/magicblock.hpp	2008-09-18 23:59:57 UTC (rev 5777)
+++ trunk/supertux/src/object/magicblock.hpp	2008-09-19 00:06:43 UTC (rev 5778)
@@ -24,8 +24,8 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#ifndef SUPERTUX_TRAMPOLINE_H
-#define SUPERTUX_TRAMPOLINE_H
+#ifndef SUPERTUX_MAGICBLOCK_H
+#define SUPERTUX_MAGICBLOCK_H
 
 #include "moving_sprite.hpp"
 #include "lisp/lisp.hpp"

Modified: trunk/supertux/src/object/pushbutton.hpp
===================================================================
--- trunk/supertux/src/object/pushbutton.hpp	2008-09-18 23:59:57 UTC (rev 5777)
+++ trunk/supertux/src/object/pushbutton.hpp	2008-09-19 00:06:43 UTC (rev 5778)
@@ -17,8 +17,8 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#ifndef SUPERTUX_BUTTON_H
-#define SUPERTUX_BUTTON_H
+#ifndef SUPERTUX_PUSHBUTTON_H
+#define SUPERTUX_PUSHBUTTON_H
 
 #include "moving_sprite.hpp"
 #include "lisp/lisp.hpp"

Modified: trunk/supertux/src/scripting/camera.hpp
===================================================================
--- trunk/supertux/src/scripting/camera.hpp	2008-09-18 23:59:57 UTC (rev 5777)
+++ trunk/supertux/src/scripting/camera.hpp	2008-09-19 00:06:43 UTC (rev 5778)
@@ -23,6 +23,7 @@
 #ifndef SCRIPTING_API
 class Camera;
 typedef Camera _Camera;
+#include <string>
 #endif
 
 namespace Scripting

Modified: trunk/supertux/src/scripting/squirrel_util.cpp
===================================================================
--- trunk/supertux/src/scripting/squirrel_util.cpp	2008-09-18 23:59:57 UTC (rev 5777)
+++ trunk/supertux/src/scripting/squirrel_util.cpp	2008-09-19 00:06:43 UTC (rev 5778)
@@ -31,7 +31,7 @@
 #include "log.hpp"
 #include "level.hpp"
 #include "physfs/physfs_stream.hpp"
-#include "../random_generator.hpp"
+#include "random_generator.hpp"
 
 #ifdef ENABLE_SQDBG
 #include <sqdbg/sqrdbg.h>


Property changes on: trunk/supertux/src/squirrel/CMakeLists.txt
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: trunk/supertux/src/squirrel/sqdbg/serialize_state.inl
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: trunk/supertux/src/tinygettext/findlocale.cpp
===================================================================
--- trunk/supertux/src/tinygettext/findlocale.cpp	2008-09-18 23:59:57 UTC (rev 5777)
+++ trunk/supertux/src/tinygettext/findlocale.cpp	2008-09-19 00:06:43 UTC (rev 5778)
@@ -182,7 +182,7 @@
 #define RML(pn,sn) MAKELANGID(LANG_##pn, SUBLANG_##sn)
 typedef struct {
   LANGID id;
-  char*  code;
+  const char* code;
 } IDToCode;
 static const IDToCode both_to_code[] = {
   {ML(ENGLISH,US),           "en_US.ISO_8859-1"},



More information about the Supertux-Commit mailing list