[Scummvm-cvs-logs] CVS: scummvm/common str.cpp,1.7,1.8

[Max Horn]

Update of /cvsroot/scummvm/scummvm/common
In directory usw-pr-cvs1:/tmp/cvs-serv18864/common

Modified Files:
	str.cpp 
Log Message:
patch #612722: MI2 NewGui title fix

Index: str.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/str.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- str.cpp	26 Sep 2002 12:29:10 -0000	1.7
+++ str.cpp	28 Sep 2002 19:25:09 -0000	1.8
@@ -20,13 +20,10 @@
 
 #include "stdafx.h"
 #include "str.h"
-#include "util.h"
 
 
 #ifdef _MSC_VER
-
 #	pragma warning( disable : 4068 ) // unknown pragmas
-
 #endif
 
 
@@ -39,7 +36,7 @@
 		if (len > 0)
 			_capacity = _len = len;
 		else
-			_capacity = _len = resStrLen(str);
+			_capacity = _len = strlen(str);
 		_str = (char *)calloc(1, _capacity+1);
 		memcpy(_str, str, _len);
 		_str[_len] = 0;
@@ -54,7 +51,7 @@
 	printf("String::String(const ConstString &str)\n");
 	_refCount = new int(1);
 	if (str._str) {		
-		_capacity = _len = resStrLen(str._str);
+		_capacity = _len = strlen(str._str);
 		_str = (char *)calloc(1, _capacity+1);
 		memcpy(_str, str._str, _len+1);
 	} else {
@@ -90,7 +87,7 @@
 
 String& String::operator  =(const char* str)
 {	
-	int len = resStrLen(str);
+	int len = strlen(str);
 	if (len > 0) {
 		ensureCapacity(len, false);
 		
@@ -123,7 +120,7 @@
 
 String& String::operator +=(const char* str)
 {
-	int len = resStrLen(str);
+	int len = strlen(str);
 	if (len > 0) {
 		ensureCapacity(_len + len, true);