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

[supertux.git] / src / physfs / physfs_stream.hpp

diff --git a/src/physfs/physfs_stream.hpp b/src/physfs/physfs_stream.hpp
index 077a876..9d2ed47 100644 (file)
--- a/src/physfs/physfs_stream.hpp
+++ b/src/physfs/physfs_stream.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,17 +12,13 @@
 //  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 __PHYSFSSTREAM_HPP__
-#define __PHYSFSSTREAM_HPP__
+#ifndef HEADER_SUPERTUX_PHYSFS_PHYSFS_STREAM_HPP
+#define HEADER_SUPERTUX_PHYSFS_PHYSFS_STREAM_HPP
 
-#include <stddef.h>
-#include <physfs.h>
-#include <string>
-#include <streambuf>
 #include <iostream>
+#include <physfs.h>
 
 /** This class implements a C++ streambuf object for physfs files.
  * So that you can use normal istream operations on them
@@ -32,47 +26,49 @@
 class IFileStreambuf : public std::streambuf
 {
 public:
-    IFileStreambuf(const std::string& filename);
-    ~IFileStreambuf();
+  IFileStreambuf(const std::string& filename);
+  ~IFileStreambuf();
 
 protected:
-    virtual int underflow();
-    virtual pos_type seekoff(off_type pos, std::ios_base::seekdir,
-        std::ios_base::openmode);
-    virtual pos_type seekpos(pos_type pos, std::ios_base::openmode);
+  virtual int underflow();
+  virtual pos_type seekoff(off_type pos, std::ios_base::seekdir,
+                           std::ios_base::openmode);
+  virtual pos_type seekpos(pos_type pos, std::ios_base::openmode);
 
 private:
-    PHYSFS_file* file;
-    char buf[1024];
+  PHYSFS_file* file;
+  char buf[1024];
 };
 
 class OFileStreambuf : public std::streambuf
 {
 public:
-    OFileStreambuf(const std::string& filename);
-    ~OFileStreambuf();
+  OFileStreambuf(const std::string& filename);
+  ~OFileStreambuf();
 
 protected:
-    virtual int overflow(int c);
-    virtual int sync();
+  virtual int overflow(int c);
+  virtual int sync();
 
 private:
-    PHYSFS_file* file;
-    char buf[1024];
+  PHYSFS_file* file;
+  char buf[1024];
 };
 
 class IFileStream : public std::istream
 {
 public:
-    IFileStream(const std::string& filename);
-    ~IFileStream();
+  IFileStream(const std::string& filename);
+  ~IFileStream();
 };
 
 class OFileStream : public std::ostream
 {
 public:
-    OFileStream(const std::string& filename);
-    ~OFileStream();
+  OFileStream(const std::string& filename);
+  ~OFileStream();
 };
 
 #endif
+
+/* EOF */