Changeset 7236 in orxonox.OLD for branches/preferences

Timestamp:

Mar 21, 2006, 4:13:56 PM (19 years ago)

Author:

rennerc

Message:

converted char* in preferences to std::string

Location:

branches/preferences/src

Files:

• lib/BuildLibs.am (modified) (1 diff)
• lib/parser/preferences/ini_file_prefs_reader.cc (modified) (2 diffs)
• lib/parser/preferences/ini_file_prefs_reader.h (modified) (1 diff)
• lib/util/preferences.h (modified) (4 diffs)
• orxonox.cc (modified) (2 diffs)

branches/preferences/src/lib/BuildLibs.am

@@ -16 +16 @@
                 $(LIB_PREFIX)/parser/tinyxml/libtinyxml.a \
                 $(LIB_PREFIX)/parser/ini_parser/libIniParser.a \
+                $(LIB_PREFIX)/parser/preferences/libPrefsParser.a \
                 $(LIB_PREFIX)/shell/libORXshell.a \
                 $(LIB_PREFIX)/math/libORXmath.a

branches/preferences/src/lib/parser/preferences/ini_file_prefs_reader.cc

@@ -24 +24 @@
  * standard constructor
 */
-IniFilePrefsReader::IniFilePrefsReader ( const char * fileName )
+IniFilePrefsReader::IniFilePrefsReader ( const std::string& fileName )
 {
   IniParser iniParser;
@@ -41 +41 @@
       prefs->setString( iniParser.getCurrentSection(), iniParser.getCurrentName(), iniParser.getCurrentValue(), true );
     } while (iniParser.nextVar());
-  } while (iniParser.nextSection()!=NULL);
+  } while ( iniParser.nextSection() != "" );
 
   /*iniParser.firstVar();

branches/preferences/src/lib/parser/preferences/ini_file_prefs_reader.h

@@ -15 +15 @@
 
  public:
-   IniFilePrefsReader(const char* fileName);
+   IniFilePrefsReader(const std::string& fileName);
    virtual ~IniFilePrefsReader();
 

branches/preferences/src/lib/util/preferences.h

@@ -16 +16 @@
 
 typedef struct {
-  char* name;
+  std::string name;
   MultiType value;
   bool modified;
@@ -22 +22 @@
 
 typedef struct {
-  char* sectionName;
+  std::string sectionName;
   std::list<prefItem> items;
 } prefSection ;
@@ -36 +36 @@
 
    //check if this entry exists
-   bool exists(const char* section, const char* name);
+   bool exists(const std::string& section, const std::string& name);
 
-   void setString(const char* section, const char* name, const char* value, bool dontSetModified = false);
-   void setInt(const char* section, const char* name, int value, bool dontSetModified = false);
-   void setFloat(const char* section, const char* name, float value, bool dontSetModified = false);
-   void setMultiType(const char* section, const char* name, MultiType& value, bool dontSetModified = false);
+   void setString(const std::string& section, const std::string& name, const std::string& value, bool dontSetModified = false);
+   void setInt(const std::string& section, const std::string& name, int value, bool dontSetModified = false);
+   void setFloat(const std::string& section, const std::string& name, float value, bool dontSetModified = false);
+   void setMultiType(const std::string& section, const std::string& name, MultiType& value, bool dontSetModified = false);
 
-   const char* getString(const char* section, const char* name, const char* defaultValue);
-   int getInt(const char* section, const char* name, int defaultValue);
-   float getFloat(const char* section, const char* name, float defaultValue);
-   MultiType getMultiType(const char* section, const char* name, const MultiType& defaultValue);
+   const std::string getString(const std::string& section, const std::string& name, const std::string& defaultValue);
+   int getInt(const std::string& section, const std::string& name, int defaultValue);
+   float getFloat(const std::string& section, const std::string& name, float defaultValue);
+   MultiType getMultiType(const std::string& section, const std::string& name, const MultiType& defaultValue);
 
-   void setUserIni(const char* fileName);
+   void setUserIni(const std::string& fileName);
 
    bool save();
@@ -64 +64 @@
    std::list<IniFilePrefsReader*> iniFilePrefsReaders;
 
-   char* fileName;
+   std::string& fileName;
 
 };

branches/preferences/src/orxonox.cc

@@ -405 +405 @@
   CmdLinePrefsReader prefs(argc, argv);
 
-  /*int i;
+  int i;
   for(i = 1; i < argc; ++i)
   {
@@ -418 +418 @@
     else if(!strcmp( "--license", argv[i])  || !strcmp("-l", argv[i]))
       return PRINT(0)(ORXONOX_LICENSE_SHORT);
-}
-
-  return startOrxonox(argc, argv, NULL, -1);*/
+  }
+
+  return startOrxonox(argc, argv, NULL, -1);
   return 0;
 }