Changeset 7236 in orxonox.OLD for branches/preferences/src/lib/util

Timestamp:

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

Author:

rennerc

Message:

converted char* in preferences to std::string

File:

• branches/preferences/src/lib/util/preferences.h (modified) (4 diffs)

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;
 
 };