Changeset 7221 in orxonox.OLD for trunk/src/orxonox.h

Timestamp:

Mar 15, 2006, 3:10:45 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the std-branche back, it runs on windows and Linux

svn merge ​https://svn.orxonox.net/orxonox/branches/std . -r7202:HEAD

File:

• trunk/src/orxonox.h (modified) (3 diffs)

trunk/src/orxonox.h

@@ -32 +32 @@
   Orxonox ();
 
-  void parseIniFile(const char* fileName);
+  void parseIniFile(const std::string& fileName);
 
   int initResources ();
@@ -41 +41 @@
   int initMisc ();
 
-  const char* getConfigFile ();
+  const std::string& getConfigFile ();
 
  private:
@@ -47 +47 @@
 
   IniParser*        iniParser;               //!< Reference to the ini-parser used in orxonox
-  char*             configFileName;          //!< Filename of the configuration-file.
+  std::string       configFileName;          //!< Filename of the configuration-file.
   GameLoader*       gameLoader;              //!< The gameLoader