Changeset 7205 in orxonox.OLD for branches/std/src/lib/graphics/importer

Timestamp:

Mar 9, 2006, 8:47:20 PM (19 years ago)

Author:

rennerc

Message:

removed std::string& a = NULL in some headers

Location:

branches/std/src/lib/graphics/importer

Files:

• md2Model.h (modified) (2 diffs)
• movie_player.h (modified) (1 diff)
• static_model.h (modified) (1 diff)
• texture.h (modified) (1 diff)

branches/std/src/lib/graphics/importer/md2Model.h

@@ -194 +194 @@
  private:
    bool loadModel(const std::string& fileName);
-   bool loadSkin(const std::string& fileName = NULL);
+   bool loadSkin(const std::string& fileName = "");
 
  public:
@@ -223 +223 @@
 
 public:
-  MD2Model(const std::string& modelFileName, const std::string& skinFileName = NULL, float scale = 1.0f);
+  MD2Model(const std::string& modelFileName, const std::string& skinFileName = "", float scale = 1.0f);
   virtual ~MD2Model();
 

branches/std/src/lib/graphics/importer/movie_player.h

@@ -58 +58 @@
 public:
 
-  MoviePlayer(const std::string& filename = NULL);
+  MoviePlayer(const std::string& filename = "");
   virtual ~MoviePlayer();
 

branches/std/src/lib/graphics/importer/static_model.h

@@ -95 +95 @@
 {
  public:
-  StaticModel(const std::string& modelName = NULL);
+  StaticModel(const std::string& modelName = "");
   virtual ~StaticModel();
 

branches/std/src/lib/graphics/importer/texture.h

@@ -18 +18 @@
   {
     public:
-      Texture(const std::string& imageName = NULL, GLenum target = GL_TEXTURE_2D);
+      Texture(const std::string& imageName = "", GLenum target = GL_TEXTURE_2D);
   //  Texture(TEXTURE_TYPE type, int resolution);
       virtual ~Texture();