Removed trailing whitespace from all *.?pp files

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

diff --git a/src/addon/addon.hpp b/src/addon/addon.hpp
index a07be26..69b0bd9 100644 (file)
--- a/src/addon/addon.hpp
+++ b/src/addon/addon.hpp
@@ -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,22 +12,15 @@
 //  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_H
-#define ADDON_H
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <string>
-#include <vector>
+#ifndef HEADER_SUPERTUX_ADDON_ADDON_HPP
+#define HEADER_SUPERTUX_ADDON_ADDON_HPP
 
-namespace lisp {
-class Writer;
-class Lisp;
-}
+#include <string>
 
-#include "addon/addon_manager.hpp"
+#include "util/reader_fwd.hpp"
+#include "util/writer_fwd.hpp"
 
 /**
  * Represents an (available or installed) Add-on, e.g. a level set
@@ -42,9 +33,12 @@ public:
   std::string author;
   std::string license;
   std::string http_url;
-  std::string suggested_filename; /**< filename suggested by addon author, e.g. "pak0.zip" */
-  std::string installed_physfs_filename; /**< PhysFS filename on disk, e.g. "pak0.zip" */
-  std::string installed_absolute_filename; /**< complete path and filename on disk, e.g. "/home/sommer/.supertux2/pak0.zip" */
+  /** filename suggested by addon author, e.g. "pak0.zip" */
+  std::string suggested_filename;
+  /** PhysFS filename on disk, e.g. "pak0.zip" */
+  std::string installed_physfs_filename;
+  /** complete path and filename on disk, e.g. "/home/sommer/.supertux2/pak0.zip" */
+  std::string installed_absolute_filename;
   std::string stored_md5;
   bool installed;
   bool loaded;
@@ -57,7 +51,7 @@ public:
   /**
    * Read additional information from given contents of a (supertux-addoninfo ...) block
    */
-  void parse(const lisp::Lisp& lisp);
+  void parse(const Reader& lisp);
 
   /**
    * Read additional information from given file
@@ -67,7 +61,7 @@ public:
   /**
    * Writes out Add-on metainformation to a Lisp Writer
    */
-  void write(lisp::Writer& writer) const;
+  void write(Writer& writer) const;
 
   /**
    * Writes out Add-on metainformation to a file
@@ -75,7 +69,7 @@ public:
   void write(std::string fname) const;
 
   /**
-   * Checks if Add-on is the same as given one. 
+   * Checks if Add-on is the same as given one.
    * If available, checks MD5 sum, else relies on kind, author and title alone.
    */
   bool operator==(Addon addon2) const;
@@ -85,7 +79,22 @@ protected:
 
   mutable std::string calculated_md5;
 
-  Addon() {};
+  Addon() :
+    kind(),
+    title(),
+    author(),
+    license(),
+    http_url(),
+    suggested_filename(),
+    installed_physfs_filename(),
+    installed_absolute_filename(),
+    stored_md5(),
+    installed(),
+    loaded(),
+    calculated_md5()
+  {};
 };
 
 #endif
+
+/* EOF */