From 3fbb199385600e35935c48e038cc658855f1891b Mon Sep 17 00:00:00 2001 From: mattias Date: Sun, 7 Jun 2020 18:24:34 +0000 Subject: [PATCH] rtl: renamed overloads --- packages/rtl/generics.collections.pas | 48 +++++++++++++-------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/packages/rtl/generics.collections.pas b/packages/rtl/generics.collections.pas index a12590f..3337c40 100644 --- a/packages/rtl/generics.collections.pas +++ b/packages/rtl/generics.collections.pas @@ -168,8 +168,8 @@ type function GetEnumerator: TEnumerator; reintroduce; public constructor Create; overload; - constructor Create2(const AComparer: IComparer); overload; - constructor Create3(ACollection: TEnumerable); overload; + constructor Create(const AComparer: IComparer); overload; + constructor Create(ACollection: TEnumerable); overload; destructor Destroy; override; @@ -223,8 +223,8 @@ type procedure Notify(const aValue: T; Action: TCollectionNotification); override; public constructor Create(aOwnsObjects: Boolean = True); overload; - constructor Create2(const AComparer: IComparer; aOwnsObjects: Boolean = True); overload; - constructor Create3(const aCollection: TEnumerable; aOwnsObjects: Boolean = True); overload; + constructor Create(const AComparer: IComparer; aOwnsObjects: Boolean = True); overload; + constructor Create(const aCollection: TEnumerable; aOwnsObjects: Boolean = True); overload; property OwnsObjects: Boolean read FObjectsOwner write FObjectsOwner; end; @@ -273,7 +273,7 @@ type function GetCount: SizeInt; override; public Constructor Create; overload; - constructor Create2(ACollection: TEnumerable); overload; + constructor Create(ACollection: TEnumerable); overload; destructor Destroy; override; procedure Enqueue(const AValue: T); function Dequeue: T; @@ -295,7 +295,7 @@ type procedure Notify(const Value: T; Action: TCollectionNotification); override; public constructor Create(AOwnsObjects: Boolean = True); overload; - constructor Create2(const Collection: TEnumerable; AOwnsObjects: Boolean = True); overload; + constructor Create(const Collection: TEnumerable; AOwnsObjects: Boolean = True); overload; procedure Dequeue; reintroduce; // Can't use the result, it might have been freed; property OwnsObjects: Boolean read FOwnsObjects write FOwnsObjects; end; @@ -339,7 +339,7 @@ type procedure Notify(const aValue: T; Action: TCollectionNotification); override; public constructor Create(AOwnsObjects: Boolean = True); overload; - constructor Create2(const Collection: TEnumerable; AOwnsObjects: Boolean = True); overload; + constructor Create(const Collection: TEnumerable; AOwnsObjects: Boolean = True); overload; procedure Pop; reintroduce; // Can't use the result, it might have been freed; property OwnsObjects: Boolean read FOwnsObjects write FOwnsObjects; end; @@ -378,7 +378,7 @@ type TMyPair = TPair; constructor Create(ACapacity: Integer=0); overload; - constructor Create2(const Collection: TEnumerable); overload; + constructor Create(const Collection: TEnumerable); overload; destructor Destroy; override; procedure Add(const Key: TKey; const Value: TValue); @@ -423,7 +423,7 @@ type function DoMoveNext: Boolean; override; public constructor Create(const AIter: TJSIterator); overload; - constructor Create2(const ADictionary: TMyType); overload; + constructor Create(const ADictionary: TMyType); overload; function MoveNext: Boolean; reintroduce; property Current: TKey read GetCurrent; end; @@ -440,7 +440,7 @@ type function DoMoveNext: Boolean; override; public constructor Create(const AIter: TJSIterator); overload; - constructor Create2(const ADictionary: TMyType); overload; + constructor Create(const ADictionary: TMyType); overload; function MoveNext: Boolean; reintroduce; property Current: TValue read GetCurrent; end; @@ -503,7 +503,7 @@ type procedure KeyNotify(const Key: TKey; Action: TCollectionNotification); override; procedure ValueNotify(const Value: TValue; Action: TCollectionNotification); override; public - constructor Create2(aOwnerships: TDictionaryOwnerships; ACapacity: Integer); overload; + constructor Create(aOwnerships: TDictionaryOwnerships; ACapacity: Integer); overload; constructor Create(aOwnerships: TDictionaryOwnerships); overload; Property OwnerShips : TDictionaryOwnerships Read FOwnerships Write FOwnerShips; end; @@ -891,13 +891,13 @@ begin FComparer := TComparer.Default; end; -constructor TList.Create2(const AComparer: IComparer); +constructor TList.Create(const AComparer: IComparer); begin InitializeList; FComparer := AComparer; end; -constructor TList.Create3(ACollection: TEnumerable); +constructor TList.Create(ACollection: TEnumerable); var LItem: T; begin @@ -1276,7 +1276,7 @@ begin FMap:=TJSMap.New; end; -constructor TDictionary.Create2(const Collection: TEnumerable); +constructor TDictionary.Create(const Collection: TEnumerable); Var aPair : TMyPair; @@ -1467,7 +1467,7 @@ begin Result:=Not FVal.Done; end; -constructor TDictionary.TKeyEnumerator.Create2(const ADictionary: TMyType); +constructor TDictionary.TKeyEnumerator.Create(const ADictionary: TMyType); begin Create(ADictionary.FMap.Keys); end; @@ -1500,7 +1500,7 @@ begin Result:=Not FVal.Done; end; -constructor TDictionary.TValueEnumerator.Create2(const ADictionary: TMyType); +constructor TDictionary.TValueEnumerator.Create(const ADictionary: TMyType); begin Create(aDictionary.FMap.Values); end; @@ -1599,15 +1599,15 @@ begin FObjectsOwner := AOwnsObjects; end; -constructor TObjectList.Create2(const AComparer: IComparer; AOwnsObjects: Boolean); +constructor TObjectList.Create(const AComparer: IComparer; AOwnsObjects: Boolean); begin - inherited Create2(AComparer); + inherited Create(AComparer); FObjectsOwner := AOwnsObjects; end; -constructor TObjectList.Create3(const ACollection: TEnumerable; aOwnsObjects: Boolean); +constructor TObjectList.Create(const ACollection: TEnumerable; aOwnsObjects: Boolean); begin - inherited Create3(ACollection); + inherited Create(ACollection); FObjectsOwner := AOwnsObjects; end; @@ -1711,7 +1711,7 @@ begin A.Free; end; -constructor TObjectDictionary.Create2(aOwnerships: TDictionaryOwnerships; ACapacity: Integer); +constructor TObjectDictionary.Create(aOwnerships: TDictionaryOwnerships; ACapacity: Integer); begin Create(aOwnerShips); end; @@ -1769,7 +1769,7 @@ begin FMaxGapLength:=10; end; -constructor TQueue.Create2(ACollection: TEnumerable); +constructor TQueue.Create(ACollection: TEnumerable); var Itm: T; @@ -1872,7 +1872,7 @@ begin FOwnsObjects:=aOwnsObjects; end; -constructor TObjectQueue.Create2(const Collection: TEnumerable; AOwnsObjects: Boolean); +constructor TObjectQueue.Create(const Collection: TEnumerable; AOwnsObjects: Boolean); Var A : T; @@ -2013,7 +2013,7 @@ begin FOwnsObjects:=aOwnsObjects; end; -constructor TObjectStack.Create2(const Collection: TEnumerable; AOwnsObjects: Boolean); +constructor TObjectStack.Create(const Collection: TEnumerable; AOwnsObjects: Boolean); Var A : T;