Changeset 7255 in orxonox.OLD for branches

Timestamp:

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

Author:

rennerc

Message:

one char* removed

Location:

branches/preferences/src

Files:

• lib/network/network_manager.cc (modified) (1 diff)
• lib/network/network_manager.h (modified) (1 diff)
• orxonox.cc (modified) (6 diffs)
• orxonox.h (modified) (3 diffs)

branches/preferences/src/lib/network/network_manager.cc

@@ -88 +88 @@
  * @param hostName: the name of the destination host
  */
-int NetworkManager::establishConnection(const char* name, unsigned int port)
+int NetworkManager::establishConnection(const std::string & name, unsigned int port)
 {
   IPaddress ipAddress;
-  int error = SDLNet_ResolveHost(&ipAddress, name, port);
+  int error = SDLNet_ResolveHost(&ipAddress, name.c_str(), port);
   if( error == -1) {
     printf("\n\nerror on address resolution, program inconsistency\n\n");

branches/preferences/src/lib/network/network_manager.h

@@ -36 +36 @@
     void shutdown();
 
-    int establishConnection(const char* name, unsigned int port);
+    int establishConnection( const std::string & name, unsigned int port);
     int createServer(unsigned int port);
 

branches/preferences/src/orxonox.cc

@@ -89 +89 @@
 
   /* this way, there is no network enabled: */
-  this->serverName = NULL;
+  this->serverName = "";
   this->port = -1;
 
@@ -185 +185 @@
  * initialize Orxonox with command line
  */
-int Orxonox::init (int argc, char** argv, const char* name, int port)
+int Orxonox::init (int argc, char** argv, const std::string & name, int port)
 {
   this->argc = argc;
@@ -277 +277 @@
   PRINT(3)("> Initializing networking\n");
 
-  if( this->serverName != NULL) // we are a client
+  if( this->serverName != "") // we are a client
   {
     State::setOnline(true);
@@ -424 +424 @@
     return startNetworkOrxonox(argc, argv);
   
-  return startOrxonox(argc, argv, NULL, -1);
+  return startOrxonox(argc, argv, "", -1);
   return 0;
 }
@@ -461 +461 @@
     printf("Starting Orxonox as server: listening on port %i\n", port);
     
-    startOrxonox(argc, argv, NULL, port);
+    startOrxonox(argc, argv, "", port);
   }
 }
@@ -472 +472 @@
  * @param argv parameters given to orxonox
  */
-int startOrxonox(int argc, char** argv, const char* name, int port)
+int startOrxonox(int argc, char** argv, const std::string & name, int port)
 {
   // checking for existence of the configuration-files, or if the lock file is still used

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 */