Merged changes from branches/supertux-milestone2-grumbel/ to trunk/supertux/

[supertux.git] / src / lisp / writer.cpp

diff --git a/src/lisp/writer.cpp b/src/lisp/writer.cpp
index a531caa..41854d3 100644 (file)
--- a/src/lisp/writer.cpp
+++ b/src/lisp/writer.cpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux
 //  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
-//  This program is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU General Public License
-//  as published by the Free Software Foundation; either version 2
-//  of the License, or (at your option) any later version.
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
 //
 //  This program is distributed in the hope that it will be useful,
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,19 +12,14 @@
 //  GNU General Public License for more details.
 //
 //  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 <config.h>
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <iostream>
+#include "lisp/writer.hpp"
 
-#include "writer.hpp"
 #include "physfs/physfs_stream.hpp"
-#include "log.hpp"
+#include "util/log.hpp"
 
-namespace lisp
-{
+namespace lisp {
 
 Writer::Writer(const std::string& filename)
 {
@@ -108,7 +101,7 @@ Writer::write(const std::string& name, float value)
 
 void
 Writer::write(const std::string& name, const std::string& value,
-    bool translatable)
+              bool translatable)
 {
   indent();
   *out << '(' << name;
@@ -132,7 +125,7 @@ Writer::write(const std::string& name, bool value)
 
 void
 Writer::write(const std::string& name,
-    const std::vector<int>& value)
+              const std::vector<int>& value)
 {
   indent();
   *out << '(' << name;
@@ -143,7 +136,7 @@ Writer::write(const std::string& name,
 
 void
 Writer::write(const std::string& name,
-    const std::vector<unsigned int>& value)
+              const std::vector<unsigned int>& value)
 {
   indent();
   *out << '(' << name;
@@ -154,7 +147,7 @@ Writer::write(const std::string& name,
 
 void
 Writer::write(const std::string& name,
-                           const std::vector<float>& value)
+              const std::vector<float>& value)
 {
   indent();
   *out << '(' << name;
@@ -165,7 +158,7 @@ Writer::write(const std::string& name,
 
 void
 Writer::write(const std::string& name,
-                           const std::vector<std::string>& value)
+              const std::vector<std::string>& value)
 {
   indent();
   *out << '(' << name;
@@ -199,3 +192,5 @@ Writer::indent()
 }
 
 } // end of namespace lisp
+
+/* EOF */