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

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

diff --git a/src/lisp/list_iterator.hpp b/src/lisp/list_iterator.hpp
index bb9fe03..cf758ea 100644 (file)
--- a/src/lisp/list_iterator.hpp
+++ b/src/lisp/list_iterator.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,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.
-
-#ifndef __LISP_ITERATOR_H__
-#define __LISP_ITERATOR_H__
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <string>
+#ifndef HEADER_SUPERTUX_LISP_LIST_ITERATOR_HPP
+#define HEADER_SUPERTUX_LISP_LIST_ITERATOR_HPP
 
-#include "lisp.hpp"
+#include "lisp/lisp.hpp"
 
-namespace lisp
-{
+namespace lisp {
 
 /**
  * Small and a bit hacky helper class that helps parsing lisp lists where all
@@ -48,8 +42,14 @@ private:
   std::string current_item;
   const lisp::Lisp* current_lisp;
   const lisp::Lisp* cur;
+
+private:
+  ListIterator(const ListIterator&);
+  ListIterator& operator=(const ListIterator&);
 };
 
 }
 
 #endif
+
+/* EOF */