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

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

diff --git a/src/lisp/list_iterator.cpp b/src/lisp/list_iterator.cpp
index de46fca..218fad1 100644 (file)
--- a/src/lisp/list_iterator.cpp
+++ b/src/lisp/list_iterator.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,16 +12,12 @@
 //  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 "list_iterator.hpp"
+#include "lisp/list_iterator.hpp"
 #include <stdexcept>
 
-namespace lisp
-{
+namespace lisp {
 
 ListIterator::ListIterator(const lisp::Lisp* newlisp)
   : current_lisp(0), cur(newlisp)
@@ -43,8 +37,8 @@ ListIterator::next()
     throw std::runtime_error("Expected CONS");
   const lisp::Lisp* name = child->get_car();
   if(!name || (
-        name->get_type() != lisp::Lisp::TYPE_SYMBOL
-        && name->get_type() != lisp::Lisp::TYPE_STRING))
+       name->get_type() != lisp::Lisp::TYPE_SYMBOL
+       && name->get_type() != lisp::Lisp::TYPE_STRING))
     throw std::runtime_error("Expected symbol");
   name->get(current_item);
   current_lisp = child->get_cdr();
@@ -54,3 +48,5 @@ ListIterator::next()
 }
 
 }
+
+/* EOF */