Updated addon repository URL and improved debug output on download

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

diff --git a/src/lisp/list_iterator.hpp b/src/lisp/list_iterator.hpp
index 7cd2750..cf758ea 100644 (file)
--- a/src/lisp/list_iterator.hpp
+++ b/src/lisp/list_iterator.hpp
@@ -1,30 +1,25 @@
-//  $Id$
-// 
 //  SuperTux
-//  Copyright (C) 2005 Matthias Braun <matze@braunis.de>
+//  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
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  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 __LISP_ITERATOR_H__
-#define __LISP_ITERATOR_H__
+#ifndef HEADER_SUPERTUX_LISP_LIST_ITERATOR_HPP
+#define HEADER_SUPERTUX_LISP_LIST_ITERATOR_HPP
 
 #include "lisp/lisp.hpp"
 
-namespace lisp
-{
+namespace lisp {
 
 /**
  * Small and a bit hacky helper class that helps parsing lisp lists where all
@@ -34,22 +29,27 @@ class ListIterator
 {
 public:
   ListIterator(const lisp::Lisp* cur);
-  
+
   const std::string& item() const
   { return current_item; }
-  lisp::Lisp* lisp() const
+  const lisp::Lisp* lisp() const
   { return current_lisp; }
-  lisp::Lisp* value() const
+  const lisp::Lisp* value() const
   { return current_lisp->get_car(); }
   bool next();
 
 private:
   std::string current_item;
-  lisp::Lisp* current_lisp;
+  const lisp::Lisp* current_lisp;
   const lisp::Lisp* cur;
+
+private:
+  ListIterator(const ListIterator&);
+  ListIterator& operator=(const ListIterator&);
 };
 
 }
 
 #endif
 
+/* EOF */