[[ Cleanup ]] Remove MCNameCreateWithOldString

runrevmark · runrevmark · commit 58996c3adb70 · 2017-09-06T17:51:14.000+01:00
This patch removes the MCNameCreateWithOldString function.
diff --git a/engine/src/card.cpp b/engine/src/card.cpp
@@ -1861,8 +1861,6 @@ void MCCard::geometrychanged(const MCRectangle &p_rect)
 
 MCCard *MCCard::findname(Chunk_term type, MCNameRef inname)
 {
-   // MCNewAutoNameRef t_name;
-   // /* UNCHECKED */ MCNameCreateWithOldString(inname, &t_name);
 	if (type == CT_CARD && MCU_matchname(inname, CT_CARD, getname()))
 		return this;
 	else
diff --git a/engine/src/externalv0.cpp b/engine/src/externalv0.cpp
@@ -435,7 +435,7 @@ static int trans_stat(Exec_stat stat)
 static Exec_stat getvarptr(MCExecContext& ctxt, const MCString &vname, MCContainer& r_container)
 {
 	MCNewAutoNameRef t_name;
-    if (!MCNameCreateWithOldString(vname, &t_name))
+    if (!MCNameCreateWithNativeChars((const char_t *)vname.getstring(), vname.getlength(), &t_name))
     {
         return ES_ERROR;
     }
diff --git a/engine/src/foundation-legacy.cpp b/engine/src/foundation-legacy.cpp
@@ -1062,11 +1062,6 @@ bool MCNameCreateWithCString(const char *p_cstring, MCNameRef& r_name)
 	return MCNameCreateWithNativeChars((const char_t *)p_cstring, strlen(p_cstring), r_name);
 }
 
-bool MCNameCreateWithOldString(const MCString& p_old_string, MCNameRef& r_name)
-{
-	return MCNameCreateWithNativeChars((const char_t *)p_old_string . getstring(), p_old_string . getlength(), r_name);
-}
-
 bool MCNameGetAsIndex(MCNameRef p_name, index_t& r_index)
 {
     MCStringRef t_key;
@@ -1324,7 +1319,7 @@ IO_stat MCArrayLoadFromHandleLegacy(MCArrayRef self, IO_handle p_stream)
 			// so we pass p_translate = true.
 			t_stat = IO_read_string_legacy_full(t_key, t_length, p_stream, 1, true, true);
 			if (t_stat == IO_NORMAL)
-				if (!MCNameCreateWithOldString(MCString(t_key, t_length), &t_name))
+				if (!MCNameCreateWithNativeChars((const char_t*)t_key, t_length, &t_name))
 					t_stat = IO_ERROR;
 			
 			MCMemoryDeallocate(t_key);
diff --git a/engine/src/foundation-legacy.h b/engine/src/foundation-legacy.h
@@ -77,7 +77,6 @@ MCString MCDataGetOldString(MCDataRef data);
 ////////////////////////////////////////////////////////////////////////////////
 
 bool MCNameCreateWithCString(const char *cstring, MCNameRef& r_name);
-bool MCNameCreateWithOldString(const MCString& oldstring, MCNameRef& r_name);
 
 bool MCNameGetAsIndex(MCNameRef name, index_t& r_index);
 

Original file line number	Diff line number	Diff line change
`@@ -1861,8 +1861,6 @@ void MCCard::geometrychanged(const MCRectangle &p_rect)`
`1861`	`1861`
`1862`	`1862`	`MCCard *MCCard::findname(Chunk_term type, MCNameRef inname)`
`1863`	`1863`	`{`
`1864`		`- // MCNewAutoNameRef t_name;`
`1865`		`- // /* UNCHECKED */ MCNameCreateWithOldString(inname, &t_name);`
`1866`	`1864`	`if (type == CT_CARD && MCU_matchname(inname, CT_CARD, getname()))`
`1867`	`1865`	`return this;`
`1868`	`1866`	`else`
Original file line number	Diff line number	Diff line change
`@@ -435,7 +435,7 @@ static int trans_stat(Exec_stat stat)`
`435`	`435`	`static Exec_stat getvarptr(MCExecContext& ctxt, const MCString &vname, MCContainer& r_container)`
`436`	`436`	`{`
`437`	`437`	`MCNewAutoNameRef t_name;`
`438`		`- if (!MCNameCreateWithOldString(vname, &t_name))`
	`438`	`+ if (!MCNameCreateWithNativeChars((const char_t *)vname.getstring(), vname.getlength(), &t_name))`
`439`	`439`	`{`
`440`	`440`	`return ES_ERROR;`
`441`	`441`	`}`