Replaced boost::shared_ptr<> with std::shared_ptr<>

[supertux.git] / src / video / texture_manager.hpp

diff --git a/src/video/texture_manager.hpp b/src/video/texture_manager.hpp
index 61350fb..54520e2 100644 (file)
--- a/src/video/texture_manager.hpp
+++ b/src/video/texture_manager.hpp
@@ -17,14 +17,17 @@
 #ifndef HEADER_SUPERTUX_VIDEO_TEXTURE_MANAGER_HPP
 #define HEADER_SUPERTUX_VIDEO_TEXTURE_MANAGER_HPP
 
+#include <SDL_video.h>
+
 #include <config.h>
 
 #include <map>
+#include <memory>
 #include <set>
 #include <string>
 #include <vector>
-#include <boost/weak_ptr.hpp>
 
+#include "util/currenton.hpp"
 #include "video/glutil.hpp"
 #include "video/texture_ptr.hpp"
 
@@ -32,7 +35,7 @@ class Texture;
 class GLTexture;
 class Rect;
 
-class TextureManager
+class TextureManager : public Currenton<TextureManager>
 {
 public:
   TextureManager();
@@ -51,10 +54,15 @@ public:
 
 private:
   friend class Texture;
-  void reap_cache_entry(const std::string& filename);
 
-  typedef std::map<std::string, boost::weak_ptr<Texture> > ImageTextures;
-  ImageTextures image_textures;
+  typedef std::map<std::string, std::weak_ptr<Texture> > ImageTextures;
+  ImageTextures m_image_textures;
+
+  typedef std::map<std::string, SDL_Surface*> Surfaces;
+  Surfaces m_surfaces;
+
+private:
+  void reap_cache_entry(const std::string& filename);
 
   TexturePtr create_image_texture(const std::string& filename, const Rect& rect);
 
@@ -66,10 +74,11 @@ private:
   TexturePtr create_image_texture_raw(const std::string& filename, const Rect& rect);
 
   TexturePtr create_dummy_texture();
-  
+
 #ifdef HAVE_OPENGL
+private:
   typedef std::set<GLTexture*> Textures;
-  Textures textures;
+  Textures m_textures;
 
   struct SavedTexture
   {
@@ -84,8 +93,9 @@ private:
     GLint wrap_s;
     GLint wrap_t;
   };
-  std::vector<SavedTexture> saved_textures;
+  std::vector<SavedTexture> m_saved_textures;
 
+private:
   void save_texture(GLTexture* texture);
 #endif
 };