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

[supertux.git] / src / lisp / lisp.hpp

diff --git a/src/lisp/lisp.hpp b/src/lisp/lisp.hpp
index c65b2ea..9866c27 100644 (file)
--- a/src/lisp/lisp.hpp
+++ b/src/lisp/lisp.hpp
@@ -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,18 +12,16 @@
 //  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.
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef __LISPREADER_H__
-#define __LISPREADER_H__
+#ifndef HEADER_SUPERTUX_LISP_LISP_HPP
+#define HEADER_SUPERTUX_LISP_LISP_HPP
 
+#include <assert.h>
 #include <string>
 #include <vector>
-#include <assert.h>
 
-namespace lisp
-{
+namespace lisp {
 
 class Lisp
 {
@@ -124,13 +120,13 @@ public:
     return v.boolean;
   }
 
-  /** conveniance functions which traverse the list until a child with a
+  /** convenience functions which traverse the list until a child with a
    * specified name is found. The value part is then interpreted in a specific
    * way. The functions return true, if a child was found and could be
    * interpreted correctly, otherwise false is returned and the variable value
    * is not changed.
    * (Please note that searching the lisp structure is O(n) so these functions
-   *  are no good idea for performance critical areas)
+   *  are not a good idea for performance critical areas)
    */
   template<class T>
   bool get(const char* name, T& val) const
@@ -148,7 +144,7 @@ public:
   }
 
   template<class T>
-  bool get_vector(const char* name, std::vector<T>& vec) const
+  bool get(const char* name, std::vector<T>& vec) const
   {
     vec.clear();
 
@@ -198,3 +194,5 @@ private:
 } // end of namespace lisp
 
 #endif
+
+/* EOF */