Changeset 7205 in orxonox.OLD

Timestamp:

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

Author:

rennerc

Message:

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

Location:

branches/std/src/lib

Files:

• event/key_mapper.h (modified) (1 diff)
• graphics/importer/md2Model.h (modified) (2 diffs)
• graphics/importer/movie_player.h (modified) (1 diff)
• graphics/importer/static_model.h (modified) (1 diff)
• graphics/importer/texture.h (modified) (1 diff)
• graphics/shader.h (modified) (1 diff)
• parser/ini_parser/ini_parser.cc (modified) (3 diffs)
• parser/ini_parser/ini_parser.h (modified) (2 diffs)
• sound/ogg_player.h (modified) (1 diff)

branches/std/src/lib/event/key_mapper.h

@@ -29 +29 @@
   virtual ~KeyMapper();
 
-  void loadKeyBindings(const std::string& fileName = NULL);
+  void loadKeyBindings(const std::string& fileName = "" );
   void loadKeyBindings(IniParser* iniParser);
 

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();

branches/std/src/lib/graphics/shader.h

@@ -27 +27 @@
 
   public:
-  Shader(const std::string& vertexShaderFile = NULL, const std::string& fragmentShaderFile = NULL);
+  Shader(const std::string& vertexShaderFile = "", const std::string& fragmentShaderFile = "");
   virtual ~Shader();
   static Shader* getShader(const std::string& vertexShaderFile, const std::string& fragmentShaderFile);

branches/std/src/lib/parser/ini_parser/ini_parser.cc

@@ -118 +118 @@
     // READING IN THE INI-FILE //
     /////////////////////////////
-    char lineBuffer[PARSELINELENGHT];
-    char buffer[PARSELINELENGHT];
+    char lineBuffer[PARSELINELENGHT+1];
+    char buffer[PARSELINELENGHT+1];
     const char* lineBegin;
     char* ptr;
@@ -129 +129 @@
       if( (ptr = strchr( lineBuffer, '\n')) != NULL)
         *ptr = 0;
+      else
+        lineBuffer[PARSELINELENGHT] = 0;
       // cut up to the beginning of the line.
       while((*lineBegin == ' ' || *lineBegin == '\t') && lineBegin < lineBuffer + strlen(lineBuffer))
         ++lineBegin;
+      
+      if ( !strcmp( lineBegin, "" ) )
+        continue;
 
       // check if we have a FileComment
@@ -181 +186 @@
           --nameEnd;
         nameEnd[1] = '\0';
-
+        
         this->addVar(lineBegin, valueBegin);
         this->setEntryComment();

branches/std/src/lib/parser/ini_parser/ini_parser.h

@@ -67 +67 @@
 
 
-    bool addVar(const std::string& entryName, const std::string& value, const std::string& sectionName = NULL);
+    bool addVar(const std::string& entryName, const std::string& value, const std::string& sectionName = "" );
     const std::string& getVar(const std::string& entryName, const std::string& sectionName, const std::string& defaultValue = "") const;
     void setEntryComment(const std::string& comment, const std::string& entryName, const std::string& sectionName);
@@ -98 +98 @@
     std::list<IniSection>::iterator getSectionIT(const std::string& sectionName);
 
-    std::list<IniEntry>::const_iterator getEntryIT(const std::string& entryName, const std::string& sectionName = NULL) const;
-    std::list<IniEntry>::iterator getEntryIT(const std::string& entryName, const std::string& sectionName = NULL);
+    std::list<IniEntry>::const_iterator getEntryIT(const std::string& entryName, const std::string& sectionName = "") const;
+    std::list<IniEntry>::iterator getEntryIT(const std::string& entryName, const std::string& sectionName = "");
 
   private:

branches/std/src/lib/sound/ogg_player.h

@@ -27 +27 @@
 {
 public:
-  OggPlayer(const std::string& fileName = NULL);
+  OggPlayer(const std::string& fileName = "");
   virtual ~OggPlayer();