* Changed some argument names (Root->ARoot etc.) because the new compiler

  now performs more ambiguity checks  (sg)

fcl/inc/classesh.inc

@@ -505,7 +505,7 @@ type
     FMemory: Pointer;
     FSize, FPosition: Longint;
   protected
-    procedure SetPointer(Ptr: Pointer; Size: Longint);
+    procedure SetPointer(Ptr: Pointer; ASize: Longint);
   public
     function Read(var Buffer; Count: Longint): Longint; override;
     function Seek(Offset: Longint; Origin: Word): Longint; override;
@@ -673,7 +673,7 @@ type
     procedure SkipComponent(SkipHeader: Boolean);
   protected
     function Error(const Message: string): Boolean; virtual;
-    function FindMethod(Root: TComponent; const MethodName: string): Pointer; virtual;
+    function FindMethod(ARoot: TComponent; const AMethodName: string): Pointer; virtual;
     procedure SetName(Component: TComponent; var Name: string); virtual;
     procedure ReferenceName(var Name: string); virtual;
     function FindAncestorComponent(const Name: string;
@@ -705,7 +705,7 @@ type
     procedure ReadListBegin;
     procedure ReadListEnd;
     procedure ReadPrefix(var Flags: TFilerFlags; var AChildPos: Integer);
-    function ReadRootComponent(Root: TComponent): TComponent;
+    function ReadRootComponent(ARoot: TComponent): TComponent;
     procedure ReadSignature;
     function ReadStr: string;
     function ReadString: string;
@@ -756,13 +756,13 @@ type
     procedure WriteCollection(Value: TCollection);
     procedure WriteComponent(Component: TComponent);
     procedure WriteChar(Value: Char);
-    procedure WriteDescendent(Root: TComponent; AAncestor: TComponent);
+    procedure WriteDescendent(ARoot: TComponent; AAncestor: TComponent);
     procedure WriteFloat(Value: Extended);
     procedure WriteIdent(const Ident: string);
     procedure WriteInteger(Value: Longint);
     procedure WriteListBegin;
     procedure WriteListEnd;
-    procedure WriteRootComponent(Root: TComponent);
+    procedure WriteRootComponent(ARoot: TComponent);
     procedure WriteSignature;
     procedure WriteStr(const Value: string);
     procedure WriteString(const Value: string);
@@ -1071,7 +1071,11 @@ function LineStart(Buffer, BufPos: PChar): PChar;
 
 {
   $Log$
-  Revision 1.15  1999-09-11 22:01:03  fcl
+  Revision 1.16  1999-09-13 08:35:16  fcl
+  * Changed some argument names (Root->ARoot etc.) because the new compiler
+    now performs more ambiguity checks  (sg)
+
+  Revision 1.15  1999/09/11 22:01:03  fcl
   * Activated component registration callbacks  (sg)
 
   Revision 1.14  1999/08/26 21:11:25  peter

fcl/inc/reader.inc

@@ -137,7 +137,7 @@ end;
 
 
 
-Function TReader.FindMethod(Root: TComponent; const MethodName: string): Pointer;
+Function TReader.FindMethod(ARoot: TComponent; const AMethodName: string): Pointer;
 
 begin
   FindMethod:=nil;
@@ -328,7 +328,7 @@ end;
 
 
 
-Function TReader.ReadRootComponent(Root: TComponent): TComponent;
+Function TReader.ReadRootComponent(ARoot: TComponent): TComponent;
 
 begin
   ReadRootComponent:=nil;
@@ -373,7 +373,11 @@ begin
 end;
 {
   $Log$
-  Revision 1.2  1999-04-08 10:18:54  peter
+  Revision 1.3  1999-09-13 08:35:16  fcl
+  * Changed some argument names (Root->ARoot etc.) because the new compiler
+    now performs more ambiguity checks  (sg)
+
+  Revision 1.2  1999/04/08 10:18:54  peter
     * makefile updates
 
 }

fcl/inc/streams.inc

@@ -336,11 +336,11 @@ end;
 {*                             TCustomMemoryStream                          *}
 {****************************************************************************}
 
-procedure TCustomMemoryStream.SetPointer(Ptr: Pointer; Size: Longint);
+procedure TCustomMemoryStream.SetPointer(Ptr: Pointer; ASize: Longint);
 
 begin
   FMemory:=Ptr;
-  FSize:=Size;
+  FSize:=ASize;
 end;
 
 
@@ -619,7 +619,11 @@ end;
 
 {
   $Log$
-  Revision 1.14  1999-07-18 20:58:47  michael
+  Revision 1.15  1999-09-13 08:35:16  fcl
+  * Changed some argument names (Root->ARoot etc.) because the new compiler
+    now performs more ambiguity checks  (sg)
+
+  Revision 1.14  1999/07/18 20:58:47  michael
   * fixed bug in realloc and setcapacity of tmemorystream
 
   Revision 1.13  1999/04/08 10:18:55  peter

fcl/inc/writer.inc

@@ -140,7 +140,7 @@ begin
 end;
 
 
-Procedure TWriter.WriteDescendent(Root: TComponent; AAncestor: TComponent);
+Procedure TWriter.WriteDescendent(ARoot: TComponent; AAncestor: TComponent);
 
 begin
 end;
@@ -176,7 +176,7 @@ begin
 end;
 
 
-Procedure TWriter.WriteRootComponent(Root: TComponent);
+Procedure TWriter.WriteRootComponent(ARoot: TComponent);
 
 begin
 end;
@@ -200,7 +200,11 @@ begin
 end;
 {
   $Log$
-  Revision 1.2  1999-04-08 10:18:58  peter
+  Revision 1.3  1999-09-13 08:35:16  fcl
+  * Changed some argument names (Root->ARoot etc.) because the new compiler
+    now performs more ambiguity checks  (sg)
+
+  Revision 1.2  1999/04/08 10:18:58  peter
     * makefile updates
 
 }