From 8362d261c8fc34cdf1424af0bd97f89240c31412 Mon Sep 17 00:00:00 2001 From: Anton Tarasenko Date: Mon, 25 Jul 2022 02:50:53 +0700 Subject: [PATCH] Rename TextAPI.ToString() to TextAPI.IntoString() --- sources/Avarice/AvariceTcpStream.uc | 2 +- sources/Data/Collections/Collection.uc | 4 ++-- sources/Data/Database/DBAPI.uc | 2 +- sources/Data/Database/Local/DBRecord.uc | 10 +++++----- sources/Data/Database/Local/LocalDatabaseInstance.uc | 2 +- sources/Text/BaseText.uc | 2 +- sources/Text/TextAPI.uc | 2 +- sources/Text/TextTemplate.uc | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/sources/Avarice/AvariceTcpStream.uc b/sources/Avarice/AvariceTcpStream.uc index 623c287..1953a85 100644 --- a/sources/Avarice/AvariceTcpStream.uc +++ b/sources/Avarice/AvariceTcpStream.uc @@ -103,7 +103,7 @@ public final function StartUp(AvariceLink link, float reconnectTime) encoder = Utf8Encoder(_.memory.Allocate(class'Utf8Encoder')); avariceReader = AvariceStreamReader(_.memory.Allocate(class'AvariceStreamReader')); - linkHost = _.text.ToString(link.GetHost()); + linkHost = _.text.IntoString(link.GetHost()); linkPort = link.GetPort(); reconnectInterval = reconnectTime; TryConnecting(); diff --git a/sources/Data/Collections/Collection.uc b/sources/Data/Collections/Collection.uc index f5a98a0..f0db70a 100644 --- a/sources/Data/Collections/Collection.uc +++ b/sources/Data/Collections/Collection.uc @@ -415,7 +415,7 @@ public final function string GetStringBy( } asText = BaseText(result); if (asText != none) { - return _.text.ToString(asText); + return _.text.IntoString(asText); } _.memory.Free(result); return defaultValue; @@ -771,7 +771,7 @@ public final function string GetStringByJSON( } asText = BaseText(result); if (asText != none) { - return _.text.ToString(asText); + return _.text.IntoString(asText); } _.memory.Free(result); return defaultValue; diff --git a/sources/Data/Database/DBAPI.uc b/sources/Data/Database/DBAPI.uc index 5865051..0e121f7 100644 --- a/sources/Data/Database/DBAPI.uc +++ b/sources/Data/Database/DBAPI.uc @@ -275,7 +275,7 @@ private function EraseAllPackageData(BaseText packageToErase) local DBRecord nextRecord; local array allRecords; - packageName = _.text.ToString(packageToErase); + packageName = _.text.IntoString(packageToErase); if (packageName == "") { return; } diff --git a/sources/Data/Database/Local/DBRecord.uc b/sources/Data/Database/Local/DBRecord.uc index 533409a..2ea4bbc 100644 --- a/sources/Data/Database/Local/DBRecord.uc +++ b/sources/Data/Database/Local/DBRecord.uc @@ -228,7 +228,7 @@ private final function DBRecordPointer ConvertPointerPath( } else { - nextComponent = __().text.ToString(pointer.GetComponent(startIndex)); + nextComponent = __().text.IntoString(pointer.GetComponent(startIndex)); index = FindItem(nextComponent); } if (index < 0) { @@ -428,7 +428,7 @@ public final function bool SaveObject( return false; } directContainer = pointer.record; - itemKey = __().text.ToString(jsonPointer.Pop(true)); + itemKey = __().text.IntoString(jsonPointer.Pop(true)); if (directContainer.isJSONArray) { index = jsonPointer.PopNumeric(true); @@ -472,7 +472,7 @@ public final function bool RemoveObject(JSONPointer jsonPointer) } else { - itemKey = __().text.ToString(jsonPointer.Pop(true)); + itemKey = __().text.IntoString(jsonPointer.Pop(true)); itemIndex = directContainer.FindItem(itemKey); } if (itemIndex >= 0) @@ -630,7 +630,7 @@ public final function Database.DBQueryResult IncrementObject( return DBR_InvalidPointer; } directContainer = pointer.record; - itemKey = __().text.ToString(jsonPointer.Pop(true)); + itemKey = __().text.IntoString(jsonPointer.Pop(true)); if (directContainer.isJSONArray) { index = jsonPointer.PopNumeric(true); @@ -938,7 +938,7 @@ private final function FromHashTable(HashTable source) if (iter.GetKey() == none) { continue; } - nextKey = __().text.ToString(BaseText(iter.GetKey())); + nextKey = __().text.IntoString(BaseText(iter.GetKey())); isNewKey = true; for (i = 0; i < originalStorageLength; i += 1) { diff --git a/sources/Data/Database/Local/LocalDatabaseInstance.uc b/sources/Data/Database/Local/LocalDatabaseInstance.uc index c815afd..cc36ef0 100644 --- a/sources/Data/Database/Local/LocalDatabaseInstance.uc +++ b/sources/Data/Database/Local/LocalDatabaseInstance.uc @@ -127,7 +127,7 @@ public final function WriteToDisk() } pendingDiskUpdate = false; if (configEntry != none) { - packageName = _.text.ToString(configEntry.GetPackageName()); + packageName = _.text.IntoString(configEntry.GetPackageName()); } if (packageName != "") { _server.unreal.GetGameType().SavePackage(packageName); diff --git a/sources/Text/BaseText.uc b/sources/Text/BaseText.uc index df47d10..f723783 100644 --- a/sources/Text/BaseText.uc +++ b/sources/Text/BaseText.uc @@ -1400,7 +1400,7 @@ public final function string ToFormattedString( optional int startIndex, optional int maxLength) { - return _.text.ToString(ToFormattedTextM(startIndex, maxLength)); + return _.text.IntoString(ToFormattedTextM(startIndex, maxLength)); } /** diff --git a/sources/Text/TextAPI.uc b/sources/Text/TextAPI.uc index ae2757d..dbeb43d 100644 --- a/sources/Text/TextAPI.uc +++ b/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. * Empty `string`, if `toConvert == none`. */ -public final function string ToString(/*take*/ BaseText toConvert) +public final function string IntoString(/*take*/ BaseText toConvert) { local string result; if (toConvert != none) { diff --git a/sources/Text/TextTemplate.uc b/sources/Text/TextTemplate.uc index daac80f..b58d497 100644 --- a/sources/Text/TextTemplate.uc +++ b/sources/Text/TextTemplate.uc @@ -886,7 +886,7 @@ private final function Text BorrowTextArg(BaseText Label) */ public final function string Collect_S() { - return _.text.ToString(CollectM()); + return _.text.IntoString(CollectM()); } /**