Changeset 7255 in orxonox.OLD for branches/preferences/src/orxonox.h

Timestamp:

Mar 30, 2006, 11:11:16 AM (18 years ago)

Author:

rennerc

Message:

one char* removed

File:

• branches/preferences/src/orxonox.h (modified) (3 diffs)

branches/preferences/src/orxonox.h

@@ -22 +22 @@
   inline static Orxonox* getInstance() { if (!singletonRef) singletonRef = new Orxonox();  return singletonRef; };
 
-  int init(int argc, char** argv, const char* name, int port);
+  int init(int argc, char** argv, const std::string & name, int port);
 
   void restart();
@@ -49 +49 @@
   char**            argv;                    //!< Values of th Arguments of orxonox.
 
-  const char*       serverName;              //!< Name of the Orxonox client if == NULL -> server
+  std::string       serverName;              //!< Name of the Orxonox client if == "" -> server
   int               port;                    //!< number of the network port of the server/client if == -1 no network
 };
@@ -59 +59 @@
 
 int startNetworkOrxonox(int argc, char** argv);
-int startOrxonox(int argc, char** argv, const char* clientName, int port);
+int startOrxonox(int argc, char** argv, const std::string & clientName, int port);
 
 #endif /* _ORXONOX_H */