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

[supertux.git] / src / addon / addon.cpp

diff --git a/src/addon/addon.cpp b/src/addon/addon.cpp
index 7e7e98e..2f166f1 100644 (file)
--- a/src/addon/addon.cpp
+++ b/src/addon/addon.cpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux - Add-on
 //  Copyright (C) 2007 Christoph Sommer <christoph.sommer@2007.expires.deltadevelopment.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,21 +12,19 @@
 //  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/>.
+
+#include "addon/addon.hpp"
 
-#include <string>
-#include <sstream>
-#include <stdexcept>
 #include <physfs.h>
+#include <stdexcept>
+#include <sstream>
+
+#include "addon/md5.hpp"
 #include "lisp/lisp.hpp"
-#include "lisp/writer.hpp"
 #include "lisp/parser.hpp"
-#include "addon/addon.hpp"
-#include "log.hpp"
-#include "addon/md5.hpp"
+#include "lisp/writer.hpp"
+#include "util/log.hpp"
 
 std::string
 Addon::get_md5() const
@@ -64,7 +60,7 @@ Addon::get_md5() const
 }
 
 void
-Addon::parse(const lisp::Lisp& lisp)
+Addon::parse(const Reader& lisp)
 {
   try {
     lisp.get("kind", kind);  
@@ -132,3 +128,4 @@ Addon::operator==(Addon addon2) const
   return true; 
 }
 
+/* EOF */