[Scummvm-cvs-logs] SF.net SVN: scummvm: [25354] scummvm/trunk/base/commandLine.cpp

[fingolfin at users.sourceforge.net]

Revision: 25354
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25354&view=rev
Author:   fingolfin
Date:     2007-02-03 10:09:09 -0800 (Sat, 03 Feb 2007)

Log Message:
-----------
Change s_appName from Common::String to const char * on all platforms

Modified Paths:
--------------
    scummvm/trunk/base/commandLine.cpp

Modified: scummvm/trunk/base/commandLine.cpp
===================================================================
--- scummvm/trunk/base/commandLine.cpp	2007-02-03 18:08:10 UTC (rev 25353)
+++ scummvm/trunk/base/commandLine.cpp	2007-02-03 18:09:09 UTC (rev 25354)
@@ -133,11 +133,7 @@
 ;
 #endif
 
-#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__) || defined (__SYMBIAN32__))
-static Common::String s_appName("scummvm");
-#else
 static const char *s_appName = "scummvm";
-#endif
 
 static void usage(const char *s, ...) GCC_PRINTF(1, 2);
 
@@ -150,7 +146,7 @@
 	va_end(va);
 
 #if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__) || defined (__SYMBIAN32__))
-	printf(USAGE_STRING, s_appName.c_str(), buf, s_appName.c_str(), s_appName.c_str());
+	printf(USAGE_STRING, s_appName, buf, s_appName, s_appName);
 #endif
 	exit(1);
 }
@@ -628,11 +624,7 @@
 		printf("Features compiled in: %s\n", gScummVMFeatures);
 		return false;
 	} else if (command == "help") {
-#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__) || defined(__SYMBIAN32__))
-		printf(HELP_STRING, s_appName.c_str());
-#else
 		printf(HELP_STRING, s_appName);
-#endif
 		return false;
 	}
 #ifdef DETECTOR_TESTING_HACK


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.