Browse Source

Rename TextAPI.ToString() to TextAPI.IntoString()

pull/8/head
Anton Tarasenko 2 years ago
parent
commit
8362d261c8
  1. 2
      sources/Avarice/AvariceTcpStream.uc
  2. 4
      sources/Data/Collections/Collection.uc
  3. 2
      sources/Data/Database/DBAPI.uc
  4. 10
      sources/Data/Database/Local/DBRecord.uc
  5. 2
      sources/Data/Database/Local/LocalDatabaseInstance.uc
  6. 2
      sources/Text/BaseText.uc
  7. 2
      sources/Text/TextAPI.uc
  8. 2
      sources/Text/TextTemplate.uc

2
sources/Avarice/AvariceTcpStream.uc

@ -103,7 +103,7 @@ public final function StartUp(AvariceLink link, float reconnectTime)
encoder = Utf8Encoder(_.memory.Allocate(class'Utf8Encoder')); encoder = Utf8Encoder(_.memory.Allocate(class'Utf8Encoder'));
avariceReader = avariceReader =
AvariceStreamReader(_.memory.Allocate(class'AvariceStreamReader')); AvariceStreamReader(_.memory.Allocate(class'AvariceStreamReader'));
linkHost = _.text.ToString(link.GetHost()); linkHost = _.text.IntoString(link.GetHost());
linkPort = link.GetPort(); linkPort = link.GetPort();
reconnectInterval = reconnectTime; reconnectInterval = reconnectTime;
TryConnecting(); TryConnecting();

4
sources/Data/Collections/Collection.uc

@ -415,7 +415,7 @@ public final function string GetStringBy(
} }
asText = BaseText(result); asText = BaseText(result);
if (asText != none) { if (asText != none) {
return _.text.ToString(asText); return _.text.IntoString(asText);
} }
_.memory.Free(result); _.memory.Free(result);
return defaultValue; return defaultValue;
@ -771,7 +771,7 @@ public final function string GetStringByJSON(
} }
asText = BaseText(result); asText = BaseText(result);
if (asText != none) { if (asText != none) {
return _.text.ToString(asText); return _.text.IntoString(asText);
} }
_.memory.Free(result); _.memory.Free(result);
return defaultValue; return defaultValue;

2
sources/Data/Database/DBAPI.uc

@ -275,7 +275,7 @@ private function EraseAllPackageData(BaseText packageToErase)
local DBRecord nextRecord; local DBRecord nextRecord;
local array<DBRecord> allRecords; local array<DBRecord> allRecords;
packageName = _.text.ToString(packageToErase); packageName = _.text.IntoString(packageToErase);
if (packageName == "") { if (packageName == "") {
return; return;
} }

10
sources/Data/Database/Local/DBRecord.uc

@ -228,7 +228,7 @@ private final function DBRecordPointer ConvertPointerPath(
} }
else else
{ {
nextComponent = __().text.ToString(pointer.GetComponent(startIndex)); nextComponent = __().text.IntoString(pointer.GetComponent(startIndex));
index = FindItem(nextComponent); index = FindItem(nextComponent);
} }
if (index < 0) { if (index < 0) {
@ -428,7 +428,7 @@ public final function bool SaveObject(
return false; return false;
} }
directContainer = pointer.record; directContainer = pointer.record;
itemKey = __().text.ToString(jsonPointer.Pop(true)); itemKey = __().text.IntoString(jsonPointer.Pop(true));
if (directContainer.isJSONArray) if (directContainer.isJSONArray)
{ {
index = jsonPointer.PopNumeric(true); index = jsonPointer.PopNumeric(true);
@ -472,7 +472,7 @@ public final function bool RemoveObject(JSONPointer jsonPointer)
} }
else else
{ {
itemKey = __().text.ToString(jsonPointer.Pop(true)); itemKey = __().text.IntoString(jsonPointer.Pop(true));
itemIndex = directContainer.FindItem(itemKey); itemIndex = directContainer.FindItem(itemKey);
} }
if (itemIndex >= 0) if (itemIndex >= 0)
@ -630,7 +630,7 @@ public final function Database.DBQueryResult IncrementObject(
return DBR_InvalidPointer; return DBR_InvalidPointer;
} }
directContainer = pointer.record; directContainer = pointer.record;
itemKey = __().text.ToString(jsonPointer.Pop(true)); itemKey = __().text.IntoString(jsonPointer.Pop(true));
if (directContainer.isJSONArray) if (directContainer.isJSONArray)
{ {
index = jsonPointer.PopNumeric(true); index = jsonPointer.PopNumeric(true);
@ -938,7 +938,7 @@ private final function FromHashTable(HashTable source)
if (iter.GetKey() == none) { if (iter.GetKey() == none) {
continue; continue;
} }
nextKey = __().text.ToString(BaseText(iter.GetKey())); nextKey = __().text.IntoString(BaseText(iter.GetKey()));
isNewKey = true; isNewKey = true;
for (i = 0; i < originalStorageLength; i += 1) for (i = 0; i < originalStorageLength; i += 1)
{ {

2
sources/Data/Database/Local/LocalDatabaseInstance.uc

@ -127,7 +127,7 @@ public final function WriteToDisk()
} }
pendingDiskUpdate = false; pendingDiskUpdate = false;
if (configEntry != none) { if (configEntry != none) {
packageName = _.text.ToString(configEntry.GetPackageName()); packageName = _.text.IntoString(configEntry.GetPackageName());
} }
if (packageName != "") { if (packageName != "") {
_server.unreal.GetGameType().SavePackage(packageName); _server.unreal.GetGameType().SavePackage(packageName);

2
sources/Text/BaseText.uc

@ -1400,7 +1400,7 @@ public final function string ToFormattedString(
optional int startIndex, optional int startIndex,
optional int maxLength) optional int maxLength)
{ {
return _.text.ToString(ToFormattedTextM(startIndex, maxLength)); return _.text.IntoString(ToFormattedTextM(startIndex, maxLength));
} }
/** /**

2
sources/Text/TextAPI.uc

@ -314,7 +314,7 @@ public final function bool IsEmpty(BaseText text)
* @return `string` representation of passed `BaseText` as a plain string. * @return `string` representation of passed `BaseText` as a plain string.
* Empty `string`, if `toConvert == none`. * Empty `string`, if `toConvert == none`.
*/ */
public final function string ToString(/*take*/ BaseText toConvert) public final function string IntoString(/*take*/ BaseText toConvert)
{ {
local string result; local string result;
if (toConvert != none) { if (toConvert != none) {

2
sources/Text/TextTemplate.uc

@ -886,7 +886,7 @@ private final function Text BorrowTextArg(BaseText Label)
*/ */
public final function string Collect_S() public final function string Collect_S()
{ {
return _.text.ToString(CollectM()); return _.text.IntoString(CollectM());
} }
/** /**

Loading…
Cancel
Save