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

[supertux.git] / src / addon / addon_manager.hpp

diff --git a/src/addon/addon_manager.hpp b/src/addon/addon_manager.hpp
index 4c6b594..693acd3 100644 (file)
--- a/src/addon/addon_manager.hpp
+++ b/src/addon/addon_manager.hpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux - Add-on Manager
 //  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,19 +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.
-//
-#ifndef ADDON_MANAGER_H
-#define ADDON_MANAGER_H
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef HEADER_SUPERTUX_ADDON_ADDON_MANAGER_HPP
+#define HEADER_SUPERTUX_ADDON_ADDON_MANAGER_HPP
 
 #include <string>
 #include <vector>
-namespace lisp {
-class Lisp;
-class Writer;
-}
+
+#include "util/reader_fwd.hpp"
+#include "util/writer_fwd.hpp"
 
 class Addon;
 
@@ -94,7 +89,7 @@ public:
   /**
    * Read AddonManager configuration from Lisp
    */
-  void read(const lisp::Lisp& lisp);
+  void read(const Reader& lisp);
 
 protected:
   std::vector<Addon*> addons;
@@ -105,3 +100,5 @@ protected:
 };
 
 #endif
+
+/* EOF */