Replace custom string classes with std::string - gone forever version

[xonotic/netradiant.git] / radiant / environment.cpp

diff --git a/radiant/environment.cpp b/radiant/environment.cpp
index 9583b90fbc3761fff1e41f25be173f376aec0401..a15b66ee9537ceb6858b0922dd485131f0f8276a 100644 (file)
--- a/radiant/environment.cpp
+++ b/radiant/environment.cpp
@@ -30,7 +30,7 @@
 #include "cmdlib.h"
 
 int g_argc;
-char** g_argv;
+const char ** g_argv;
 
 void args_init( int argc, char* argv[] ){
        int i, j, k;
@@ -51,11 +51,11 @@ void args_init( int argc, char* argv[] ){
        }
 
        g_argc = argc;
-       g_argv = argv;
+       g_argv = (const char **)argv;
 }
 
-char *gamedetect_argv_buffer[1024];
-void gamedetect_found_game( char *game, char *path ){
+const char *gamedetect_argv_buffer[1024];
+void gamedetect_found_game( const char *game, char *path ){
        int argc;
        static char buf[128];
 
@@ -79,7 +79,7 @@ void gamedetect_found_game( char *game, char *path ){
        g_argv = gamedetect_argv_buffer;
 }
 
-bool gamedetect_check_game( char *gamefile, const char *checkfile1, const char *checkfile2, char *buf /* must have 64 bytes free after bufpos */, int bufpos ){
+bool gamedetect_check_game( const char *gamefile, const char *checkfile1, const char *checkfile2, char *buf /* must have 64 bytes free after bufpos */, int bufpos ){
        buf[bufpos] = '/';
 
        strcpy( buf + bufpos + 1, checkfile1 );
@@ -157,8 +157,8 @@ void gamedetect(){
 
 namespace
 {
-CopiedString home_path;
-CopiedString app_path;
+std::string home_path;
+std::string app_path;
 }
 
 const char* environment_get_home_path(){
@@ -196,7 +196,7 @@ const char* LINK_NAME =
 ;
 
 /// brief Returns the filename of the executable belonging to the current process, or 0 if not found.
-char* getexename( char *buf ){
+const char* getexename( char *buf ){
        /* Now read the symbolic link */
        int ret = readlink( LINK_NAME, buf, PATH_MAX );