* PChar -> PAnsiChar

packages/fcl-base/examples/b64test2.pp

@@ -7,7 +7,7 @@ var
   b64decoder: TBase64DecodingStream;
   BaseStream: TStream;
   i, j: Integer;
-  buf: array[1..23] of Char;
+  buf: array[1..23] of AnsiChar;
 begin
   BaseStream := TMemoryStream.Create;
 

packages/fcl-base/examples/base64decodingtestcase.pas

@@ -29,13 +29,13 @@ type
     procedure SetUp; override;
     procedure TearDown; override;
     // utility
-    procedure WriteToSourceStream(s:string);
-    function NoiseCharString:string; // all non-base64 alphabet characters
-    function RandomNoise(l:integer):string; // l random non-base64 alphabet characters
+    procedure WriteToSourceStream(s:AnsiString);
+    function NoiseCharString:ansistring; // all non-base64 alphabet characters
+    function RandomNoise(l:integer):ansistring; // l random non-base64 alphabet characters
     // test templates
-    procedure TestGetSize(mode:TBase64DecodingMode; s:string; expectedSize:Int64);
-    procedure TestDecode (mode:TBase64DecodingMode; s, expected:string);
-    procedure TestReset  (mode:TBase64DecodingMode; s:string; start:array of Int64; expected:array of string);
+    procedure TestGetSize(mode:TBase64DecodingMode; s:AnsiString; expectedSize:Int64);
+    procedure TestDecode (mode:TBase64DecodingMode; s, expected: AnsiString);
+    procedure TestReset  (mode:TBase64DecodingMode; s:AnsiString; start:array of Int64; expected:array of ansistring);
   published
     procedure TestGetSizeStrict1;
     procedure TestGetSizeStrict2;
@@ -98,12 +98,12 @@ uses
 
 // utility routines
 type
-  TChars = set of char;
+  TChars = set of AnsiChar;
   
-function SetToString(chars:TChars):string;
+function SetToString(chars:TChars):ansistring;
 var
   pos: Integer;
-  c: Char;
+  c: AnsiChar;
 begin
   pos:=0;
   SetLength(Result,256);
@@ -115,11 +115,11 @@ begin
   SetLength(Result,pos);
 end;
 
-function Shuffle(s:string):string;
+function Shuffle(s: ansistring): ansistring;
 var
   i: Integer;
   randomPos: Integer;
-  c: Char;
+  c: AnsiChar;
 begin
   UniqueString(s);
   for i:=1 to Length(s) do begin
@@ -132,7 +132,7 @@ begin
 end;
 
 // order preserving shuffle
-function Merge(s,t:string):string;
+function Merge(s,t: ansistring): ansistring;
 var
   si: Integer;
   ti: Integer;
@@ -181,21 +181,21 @@ begin
   FreeAndNil(SourceStream);
 end;
 
-procedure TBase64DecodingStreamTestCase.WriteToSourceStream(s: string);
+procedure TBase64DecodingStreamTestCase.WriteToSourceStream(s: ansistring);
 begin
   SourceStream.Write(s[1],Length(s));
   SourceStream.Position:=0;
 end;
 
-function TBase64DecodingStreamTestCase.NoiseCharString: string;
+function TBase64DecodingStreamTestCase.NoiseCharString: ansistring;
 begin
   Result:=SetToString([#0..#255]-['a'..'z','A'..'Z','0'..'9','+','/','=']);
 end;
 
-function TBase64DecodingStreamTestCase.RandomNoise(l: integer): string;
+function TBase64DecodingStreamTestCase.RandomNoise(l: integer): ansistring;
 var
   i: Integer;
-  noiseChars: String;
+  noiseChars: ansistring;
 begin
   noiseChars:=NoiseCharString; // our pool
   SetLength(Result,l);
@@ -203,7 +203,7 @@ begin
     Result[i]:=noiseChars[Random(Length(noiseChars))+1];
 end;
 
-procedure TBase64DecodingStreamTestCase.TestGetSize(mode:TBase64DecodingMode; s: string; expectedSize: Int64);
+procedure TBase64DecodingStreamTestCase.TestGetSize(mode:TBase64DecodingMode; s: ansistring; expectedSize: Int64);
 var
   Size: Int64;
 begin
@@ -213,9 +213,9 @@ begin
   AssertEquals('Correct size calculated by Size getter', Size, expectedSize);
 end;
 
-procedure TBase64DecodingStreamTestCase.TestDecode(mode: TBase64DecodingMode; s, expected: string);
+procedure TBase64DecodingStreamTestCase.TestDecode(mode: TBase64DecodingMode; s, expected: );
 var
-  Buf: array[0..63] of Char;
+  Buf: array[0..63] of AnsiChar;
   si: Integer;
   i: Integer;
   count: LongInt;
@@ -235,9 +235,9 @@ begin
   AssertEquals('Correct decoded length', Length(expected), si-1);
 end;
 
-procedure TBase64DecodingStreamTestCase.TestReset(mode: TBase64DecodingMode; s: string; start: array of Int64; expected: array of string);
+procedure TBase64DecodingStreamTestCase.TestReset(mode: TBase64DecodingMode; s: ansistring; start: array of Int64; expected: array of ansistring);
 var
-  Buf: array[0..63] of Char;
+  Buf: array[0..63] of AnsiChar;
   len: Integer;
   i: Integer;
   count: LongInt;

packages/fcl-base/examples/cachetest.pp

@@ -25,7 +25,7 @@ type
     function TestCacheIsDataEqual(ACache: TCache; AData1, AData2: Pointer): Boolean;
     procedure TestCacheFreeSlot(ACache: TCache; SlotIndex: Integer);
   protected
-    procedure AddString(const s: PChar);
+    procedure AddString(const s: PAnsiChar);
     procedure DumpCache;
   public
     constructor Create;
@@ -41,22 +41,22 @@ begin
   if (not Assigned(AData1)) or (not Assigned(AData2)) then
     Result := (not Assigned(AData1)) and (not Assigned(AData2))
   else
-    Result := StrComp(PChar(AData1), PChar(AData2)) = 0;
+    Result := StrComp(PAnsiChar(AData1), PAnsiChar(AData2)) = 0;
 end;
 
 procedure TCacheTester.TestCacheFreeSlot(ACache: TCache; SlotIndex: Integer);
 var
-  p: PChar;
+  p: PAnsiChar;
 begin
   Write('  Cache slot #', SlotIndex, ' has been freed (content: ');
-  p := PChar(ACache.Slots[SlotIndex]^.Data);
+  p := PAnsiChar(ACache.Slots[SlotIndex]^.Data);
   if Assigned(p) then
     WriteLn('"', p, '")')
   else
     WriteLn('nil)');
 end;
 
-procedure TCacheTester.AddString(const s: PChar);
+procedure TCacheTester.AddString(const s: PAnsiChar);
 var
   i: Integer;
 begin
@@ -78,7 +78,7 @@ begin
   begin
     Write('  Slot #', Slot^.Index, '  ');
     if Assigned(Slot^.Data) then
-      Write('"', PChar(Slot^.Data), '"')
+      Write('"', PAnsiChar(Slot^.Data), '"')
     else
       Write('nil');
     if Slot^.Prev <> PrevSlot then

packages/fcl-base/examples/demobasenenc.lpr

@@ -14,7 +14,8 @@
 
  **********************************************************************}
 program demobasenenc;
-
+{$mode objfpc}
+{$h+}
 uses sysutils, basenenc, typinfo, custapp, Classes;
 
 Type

packages/fcl-base/examples/dsocksvr.pp

@@ -105,7 +105,7 @@ end;
 
 Var
   Application : TServerApp;
-  c : char;
+  c : AnsiChar;
 
 begin
   DoInet:=False;

packages/fcl-base/examples/fpexprpars.txt

@@ -4,7 +4,7 @@ The parser compiles the expression into a node tree, which is
 type checked after it was compiled.
 
 The expression parser handles the following types:
-  String 
+
   Integer (64-bit)
   Float (TExprFloat, normally Double) 
   TDateTime
@@ -72,7 +72,7 @@ The arguments are:
   Name : Name of the function
   Result type : Character with result type:
     I : integer
-    S : String
+    S :
     F : FLoat
     D : TDateTime
     B : Boolean

packages/fcl-base/examples/fstream.pp

@@ -3,7 +3,7 @@ Program TestStream;
 uses classes;
 
 Var Stream : TFileStream;
-    S,T : String;
+    S,T : AnsiString;
 
 begin
   S:='ABCDEFGHIJKLMNOPQRSTUVWXYZ';

packages/fcl-base/examples/list.pp

@@ -4,16 +4,16 @@ Program TestList;
 
 Uses classes;
 
-const a1 : pchar = '0';
-      a2 : pchar = '1';
-      a3 : pchar = '2';
-      a4 : pchar = '3';
-      a5 : pchar = '4';
-      a6 : pchar = '5';
-      a7 : pchar = '6';
-      a8 : pchar = '7';
-      a9 : pchar = '8';
-      a10 : pchar = '9';
+const a1 : PAnsiChar = '0';
+      a2 : PAnsiChar = '1';
+      a3 : PAnsiChar = '2';
+      a4 : PAnsiChar = '3';
+      a5 : PAnsiChar = '4';
+      a6 : PAnsiChar = '5';
+      a7 : PAnsiChar = '6';
+      a8 : PAnsiChar = '7';
+      a9 : PAnsiChar = '8';
+      a10 : PAnsiChar = '9';
 
 Var List : TList;
     StartMem,Runner : longint;
@@ -41,7 +41,7 @@ begin
   If List.Count>0 then
     begin
     For i:=0 to List.Count-1 do
-      if assigned(List.items[I]) then write (Pchar(List.items[i])) else write ('*');
+      if assigned(List.items[I]) then write (PAnsiChar(List.items[i])) else write ('*');
     Writeln;
     end;
 end;

packages/fcl-base/examples/mstream.pp

@@ -3,7 +3,7 @@ Program TestStream;
 uses classes;
 
 Var Stream : TMemoryStream;
-    S,T : String;
+    S,T : AnsiString;
 
 begin
   S:='ABCDEFGHIJKLMNOPQRSTUVWXYZ';

packages/fcl-base/examples/sitest.pp

@@ -25,11 +25,11 @@ procedure TMyCustomApplication.ServerReceivedCustomRequest(
   Sender: TBaseSingleInstance; MsgID: Integer; aMsgType: TMessageType;
   MsgData: TStream);
 var
-  xData: string;
+  xData: AnsiString;
   xStringStream: TStringStream;
 begin
   MsgData.Position := 0;
-  SetLength(xData, MsgData.Size div SizeOf(Char));
+  SetLength(xData, MsgData.Size div SizeOf(AnsiChar));
   if MsgData.Size > 0 then
     MsgData.ReadBuffer(xData[1], MsgData.Size);
 

packages/fcl-base/examples/testapp.pp

@@ -33,7 +33,7 @@ begin
   Writeln('ParamCount          : ',ParamCount);
   For I:=0 to ParamCount do
     Writeln('Params [',I:3,']        : ',Params[i]);
-  Writeln('Option char         : ',OptionChar);
+  Writeln('Option AnsiChar         : ',OptionChar);
   Writeln('Case sensitive opts : ',CaseSensitiveOptions);
   Writeln('StopOnException     : ',StopOnException);
   Writeln('----------------------------------------');

packages/fcl-base/examples/testappexit.pp

@@ -1,5 +1,6 @@
 program testappexit;
-
+{$mode objfpc}
+{$h+}
 uses sysutils,custapp;
 
 type

packages/fcl-base/examples/testbs.pp

@@ -25,7 +25,7 @@ Var
   MBSize     : Integer = 1024*100;
   SBCapacity : Integer = 1024*16;
 
-procedure TestRead(Buffer : PChar; ACapacity : Integer);
+procedure TestRead(Buffer : PAnsiChar; ACapacity : Integer);
 
 Var
   F2 : TFileStream;
@@ -36,7 +36,7 @@ begin
   B:=TReadBufStream.Create(TFileStream.Create(PAramStr(0),fmOpenRead),ACapacity);
   Try
     B.SourceOwner:=True;
-    F2:=TFileStream.Create(ChangeFileExt(PAramStr(0),'.tr'),fmCreate);
+    F2:=TFileStream.Create(ChangeFileExt(PAramStr(0),RTLString('.tr')),fmCreate);
     Try
       Repeat
         C:=B.Read(Buffer^,MBSize);
@@ -50,7 +50,7 @@ begin
   end;
 end;
 
-procedure TestWrite(Buffer : PChar; ACapacity : Integer);
+procedure TestWrite(Buffer : PAnsiChar; ACapacity : Integer);
 
 Var
   F : TFileStream;
@@ -60,7 +60,7 @@ Var
 begin
   F:=TFileStream.Create(PAramStr(0),fmOpenRead);
   Try
-    B:=TWriteBufStream.Create(TFileStream.Create(ChangeFileExt(PAramStr(0),'.tw'),fmCreate),ACapacity);
+    B:=TWriteBufStream.Create(TFileStream.Create(ChangeFileExt(PAramStr(0),RTLString('.tw')),fmCreate),ACapacity);
     Try
       B.SourceOwner:=True;
       Repeat
@@ -76,7 +76,7 @@ begin
 end;
 
 Var
-  Buffer : PChar;
+  Buffer : PAnsiChar;
 
 begin
   If ParamCount>0 then

packages/fcl-base/examples/testproc.pp

@@ -12,7 +12,7 @@ Const BufSize = 1024;
 
 
 Var S : TProcess;
-    Buf : Array[1..BUFSIZE] of char;
+    Buf : Array[1..BUFSIZE] of AnsiChar;
     I,Count : longint;
 
 begin

packages/fcl-base/examples/testser.pp

@@ -11,11 +11,12 @@ dpmiexcp,
 Typinfo,classes,iostream;
 
 Const TypeNames : Array [TTYpeKind] of string[15] =
-                    ('Unknown','Integer','Char','Enumeration',
+                    ('Unknown','Integer','AnsiChar','Enumeration',
                      'Float','Set','Method','ShortString','LongString',
                      'AnsiString','WideString','Variant','Array','Record',
                      'Interface','Class','Object','WideChar','Bool','Int64',
-                     'QWord','DynArray','InterfaceRaw');
+                     'QWord','DynArray','InterfaceRaw',
+                     '', '', '', '', '', '', '');
 Const OrdinalTypes = [tkInteger,tkChar,tkENumeration,tkbool,tkInt64,tkQWord];
 
 Type
@@ -24,7 +25,7 @@ Type
        Private
        FBoolean  : Boolean;
        FByte     : Byte;
-       FChar     : Char;
+       FChar     : AnsiChar;
        FWord     : Word;
        FInteger  : Integer;
        Flongint  : Longint;
@@ -37,7 +38,7 @@ Type
        FStored   : Boolean;
        Function GetBoolean : Boolean;
        Function GetByte : Byte;
-       Function GetChar : Char;
+       Function GetChar : AnsiChar;
        Function GetWord : Word;
        Function GetInteger : Integer;
        Function GetLongint : Longint;
@@ -48,7 +49,7 @@ Type
        Function GetMyEnum : TMyEnum;
        Procedure SetBoolean ( Value : Boolean);
        Procedure SetByte ( Value : Byte );
-       Procedure SetChar ( Value : Char );
+       Procedure SetChar ( Value : AnsiChar );
        Procedure SetWord ( Value : Word );
        Procedure SetInteger ( Value : Integer );
        Procedure SetLongint ( Value : Longint );
@@ -59,7 +60,7 @@ Type
        Procedure SetMyEnum ( Value : TMyEnum );
        Function GetVirtualBoolean : Boolean; virtual;
        Function GetVirtualByte : Byte; virtual;
-       Function GetVirtualChar : Char; virtual;
+       Function GetVirtualChar : AnsiChar; virtual;
        Function GetVirtualWord : Word; virtual;
        Function GetVirtualInteger : Integer; virtual;
        Function GetVirtualLongint : Longint; virtual;
@@ -70,7 +71,7 @@ Type
        Function GetVirtualMyEnum : TMyEnum; virtual;
        Procedure SetVirtualBoolean ( Value : Boolean); virtual;
        Procedure SetVirtualByte ( Value : Byte ); virtual;
-       Procedure SetVirtualChar ( Value : Char ); virtual;
+       Procedure SetVirtualChar ( Value : AnsiChar ); virtual;
        Procedure SetVirtualWord ( Value : Word ); virtual;
        Procedure SetVirtualInteger ( Value : Integer ); virtual;
        Procedure SetVirtualLongint ( Value : Longint ); virtual;
@@ -88,7 +89,7 @@ Type
        Property ObjField: TObject read FObj write FObj;
        Property BooleanField : Boolean Read FBoolean Write FBoolean;
        Property ByteField : Byte Read FByte Write FByte;
-       Property CharField : Char Read FChar Write FChar;
+       Property CharField : AnsiChar Read FChar Write FChar;
        Property WordField : Word Read FWord Write FWord;
        Property IntegerField : Integer Read FInteger Write FInteger;
        Property LongintField : Longint Read FLongint Write FLongint;
@@ -99,7 +100,7 @@ Type
        Property MyEnumField : TMyEnum Read FMyEnum Write FMyEnum;
        Property BooleanMethod : Boolean Read GetBoolean Write SetBoolean;
        Property ByteMethod : Byte Read GetByte Write SetByte;
-       Property CharMethod : Char Read GetChar Write SetChar;
+       Property CharMethod : AnsiChar Read GetChar Write SetChar;
        Property WordMethod : Word Read GetWord Write SetWord;
        Property IntegerMethod : Integer Read GetInteger Write SetInteger;
        Property LongintMethod : Longint Read GetLongint Write SetLongint;
@@ -110,7 +111,7 @@ Type
        Property MyEnumMethod : TMyEnum Read GetMyEnum Write SetMyEnum;
        Property BooleanVirtualMethod : Boolean Read GetVirtualBoolean Write SetVirtualBoolean;
        Property ByteVirtualMethod : Byte Read GetVirtualByte Write SetVirtualByte;
-       Property CharVirtualMethod : Char Read GetVirtualChar Write SetVirtualChar;
+       Property CharVirtualMethod : AnsiChar Read GetVirtualChar Write SetVirtualChar;
        Property WordVirtualMethod : Word Read GetVirtualWord Write SetVirtualWord;
        Property IntegerVirtualMethod : Integer Read GetVirtualInteger Write SetVirtualInteger;
        Property LongintVirtualMethod : Longint Read GetVirtualLongint Write SetVirtualLongint;
@@ -131,7 +132,7 @@ Constructor TMyTestObject.Create;
 begin
   FBoolean:=true;
   FByte:=1;        {     : Byte;}
-  FChar:='B';      {    : Char; }
+  FChar:='B';      {    : AnsiChar; }
   FWord:=3;      {: Word;     }
   FInteger:=4;     {: Integer;  }
   Flongint:=5;     { : Longint; }
@@ -160,7 +161,7 @@ begin
   Result:=FByte;
 end;
 
-Function TMyTestObject.GetChar : Char;
+Function TMyTestObject.GetChar : AnsiChar;
 begin
   Result:=FChar;
 end;
@@ -216,7 +217,7 @@ begin
   FByte:=Value;
 end;
 
-Procedure TMyTestObject.SetChar ( Value : Char );
+Procedure TMyTestObject.SetChar ( Value : AnsiChar );
 begin
   FChar:=Value;
 end;
@@ -273,7 +274,7 @@ begin
   Result:=FByte;
 end;
 
-Function TMyTestObject.GetVirtualChar : Char;
+Function TMyTestObject.GetVirtualChar : AnsiChar;
 begin
   Result:=FChar;
 end;
@@ -329,7 +330,7 @@ begin
   FByte:=Value;
 end;
 
-Procedure TMyTestObject.SetVirtualChar ( Value : Char );
+Procedure TMyTestObject.SetVirtualChar ( Value : AnsiChar );
 begin
   FChar:=Value;
 end;
@@ -397,7 +398,7 @@ begin
     For J:=1 to 10  do
       begin
       If (PL^>31) and (PL^<129) then
-         Write('  ',CHar(PL^))
+         Write('  ',AnsiChar(PL^))
       else
         Write (PL^:3);
       Write (' ');

packages/fcl-base/examples/testz2.pp

@@ -12,7 +12,7 @@ const
 Var F : TGZfileStream;
     S : String;
     i :longint;
-    c : char;
+    c : AnsiChar;
 begin
   Writeln ('Creating file.');
   S:='This is a sentence'+eol;

packages/fcl-base/examples/threads.pp

@@ -9,11 +9,11 @@ uses
 type
   TMyThread=class(TThread)
   private
-    ch : char;
+    ch : AnsiChar;
   protected
     procedure Execute; override;
   public
-    constructor Create(c:char);
+    constructor Create(c:AnsiChar);
   end;
 
 procedure TMyThread.Execute;
@@ -24,7 +24,7 @@ begin
 end;
 
 
-constructor TMyThread.Create(c:char);
+constructor TMyThread.Create(c:AnsiChar);
 begin
   ch:=c;
   inherited Create(false);

packages/fcl-base/examples/txmlreg.pp

@@ -5,7 +5,7 @@ program txmlreg;
 uses xmlreg;
 
 Var
-  S : String;
+  S : AnsiString;
   C : Cardinal;
   A : Array[0..15] of byte;
 

packages/fcl-base/src/advancedsingleinstance.pas

@@ -35,12 +35,12 @@ type
   TAdvancedSingleInstance = class(TBaseSingleInstance)
   private
     FGlobal: Boolean;
-    FID: string;
+    FID: Ansistring;
     FServer: TIPCServer;
     FClient: TIPCClient;
     FOnServerReceivedCustomRequest: TSingleInstanceReceivedCustomMessage;
     procedure SetGlobal(const aGlobal: Boolean);
-    procedure SetID(const aID: string);
+    procedure SetID(const aID: Ansistring);
   protected
     procedure DoServerReceivedCustomRequest(const aMsgID: Integer; const aMsgType: Integer; const aStream: TStream);
     function GetIsClient: Boolean; override;
@@ -60,7 +60,7 @@ type
     procedure ServerPostCustomResponse(const aRequestID: Integer; const aMsgType: Integer; const aStream: TStream);
     function ClientPeekCustomResponse(const aStream: TStream; out outMsgType: Integer): Boolean;
   public
-    property ID: string read FID write SetID;
+    property ID: AnsiString  read FID write SetID;
     property Global: Boolean read FGlobal write SetGlobal;
 
     property OnServerReceivedCustomRequest: TSingleInstanceReceivedCustomMessage read FOnServerReceivedCustomRequest write FOnServerReceivedCustomRequest;
@@ -249,7 +249,7 @@ begin
   FGlobal := aGlobal;
 end;
 
-procedure TAdvancedSingleInstance.SetID(const aID: string);
+procedure TAdvancedSingleInstance.SetID(const aID: Ansistring);
 begin
   if FID = aID then Exit;
   if Assigned(FServer) or Assigned(FClient) then

packages/fcl-base/src/ascii85.pp

@@ -138,7 +138,7 @@ begin
     For I:=FCount+1 downto 0 do
       begin
       Inc(j);
-      S[J]:=Char(Buf[i]+Ord('!'));
+      S[J]:=AnsiChar(Buf[i]+Ord('!'));
       SetLength(S,J);
       Inc(FPos);
       If (FPos>FWidth) then
@@ -162,7 +162,7 @@ Const
   Boundary2 = slinebreak+Boundary1;
   
 Var
-  S : String;
+  S : Ansistring;
 
 begin
   If FCount>0 then

packages/fcl-base/src/base64.pp

@@ -51,7 +51,7 @@ type
    * - 'MIME mode':
    *    - follows RFC2045
    *    - ignores any characters outside of base64 alphabet
-   *    - takes any '=' as end of string
+   *    - takes any '=' as end of
    *    - handles apparently truncated input streams gracefully
    *)
   TBase64DecodingMode = (bdmStrict, bdmMIME);
@@ -86,8 +86,8 @@ type
   EBase64DecodingException = class(Exception)
   end;
 
-function EncodeStringBase64(const s:string):String;
-function DecodeStringBase64(const s:string;strict:boolean=false):String;
+function EncodeStringBase64(const s: AnsiString): AnsiString;
+function DecodeStringBase64(const s: AnsiString;strict:boolean=false): AnsiString;
 
 implementation
 
@@ -99,7 +99,7 @@ const
   SStrictInputTruncated   = 'Input stream was truncated at non-4 byte boundary';
   SStrictMisplacedPadChar = 'Unexpected padding character ''='' before end of input stream';
 
-  EncodingTable: PChar =
+  EncodingTable: PAnsiChar =
     'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
 
 const
@@ -129,7 +129,7 @@ const
 function TBase64EncodingStream.Flush : Boolean;
 
 var
-  WriteBuf: array[0..3] of Char;
+  WriteBuf: array[0..3] of AnsiChar;
 begin
   // Fill output to multiple of 4
   case (TotalBytesProcessed mod 3) of
@@ -166,7 +166,7 @@ function TBase64EncodingStream.Write(const Buffer; Count: Longint): Longint;
 var
   ReadNow: LongInt;
   p: Pointer;
-  WriteBuf: array[0..3] of Char;
+  WriteBuf: array[0..3] of AnsiChar;
 begin
   Inc(TotalBytesProcessed, Count);
   Result := Count;
@@ -214,12 +214,12 @@ end;
 
 function TBase64DecodingStream.GetSize: Int64;
 var
-  endBytes: array[0..1] of Char;
+  endBytes: array[0..1] of AnsiChar;
   ipos, isize: Int64;
-  scanBuf: array[0..1023] of Char;
+  scanBuf: array[0..1023] of AnsiChar;
   count: LongInt;
   i: Integer;
-  c: Char;
+  c: AnsiChar;
 begin
   // Note: this method only works on Seekable Sources (for bdmStrict we also get the Size property)
   if DecodedSize<>-1 then Exit(DecodedSize);
@@ -417,10 +417,10 @@ begin
   raise EStreamError.Create('Invalid stream operation');
 end;
 
-function DecodeStringBase64(const s:string;strict:boolean=false):String;
+function DecodeStringBase64(const s: AnsiString;strict:boolean=false): AnsiString;
 
 var 
-  SD : String;
+  SD : Ansistring;
   Instream, 
   Outstream : TStringStream;
   Decoder   : TBase64DecodingStream;
@@ -452,7 +452,7 @@ begin
     end;
 end;
 
-function EncodeStringBase64(const s:string):String;
+function EncodeStringBase64(const s: AnsiString): AnsiString;
 
 var
   Outstream : TStringStream;

packages/fcl-base/src/basenenc.pp

@@ -97,7 +97,7 @@ Function Base64 : TAlphabetEncoder;
 Function Base64URL : TAlphabetEncoder;
 Function GetStandardEncoder(aEncoder : TStandardEncoder): TAlphabetEncoder;
 
-Function GetRawStringBytes(const S : String) : TBytes;
+Function GetRawStringBytes(const S : AnsiString) : TBytes;
 Function GetRawStringFromBytes(B : TBytes) : RawByteString;
 
 implementation
@@ -115,7 +115,7 @@ begin
     Move(B[0],Result[1],L);
 end;
 
-Function GetRawStringBytes(Const S : String) : TBytes;
+Function GetRawStringBytes(Const S : AnsiString) : TBytes;
 
 Var
   L : Integer;

packages/fcl-base/src/blowfish.pp

@@ -605,7 +605,7 @@ begin
   If FBufPos>0 then
     begin
     // Fill with nulls
-    FillChar(PChar(@FData)[FBufPos],SizeOf(FData)-FBufPos,#0);
+    FillChar(PAnsiChar(@FData)[FBufPos],SizeOf(FData)-FBufPos,#0);
     FBF.EnCrypt(FData);
     Source.Write(FData,SizeOf(FData));
     FBufPos := 0;
@@ -624,7 +624,7 @@ begin
     MVsize:=Count;
     If Mvsize>SizeOf(Fdata)-FBufPos then
       mvsize:=SizeOf(FData)-FBufPos;
-    Move(PChar(@Buffer)[Result],PChar(@FData)[FBufPos],MVSize);
+    Move(PAnsiChar(@Buffer)[Result],PAnsiChar(@FData)[FBufPos],MVSize);
     If FBufPos+mvSize=Sizeof(FData) then
       begin
       // Empty buffer.
@@ -679,9 +679,9 @@ begin
       mvSize:=FBufPos;
       If MvSize>count then
         mvsize:=Count;
-      Move(PChar(@FData)[0],PChar(@Buffer)[Result],MVSize);
+      Move(PAnsiChar(@FData)[0],PAnsiChar(@Buffer)[Result],MVSize);
       If ((Sizeof(FData)-MvSize)>0) then
-        Move(PChar(@FData)[mvSize],PChar(@FData)[0],Sizeof(FData)-MvSize);
+        Move(PAnsiChar(@FData)[mvSize],PAnsiChar(@FData)[0],Sizeof(FData)-MvSize);
       Dec(Count,mvsize);
       Inc(Result,mvsize);
       FBufPos:=FBufPos-MvSize;
@@ -694,7 +694,7 @@ begin
         begin
         If MvSize<SizeOf(FData) Then
           // Fill with nulls
-          FillChar(PChar(@FData)[mvsize],SizeOf(FData)-mvsize,#0);
+          FillChar(PAnsiChar(@FData)[mvsize],SizeOf(FData)-mvsize,#0);
         FBF.Decrypt(FData);
         FBufPos:=SizeOf(FData);
         end

packages/fcl-base/src/bufstream.pp

@@ -183,10 +183,10 @@ procedure TBufStream.FillBuffer;
 
 Var
   RCount : Integer;
-  P : PChar;
+  P : PAnsiChar;
 
 begin
-  P:=Pchar(FBuffer);
+  P:=PAnsiChar(FBuffer);
   // Reset at beginning if empty.
   If (FBufSize-FBufPos)<=0 then
    begin
@@ -207,10 +207,10 @@ procedure TBufStream.FlushBuffer;
 
 Var
   WCount : Integer;
-  P : PChar;
+  P : PAnsiChar;
 
 begin
-  P:=Pchar(FBuffer);
+  P:=PAnsiChar(FBuffer);
   Inc(P,FBufPos);
   WCount:=1;
   While (WCount<>0) and ((FBufSize-FBufPos)>0) do
@@ -258,12 +258,12 @@ end;
 function TReadBufStream.Read(var ABuffer; ACount: LongInt): Integer;
 
 Var
-  P,PB : PChar;
+  P,PB : PAnsiChar;
   Avail,MSize,RCount : Integer;
 
 begin
   Result:=0;
-  P:=PChar(@ABuffer);
+  P:=PAnsiChar(@ABuffer);
   Avail:=1;
   While (Result<ACount) and (Avail>0) do
     begin
@@ -275,7 +275,7 @@ begin
       MSize:=ACount-Result;
       If (MSize>Avail) then
         MSize:=Avail;
-      PB:=PChar(FBuffer);
+      PB:=PAnsiChar(FBuffer);
       Inc(PB,FBufPos);
       Move(PB^,P^,MSIze);
       Inc(FBufPos,MSize);
@@ -306,12 +306,12 @@ end;
 function TWriteBufStream.Write(const ABuffer; ACount: LongInt): Integer;
 
 Var
-  P,PB : PChar;
+  P,PB : PAnsiChar;
   Avail,MSize,RCount : Integer;
 
 begin
   Result:=0;
-  P:=PChar(@ABuffer);
+  P:=PAnsiChar(@ABuffer);
   While (Result<ACount) do
     begin
     If (FBufSize=FCapacity) then
@@ -320,7 +320,7 @@ begin
     MSize:=ACount-Result;
     If (MSize>Avail) then
       MSize:=Avail;
-    PB:=PChar(FBuffer);
+    PB:=PAnsiChar(FBuffer);
     Inc(PB,FBufSize);
     Move(P^,PB^,MSIze);
     Inc(FBufSize,MSize);

packages/fcl-base/src/contnrs.pp

@@ -220,7 +220,7 @@ type
     FHashTable    : PHashTable;
     FHashCapacity : Integer;
     { Strings }
-    FStrs     : PChar;
+    FStrs     : PAnsiChar;
     FStrCount,
     FStrCapacity : Integer;
     Function InternalFind(AHash:LongWord;const AName:shortstring;out PrevIndex:Integer):Integer;
@@ -245,7 +245,7 @@ type
     Function HashOfIndex(Index: Integer): LongWord; {$ifdef CCLASSESINLINE}inline;{$endif}
     Function GetNextCollision(Index: Integer): Integer;
     Procedure Delete(Index: Integer);
-    class Procedure Error(const Msg: string; Data: PtrInt);
+    class Procedure Error(const Msg: AnsiString; Data: PtrInt);
     Function Expand: TFPHashList;
     Function Extract(item: Pointer): Pointer;
     Function IndexOf(Item: Pointer): Integer;
@@ -262,7 +262,7 @@ type
     property Count: Integer read FCount write SetCount;
     property Items[Index: Integer]: Pointer read Get write Put; default;
     property List: PHashItemList read FHashList;
-    property Strs: PChar read FStrs;
+    property Strs: PAnsiChar read FStrs;
   end;
 
 
@@ -340,18 +340,18 @@ type
 
   { Must return a Longword value in the range 0..TableSize,
    usually via a mod operator;  }
-  THashFunction = Function(const S: string; const TableSize: Longword): Longword;
+  THashFunction = Function(const S: AnsiString; const TableSize: Longword): Longword;
 
 
   { THTNode }
 
   THTCustomNode = class(TObject)
   private
-    FKey: string;
+    FKey: AnsiString;
   public
-    constructor CreateWith(const AString: String);
-    Function HasKey(const AKey: string): boolean;
-    property Key: string read FKey;
+    constructor CreateWith(const AString: AnsiString);
+    Function HasKey(const AKey: AnsiString): boolean;
+    property Key: AnsiString read FKey;
   end;
   THTCustomNodeClass = Class of THTCustomNode;
 
@@ -374,20 +374,20 @@ type
   protected
     FHashTableSize: Longword;
     Function Chain(const index: Longword):TFPObjectList;
-    Function CreateNewNode(const aKey : string) : THTCustomNode; virtual; abstract;
+    Function CreateNewNode(const aKey : AnsiString) : THTCustomNode; virtual; abstract;
     Procedure AddNode(ANode : THTCustomNode); virtual; abstract;
     Function ChainLength(const ChainIndex: Longword): Longword; virtual;
-    Function FindOrCreateNew(const aKey: string): THTCustomNode; virtual;
+    Function FindOrCreateNew(const aKey: AnsiString): THTCustomNode; virtual;
     Procedure SetHashFunction(AHashFunction: THashFunction); virtual;
-    Function FindChainForAdd(Const aKey : String) : TFPObjectList;
+    Function FindChainForAdd(Const aKey : AnsiString) : TFPObjectList;
   public
     constructor Create;
     constructor CreateWith(AHashTableSize: Longword; aHashFunc: THashFunction);
     destructor Destroy; override;
     Procedure ChangeTableSize(const ANewSize: Longword); virtual;
     Procedure Clear; virtual;
-    Procedure Delete(const aKey: string); virtual;
-    Function Find(const aKey: string): THTCustomNode;
+    Procedure Delete(const aKey: AnsiString); virtual;
+    Function Find(const aKey: AnsiString): THTCustomNode;
     Function IsEmpty: boolean;
     property HashFunction: THashFunction read FHashFunction write SetHashFunction;
     property Count: Longword read FCount;
@@ -412,8 +412,8 @@ type
   // For compatibility
   THTNode = THTDataNode;
 
-  TDataIteratorMethod = Procedure(Item: Pointer; const Key: string; var Continue: Boolean) of object;
-  TDataIteratorCallBack = Procedure(Item: Pointer; const Key: string; var Continue: Boolean);
+  TDataIteratorMethod = Procedure(Item: Pointer; const Key: AnsiString; var Continue: Boolean) of object;
+  TDataIteratorCallBack = Procedure(Item: Pointer; const Key: AnsiString; var Continue: Boolean);
 
   // For compatibility
   TIteratorMethod = TDataIteratorMethod;
@@ -421,46 +421,46 @@ type
   TFPDataHashTable = Class(TFPCustomHashTable)
   Private
     FIteratorCallBack: TDataIteratorCallBack;
-    Procedure CallbackIterator(Item: Pointer; const Key: string; var Continue: Boolean);
+    Procedure CallbackIterator(Item: Pointer; const Key: AnsiString; var Continue: Boolean);
   Protected
-    Function CreateNewNode(const aKey : String) : THTCustomNode; override;
+    Function CreateNewNode(const aKey : AnsiString) : THTCustomNode; override;
     Procedure AddNode(ANode : THTCustomNode); override;
-    Procedure SetData(const index: string; const AValue: Pointer); virtual;
-    Function GetData(const index: string):Pointer; virtual;
+    Procedure SetData(const index: AnsiString; const AValue: Pointer); virtual;
+    Function GetData(const index: AnsiString):Pointer; virtual;
     Function ForEachCall(aMethod: TDataIteratorMethod): THTDataNode; virtual;
   Public
     Function Iterate(aMethod: TDataIteratorMethod): Pointer; virtual;
     Function Iterate(aMethod: TDataIteratorCallBack): Pointer; virtual;
-    Procedure Add(const aKey: string; AItem: pointer); virtual;
-    property Items[const index: string]: Pointer read GetData write SetData; default;
+    Procedure Add(const aKey: AnsiString; AItem: pointer); virtual;
+    property Items[const index: AnsiString]: Pointer read GetData write SetData; default;
   end;
 
   { TFPStringHashTable : Hash table with simple strings as data }
   THTStringNode = Class(THTCustomNode)
   Private
-    FData : String;
+    FData : AnsiString;
   public
-    property Data: String read FData write FData;
+    property Data: AnsiString  read FData write FData;
   end;
   
-  TStringIteratorMethod = Procedure(Item: String; const Key: string; var Continue: Boolean) of object;
-  TStringIteratorCallback = Procedure(Item: String; const Key: string; var Continue: Boolean);
+  TStringIteratorMethod = Procedure(Item: AnsiString; const Key: AnsiString; var Continue: Boolean) of object;
+  TStringIteratorCallback = Procedure(Item: AnsiString; const Key: AnsiString; var Continue: Boolean);
 
   TFPStringHashTable = Class(TFPCustomHashTable)
   Private
     FIteratorCallBack: TStringIteratorCallback;
-    Procedure CallbackIterator(Item: String; const Key: string; var Continue: Boolean);
+    Procedure CallbackIterator(Item: AnsiString; const Key: AnsiString; var Continue: Boolean);
   Protected
-    Function CreateNewNode(const aKey : String) : THTCustomNode; override;
+    Function CreateNewNode(const aKey : AnsiString) : THTCustomNode; override;
     Procedure AddNode(ANode : THTCustomNode); override;
-    Procedure SetData(const Index, AValue: string); virtual;
-    Function GetData(const index: string): String; virtual;
+    Procedure SetData(const Index, AValue: AnsiString); virtual;
+    Function GetData(const index: AnsiString): AnsiString; virtual;
     Function ForEachCall(aMethod: TStringIteratorMethod): THTStringNode; virtual;
   Public
-    Function Iterate(aMethod: TStringIteratorMethod): String; virtual;
-    Function Iterate(aMethod: TStringIteratorCallback): String; virtual;
-    Procedure Add(const aKey,aItem: string); virtual;
-    property Items[const index: string]: String read GetData write SetData; default;
+    Function Iterate(aMethod: TStringIteratorMethod): AnsiString; virtual;
+    Function Iterate(aMethod: TStringIteratorCallback): AnsiString; virtual;
+    Procedure Add(const aKey,aItem: AnsiString); virtual;
+    property Items[const index: AnsiString]: AnsiString read GetData write SetData; default;
   end;
 
   { TFPStringHashTable : Hash table with simple strings as data }
@@ -478,34 +478,34 @@ type
     destructor Destroy; override;
   end;
 
-  TObjectIteratorMethod = Procedure(Item: TObject; const Key: string; var Continue: Boolean) of object;
-  TObjectIteratorCallback = Procedure(Item: TObject; const Key: string; var Continue: Boolean);
+  TObjectIteratorMethod = Procedure(Item: TObject; const Key: AnsiString; var Continue: Boolean) of object;
+  TObjectIteratorCallback = Procedure(Item: TObject; const Key: AnsiString; var Continue: Boolean);
 
   TFPObjectHashTable = Class(TFPCustomHashTable)
   Private
     FOwnsObjects : Boolean;
     FIteratorCallBack: TObjectIteratorCallback;
-    procedure CallbackIterator(Item: TObject; const Key: string; var Continue: Boolean);
+    procedure CallbackIterator(Item: TObject; const Key: AnsiString; var Continue: Boolean);
   Protected
-    Function CreateNewNode(const aKey : String) : THTCustomNode; override;
+    Function CreateNewNode(const aKey : AnsiString) : THTCustomNode; override;
     Procedure AddNode(ANode : THTCustomNode); override;
-    Procedure SetData(const Index: string; AObject : TObject); virtual;
-    Function GetData(const index: string): TObject; virtual;
+    Procedure SetData(const Index: AnsiString; AObject : TObject); virtual;
+    Function GetData(const index: AnsiString): TObject; virtual;
     Function ForEachCall(aMethod: TObjectIteratorMethod): THTObjectNode; virtual;
   Public
     constructor Create(AOwnsObjects : Boolean = True);
     constructor CreateWith(AHashTableSize: Longword; aHashFunc: THashFunction; AOwnsObjects : Boolean = True);
     Function Iterate(aMethod: TObjectIteratorMethod): TObject; virtual;
     Function Iterate(aMethod: TObjectIteratorCallback): TObject; virtual;
-    Procedure Add(const aKey: string; AItem : TObject); virtual;
-    property Items[const index: string]: TObject read GetData write SetData; default;
+    Procedure Add(const aKey: AnsiString; AItem : TObject); virtual;
+    property Items[const index:Ansistring ]: TObject read GetData write SetData; default;
     Property OwnsObjects : Boolean Read FOwnsObjects;
   end;
 
   EDuplicate = class(Exception);
   EKeyNotFound = class(Exception);
 
-  Function RSHash(const S: string; const TableSize: Longword): Longword;
+  Function RSHash(const S: AnsiString; const TableSize: Longword): Longword;
 
 { ---------------------------------------------------------------------
     Bucket lists as in Delphi
@@ -546,7 +546,7 @@ Type
     Function AddItem(ABucket: Integer; AItem, AData: Pointer): Pointer; virtual;
     Function BucketFor(AItem: Pointer): Integer; virtual; abstract;
     Function DeleteItem(ABucket: Integer; AIndex: Integer): Pointer; virtual;
-    Procedure Error(Msg : String; Args : Array of Const);
+    Procedure Error(Msg : AnsiString; Args : Array of Const);
     Function FindItem(AItem: Pointer; out ABucket, AIndex: Integer): Boolean; virtual;
     property Buckets: TBucketArray read FBuckets;
     property BucketCount: Integer read GetBucketCount write SetBucketCount;
@@ -1158,7 +1158,7 @@ end;
 
     Function FPHash(const s:shortstring):LongWord;
     var
-      p,pmax : PChar;
+      p,pmax : PAnsiChar;
     begin
 {$push}
 {$Q-}
@@ -1173,9 +1173,9 @@ end;
 {$pop}
     end;
 
-    Function FPHash(P: PChar; Len: Integer): LongWord;
+    Function FPHash(P: PAnsiChar; Len: Integer): LongWord;
     var
-      pmax : PChar;
+      pmax : PAnsiChar;
     begin
 {$push}
 {$Q-}
@@ -1418,7 +1418,7 @@ begin
     Self.Delete(Result);
 end;
 
-class Procedure TFPHashList.Error(const Msg: string; Data: PtrInt);
+class Procedure TFPHashList.Error(const Msg: AnsiString; Data: PtrInt);
 begin
   raise EListError.CreateFmt(Msg,[Data]) at get_caller_addr(get_frame), get_caller_frame(get_frame);
 end;
@@ -1474,11 +1474,11 @@ Function TFPHashList.InternalFind(AHash:LongWord;const AName:shortstring;out Pre
 var
   HashIndex : Integer;
   Len,
-  LastChar  : Char;
+  LastChar  : AnsiChar;
 begin
   HashIndex:=AHash mod LongWord(FHashCapacity);
   Result:=FHashTable^[HashIndex];
-  Len:=Char(Length(AName));
+  Len:=AnsiChar(Length(AName));
   LastChar:=AName[Byte(Len)];
   PrevIndex:=-1;
   while Result<>-1 do
@@ -1564,7 +1564,7 @@ var
   i : integer;
   pdest,
   psrc : PHashItem;
-  FOldStr : Pchar;
+  FOldStr : PAnsiChar;
 begin
   NewCount:=0;
   psrc:=@FHashList^[0];
@@ -1930,7 +1930,7 @@ end;
 { Default hash Function }
 
 {$IFDEF RangeChecking}{$R-}{$ENDIF}
-Function RSHash(const S: string; const TableSize: Longword): Longword;
+Function RSHash(const S: AnsiString; const TableSize: Longword): Longword;
 const
   b = 378551;
 var
@@ -1951,13 +1951,13 @@ end;
 
 { THTNode }
 
-constructor THTCustomNode.CreateWith(const AString: string);
+constructor THTCustomNode.CreateWith(const AString: AnsiString);
 begin
   inherited Create;
   FKey:=AString;
 end;
 
-Function THTCustomNode.HasKey(const AKey: string): boolean;
+Function THTCustomNode.HasKey(const AKey: AnsiString): boolean;
 begin
   Result:=(AKey=FKey);
 end;
@@ -2056,7 +2056,7 @@ begin
     raise Exception.Create(NotEmptyMsg);
 end;
 
-Function TFPCustomHashTable.Find(const aKey: string): THTCustomNode;
+Function TFPCustomHashTable.Find(const aKey: AnsiString): THTCustomNode;
 var
   hashCode: Longword;
   chn: TFPObjectList;
@@ -2072,7 +2072,7 @@ begin
   Result:=nil;
 end;
 
-Function TFPCustomHashTable.FindChainForAdd(Const aKey : String) : TFPObjectList;
+Function TFPCustomHashTable.FindChainForAdd(Const aKey : AnsiString) : TFPObjectList;
 var
   hashCode: Longword;
   i: Longword;
@@ -2095,7 +2095,7 @@ begin
 end;
 
 
-Procedure TFPCustomHashTable.Delete(const aKey: string);
+Procedure TFPCustomHashTable.Delete(const aKey: AnsiString);
 var
   hashCode: Longword;
   chn: TFPObjectList;
@@ -2158,7 +2158,7 @@ begin
         Result:=ChainLength(i);
 end;
 
-Function TFPCustomHashTable.FindOrCreateNew(const aKey: string): THTCustomNode;
+Function TFPCustomHashTable.FindOrCreateNew(const aKey: AnsiString): THTCustomNode;
 var
   hashCode: Longword;
   chn: TFPObjectList;
@@ -2206,7 +2206,7 @@ end;
 
 { TFPDataHashTable }
 
-Procedure TFPDataHashTable.Add(const aKey: string; aItem: pointer);
+Procedure TFPDataHashTable.Add(const aKey: AnsiString; aItem: pointer);
 var
   chn: TFPObjectList;
   NewNode: THtDataNode;
@@ -2217,7 +2217,7 @@ begin
   chn.Add(NewNode);
 end;
 
-Function TFPDataHashTable.GetData(const Index: string): Pointer;
+Function TFPDataHashTable.GetData(const Index: AnsiString): Pointer;
 var
   node: THTDataNode;
 begin
@@ -2228,12 +2228,12 @@ begin
     Result:=nil;
 end;
 
-Procedure TFPDataHashTable.SetData(const index: string; const AValue: Pointer);
+Procedure TFPDataHashTable.SetData(const index: AnsiString; const AValue: Pointer);
 begin
   THTDataNode(FindOrCreateNew(index)).Data:=AValue;
 end;
 
-Function TFPDataHashTable.CreateNewNode(const aKey : string) : THTCustomNode;
+Function TFPDataHashTable.CreateNewNode(const aKey : AnsiString) : THTCustomNode;
 
 begin
   Result:=THTDataNode.CreateWith(aKey);
@@ -2250,7 +2250,7 @@ begin
     Result:=nil;
 end;
 
-Procedure TFPDataHashTable.CallbackIterator(Item: Pointer; const Key: string; var Continue: Boolean);
+Procedure TFPDataHashTable.CallbackIterator(Item: Pointer; const Key: AnsiString; var Continue: Boolean);
 begin
   FIteratorCallBack(Item, Key, Continue);
 end;
@@ -2297,7 +2297,7 @@ begin
     Add(Key,Data);
 end;
 
-Function TFPStringHashTable.GetData(const Index: string): String;
+Function TFPStringHashTable.GetData(const Index: AnsiString): AnsiString;
 var
   node: THTStringNode;
 begin
@@ -2308,12 +2308,12 @@ begin
     Result:='';
 end;
 
-Procedure TFPStringHashTable.SetData(const index, AValue: string);
+Procedure TFPStringHashTable.SetData(const index, AValue: AnsiString);
 begin
   THTStringNode(FindOrCreateNew(index)).Data:=AValue;
 end;
 
-Procedure TFPStringHashTable.Add(const aKey, aItem: string);
+Procedure TFPStringHashTable.Add(const aKey, aItem: AnsiString);
 var
   chn: TFPObjectList;
   NewNode: THtStringNode;
@@ -2324,12 +2324,12 @@ begin
   chn.Add(NewNode);
 end;
 
-Function TFPStringHashTable.CreateNewNode(const aKey : string) : THTCustomNode;
+Function TFPStringHashTable.CreateNewNode(const aKey : AnsiString) : THTCustomNode;
 begin
   Result:=THTStringNode.CreateWith(aKey);
 end;
 
-Function TFPStringHashTable.Iterate(aMethod: TStringIteratorMethod): String;
+Function TFPStringHashTable.Iterate(aMethod: TStringIteratorMethod): AnsiString;
 var
   N : THTStringNode;
 begin
@@ -2340,12 +2340,12 @@ begin
     Result:='';
 end;
 
-Procedure TFPStringHashTable.CallbackIterator(Item: String; const Key: string; var Continue: Boolean);
+Procedure TFPStringHashTable.CallbackIterator(Item: AnsiString; const Key: AnsiString; var Continue: Boolean);
 begin
   FIteratorCallBack(Item, Key, Continue);
 end;
 
-Function TFPStringHashTable.Iterate(aMethod: TStringIteratorCallback): String;
+Function TFPStringHashTable.Iterate(aMethod: TStringIteratorCallback): AnsiString;
 begin
   FIteratorCallBack := aMethod;
   Result := Iterate(@CallbackIterator);
@@ -2381,7 +2381,7 @@ begin
     Add(Key,Data);
 end;
 
-Function TFPObjectHashTable.GetData(const Index: string): TObject;
+Function TFPObjectHashTable.GetData(const Index: AnsiString): TObject;
 var
   node: THTObjectNode;
 begin
@@ -2392,12 +2392,12 @@ begin
     Result:=nil;
 end;
 
-Procedure TFPObjectHashTable.SetData(const index : string; AObject : TObject);
+Procedure TFPObjectHashTable.SetData(const index : AnsiString; AObject : TObject);
 begin
   THTObjectNode(FindOrCreateNew(index)).Data:=AObject;
 end;
 
-Procedure TFPObjectHashTable.Add(const aKey: string; AItem : TObject);
+Procedure TFPObjectHashTable.Add(const aKey: AnsiString; AItem : TObject);
 var
   chn: TFPObjectList;
   NewNode: THTObjectNode;
@@ -2408,7 +2408,7 @@ begin
   chn.Add(NewNode);
 end;
 
-Function TFPObjectHashTable.CreateNewNode(const aKey : string) : THTCustomNode;
+Function TFPObjectHashTable.CreateNewNode(const aKey : AnsiString) : THTCustomNode;
 begin
   if OwnsObjects then
     Result:=THTOwnedObjectNode.CreateWith(aKey)
@@ -2428,7 +2428,7 @@ begin
     Result:=nil;
 end;
 
-Procedure TFPObjectHashTable.CallbackIterator(Item: TObject; const Key: string; var Continue: Boolean);
+Procedure TFPObjectHashTable.CallbackIterator(Item: TObject; const Key: AnsiString; var Continue: Boolean);
 begin
   FIteratorCallBack(Item, Key, Continue);
 end;
@@ -2558,7 +2558,7 @@ begin
   Dec(B^.Count);
 end;
 
-Procedure TCustomBucketList.Error(Msg: String; Args: array of const);
+Procedure TCustomBucketList.Error(Msg: AnsiString; Args: array of const);
 begin
   raise ElistError.CreateFmt(Msg,Args);
 end;

packages/fcl-base/src/csvreadwrite.pp

@@ -37,7 +37,8 @@
 
 unit csvreadwrite;
 
-{$mode objfpc}{$H+}
+{$mode objfpc}
+{$H+}
 
 interface
 
@@ -211,7 +212,8 @@ begin
   DestLength := Length(AString);
 
   Src := PChar(AString);
-  EndPos := Src + DestLength;
+  EndPos := Src;
+  Inc(EndPos,DestLength);
   while Src < EndPos do
   begin
     if (Src^ = CR) then
@@ -371,9 +373,9 @@ procedure TCSVParser.ParseQuotedValue;
 var
   QuotationEnd: Boolean;
 begin
-  NextChar; // skip opening quotation char
+  NextChar; // skip opening quotation AnsiChar
   repeat
-    // read value up to next quotation char
+    // read value up to next quotation AnsiChar
     while not ((FCurrentChar = FQuoteChar) or EndOfFile) do
     begin
       if EndOfLine then
@@ -386,7 +388,7 @@ begin
         NextChar;
       end;
     end;
-    // skip quotation char (closing or escaping)
+    // skip quotation AnsiChar (closing or escaping)
     if not EndOfFile then
       NextChar;
     // check if it was escaping
@@ -553,6 +555,7 @@ var
   I: Integer;
   ValueLen: Integer;
   NeedQuotation: Boolean;
+  S : String;
 begin
   ValueLen := Length(AValue);
 
@@ -573,8 +576,8 @@ begin
   begin
     // double existing quotes
     Result := FDoubleQuote;
-    Insert(StringReplace(AValue, FQuoteChar, FDoubleQuote, [rfReplaceAll]),
-      Result, 2);
+    S:=StringReplace(AValue, FQuoteChar, FDoubleQuote, [rfReplaceAll]);
+    Insert(S,Result, 2);
   end else
     Result := AValue;
 end;

packages/fcl-base/src/gettext.pp

@@ -48,7 +48,7 @@ type
   TLongWordArray = array[0..(1 shl 30) div SizeOf(LongWord)] of LongWord;
   PLongWordArray = ^TLongWordArray;
 
-  TPCharArray = array[0..(1 shl 30) div SizeOf(PChar)] of PChar;
+  TPCharArray = array[0..(1 shl 30) div SizeOf(PAnsiChar)] of PAnsiChar;
   PPCharArray = ^TPCharArray;
 
   TMOFile = class
@@ -61,19 +61,19 @@ type
     constructor Create(const AFilename: String);
     constructor Create(AStream: TStream);
     destructor Destroy; override;
-    function Translate(AOrig: PChar; ALen: Integer; AHash: LongWord): String;
-    function Translate(const AOrig: String; AHash: LongWord): String;
-    function Translate(const AOrig: String): String;
+    function Translate(AOrig: PAnsiChar; ALen: Integer; AHash: LongWord): AnsiString;
+    function Translate(const AOrig: AnsiString; AHash: LongWord): AnsiString;
+    function Translate(const AOrig: AnsiString): AnsiString;
   end;
 
   EMOFileError = class(Exception);
 
 
-  procedure GetLanguageIDs(var Lang, FallbackLang: string);
+  procedure GetLanguageIDs(var Lang, FallbackLang: AnsiString);
   procedure TranslateResourceStrings(AFile: TMOFile);
-  procedure TranslateUnitResourceStrings(const AUnitName:string; AFile: TMOFile);
-  procedure TranslateResourceStrings(const AFilename: String);
-  procedure TranslateUnitResourceStrings(const AUnitName:string; const AFilename: String);
+  procedure TranslateUnitResourceStrings(const AUnitName:AnsiString; AFile: TMOFile);
+  procedure TranslateResourceStrings(const AFilename: AnsiString);
+  procedure TranslateUnitResourceStrings(const AUnitName:AnsiString; const AFilename: AnsiString);
 
 
 implementation
@@ -135,8 +135,8 @@ begin
 
   GetMem(OrigTable, header.nstrings * SizeOf(TMOStringInfo));
   GetMem(TranslTable, header.nstrings * SizeOf(TMOStringInfo));
-  GetMem(OrigStrings, header.nstrings * SizeOf(PChar));
-  GetMem(TranslStrings, header.nstrings * SizeOf(PChar));
+  GetMem(OrigStrings, header.nstrings * SizeOf(PAnsiChar));
+  GetMem(TranslStrings, header.nstrings * SizeOf(PAnsiChar));
 
 
   AStream.Position := header.OrigTabOffset;
@@ -157,7 +157,7 @@ begin
     AStream.Position := OrigTable^[i].offset;
 {    SetLength(s, OrigTable^[i].length);
     AStream.Read(s[1], OrigTable^[i].length);
-    OrigStrings^[i] := StrNew(PChar(s));}
+    OrigStrings^[i] := StrNew(PAnsiChar(s));}
     GetMem(OrigStrings^[i], OrigTable^[i].length + 1);
     AStream.Read(OrigStrings^[i]^, OrigTable^[i].length);
     OrigStrings^[i][OrigTable^[i].length] := #0;
@@ -168,7 +168,7 @@ begin
     AStream.Position := TranslTable^[i].offset;
 {    SetLength(s, TranslTable^[i].length);
     AStream.Read(s[1], TranslTable^[i].length);
-    TranslStrings^[i] := StrNew(PChar(s));}
+    TranslStrings^[i] := StrNew(PAnsiChar(s));}
     GetMem(TranslStrings^[i], TranslTable^[i].length+1);
     AStream.Read(TranslStrings^[i]^, TranslTable^[i].length);
     TranslStrings^[i][TranslTable^[i].length] := #0;
@@ -212,7 +212,7 @@ begin
   inherited Destroy;
 end;
 
-function TMOFile.Translate(AOrig: PChar; ALen: Integer; AHash: LongWord): String;
+function TMOFile.Translate(AOrig: PAnsiChar; ALen: Integer; AHash: LongWord):AnsiString ;
 var
   idx, incr, nstr: LongWord;
 begin
@@ -244,12 +244,13 @@ begin
   end;
 end;
 
-function TMOFile.Translate(const AOrig: String; AHash: LongWord): String;
+function TMOFile.Translate(const AOrig:AnsiString ; AHash: LongWord): AnsiString;
 begin
-  Result := Translate(PChar(AOrig), Length(AOrig), AHash);
+  Result := Translate(PAnsiChar(AOrig), Length(AOrig), AHash);
 end;
 
-function TMOFile.Translate(Const AOrig: String): String;
+function TMOFile.Translate(const AOrig:AnsiString ):AnsiString ;
+
 begin
   Result := Translate(AOrig, Hash(AOrig));
 end;
@@ -278,17 +279,17 @@ begin
 end;
 
 
-procedure TranslateUnitResourceStrings(const AUnitName:string; AFile: TMOFile);
+procedure TranslateUnitResourceStrings(const AUnitName:AnsiString; AFile: TMOFile);
 begin
   SetUnitResourceStrings(AUnitName,@Translate,AFile);
 end;
 
 
 {$ifdef windows}
-procedure GetLanguageIDs(var Lang, FallbackLang: string);
+procedure GetLanguageIDs(var Lang, FallbackLang:AnsiString );
 var
-  Buffer: array[1..4] of {$ifdef Wince}WideChar{$else}char{$endif};
-  Country: string;
+  Buffer: array[1..4] of {$ifdef Wince}WideChar{$else}AnsiChar{$endif};
+  Country: ;
   UserLCID: LCID;
 begin
   //defaults
@@ -316,7 +317,7 @@ end;
 
 {$else}
 
-procedure GetLanguageIDs(var Lang, FallbackLang: string);
+procedure GetLanguageIDs(var Lang, FallbackLang: AnsiString);
 begin
   FallbackLang:='';
   lang := GetEnvironmentVariable('LC_ALL');
@@ -334,11 +335,11 @@ begin
 end;
 {$endif}
 
-procedure TranslateResourceStrings(const AFilename: String);
+procedure TranslateResourceStrings(const AFilename: AnsiString);
 var
   mo: TMOFile;
-  lang, FallbackLang: String;
-  fn: String;
+  lang, FallbackLang: AnsiString;
+  fn: AnsiString;
 begin
   GetLanguageIDs(Lang, FallbackLang);
   fn:=Format(AFilename, [FallbackLang]);
@@ -374,10 +375,10 @@ begin
 end;
 
 
-procedure TranslateUnitResourceStrings(const AUnitName:string; const AFilename: String);
+procedure TranslateUnitResourceStrings(const AUnitName:AnsiString; const AFilename: AnsiString);
 var
   mo: TMOFile;
-  lang, FallbackLang: String;
+  lang, FallbackLang: AnsiString;
 begin
   GetLanguageIDs(Lang, FallbackLang);
   try

packages/fcl-base/src/go32v2/custapp.inc

@@ -16,7 +16,7 @@
 Procedure SysGetEnvironmentList(List : TStrings;NamesOnly : Boolean);
 
 Var
-  P : PPChar;
+  P : PPAnsiChar;
   S : String;
   I : Integer;
 

packages/fcl-base/src/idea.pp

@@ -327,7 +327,7 @@ begin
   If FBufPos>0 then
     begin
     // Fill with nulls
-    FillChar(PChar(@FData)[FBufPos],SizeOf(FData)-FBufPos,#0);
+    FillChar(PAnsiChar(@FData)[FBufPos],SizeOf(FData)-FBufPos,#0);
     CipherIdea(Fdata,OutData,FKey);
     Source.Write(OutData,SizeOf(OutData));
     // fixed: Manual flush and then free will now work
@@ -348,7 +348,7 @@ begin
     MVsize:=Count;
     If Mvsize>SizeOf(Fdata)-FBufPos then
       mvsize:=SizeOf(FData)-FBufPos;
-    Move(PChar(@Buffer)[Result],PChar(@FData)[FBufPos],MVSize);
+    Move(PAnsiChar(@Buffer)[Result],PAnsiChar(@FData)[FBufPos],MVSize);
     If FBufPos+mvSize=Sizeof(FData) then
       begin
       // Empty buffer.
@@ -409,9 +409,9 @@ begin
       mvSize:=FBufPos;
       If MvSize>count then
         mvsize:=Count;
-      Move(PChar(@FData)[0],PChar(@Buffer)[Result],MVSize);
+      Move(PAnsiChar(@FData)[0],PAnsiChar(@Buffer)[Result],MVSize);
       If ((Sizeof(FData)-MvSize)>0) then
-        Move(PChar(@FData)[mvSize],PChar(@FData)[0],Sizeof(FData)-MvSize);
+        Move(PAnsiChar(@FData)[mvSize],PAnsiChar(@FData)[0],Sizeof(FData)-MvSize);
       Dec(Count,mvsize);
       Inc(Result,mvsize);
       FBufPos:=FBufPos-MvSize;
@@ -424,7 +424,7 @@ begin
         begin
         If MvSize<SizeOf(InData) Then
           // Fill with nulls
-          FillChar(PChar(@InData)[mvsize],SizeOf(InData)-mvsize,#0);
+          FillChar(PAnsiChar(@InData)[mvsize],SizeOf(InData)-mvsize,#0);
         CipherIdea(InData,FData,FKey);
         FBufPos:=SizeOf(FData);
         end

packages/fcl-base/src/inicol.pp

@@ -26,12 +26,12 @@ Type
   TIniCollectionItem = Class(TCollectionItem)
   protected
     function GetSectionName: String; virtual; abstract;
-    procedure SetSectionName(const Value: String); virtual; abstract;
+    procedure SetSectionName(const Value: String ); virtual; abstract;
   Public
     Procedure SaveToIni(Ini: TCustomInifile; Section : String); Virtual; Abstract;
     Procedure LoadFromIni(Ini: TCustomInifile; Section : String); Virtual; Abstract;
     Procedure SaveToFile(const FileName : String; const Section : String);
-    Procedure LoadFromFile(const FileName : String; const Section : String);
+    Procedure LoadFromFile(const FileName :String ; const Section : String);
     Property SectionName : String Read GetSectionName Write SetSectionName;
   end;
 
@@ -40,7 +40,7 @@ Type
     FFileName: String;
     FGlobalSection: String;
   protected
-    FPrefix: String;  // Descendent must set this.
+    FPrefix:String ;  // Descendent must set this.
     FSectionPrefix : String;  // Descendent must set this too.
   Public
     Procedure Load;
@@ -48,9 +48,9 @@ Type
     Procedure SaveToIni(Ini: TCustomInifile; Section : String); virtual;
     Procedure SaveToFile(const AFileName : String; const Section : String);
     Procedure LoadFromIni(Ini: TCustomInifile; Section : String); virtual;
-    Procedure LoadFromFile(const AFileName : String; const Section : String);
-    Property Prefix : String Read FPrefix;
-    Property SectionPrefix : String Read FSectionPrefix;
+    Procedure LoadFromFile(AFileName :String ; const Section : String);
+    Property Prefix : String  Read FPrefix;
+    Property SectionPrefix : String  Read FSectionPrefix;
     Property FileName : String Read FFileName Write FFileName;
     Property GlobalSection : String Read FGlobalSection Write FGlobalSection;
   end;
@@ -59,14 +59,14 @@ Type
 
   TNamedIniCollectionItem = Class(TIniCollectionItem)
   private
-    procedure SetName(const AValue: String);
+    procedure SetName(const AValue:String);
   Protected
     FName : String;
     FUserData : TObject;
   Protected
     Procedure SetCollection(Value : TCollection); override;
     function GetSectionName: String; override;
-    procedure SetSectionName(const Value: String); override;
+    procedure SetSectionName(const Value:String ); override;
   Public
     Property UserData : TObject Read FUserData Write FUserData;
   Published
@@ -80,8 +80,8 @@ Type
     procedure SetNamedItem(Index: Integer; const AValue: TNamedIniCollectionItem);
   Public
     Function IndexOfUserData(UserData : TObject) : Integer;
-    Function IndexOfName(Const AName : String) : Integer;
-    Function FindByName(Const AName : string) : TNamedIniCollectionItem;
+    Function IndexOfName(Const AName :String ) : Integer;
+    Function FindByName(Const AName :String ) : TNamedIniCollectionItem;
     Function FindByUserData(UserData : TObject) : TNamedIniCollectionItem;
     Property NamedItems [Index: Integer] : TNamedIniCollectionItem Read GetNamedItem Write SetNamedItem; default;
   end;
@@ -158,11 +158,11 @@ begin
   end;
 end;
 
-procedure TIniCollection.LoadFromIni(Ini: TCustomInifile; Section: String);
+procedure TIniCollection.LoadFromIni(Ini: TCustomInifile; Section:String);
 
 Var
   ACount,I : Integer;
-  N,SP : String;
+  N,SP :String ;
 
 begin
   Clear;
@@ -258,7 +258,7 @@ begin
   inherited SetCollection(Value);
 end;
 
-function TNamedIniCollectionItem.GetSectionName: String;
+function TNamedIniCollectionItem.GetSectionName:String ;
 begin
   Result:=FName;
 end;
@@ -301,7 +301,7 @@ begin
     Dec(Result);
 end;
 
-function TNamedIniCollection.FindByName(const AName : string): TNamedIniCollectionItem;
+function TNamedIniCollection.FindByName(const AName : String): TNamedIniCollectionItem;
 
 Var
   I : Integer;

packages/fcl-base/src/netwlibc/custapp.inc

@@ -16,7 +16,7 @@
 Procedure SysGetEnvironmentList(List : TStrings;NamesOnly : Boolean);
 
 Var
-  P : PPChar;
+  P : PPAnsiChar;
   S : String;
   I : Integer;
 

packages/fcl-base/src/os2/custapp.inc

@@ -15,9 +15,9 @@
 
 { taken from dos unit }
 
-function EnvStr (Index: longint): string;
+function EnvStr (Index: longint): ;
 
-var HP: PChar;
+var HP: PAnsiChar;
 
 begin
     if (Index <= 0) or (Index > EnvC) then
@@ -33,7 +33,7 @@ end;
 procedure SysGetEnvironmentList(List : TStrings;NamesOnly : Boolean);
 
 Var
-  S : String;
+  S : ;
   J,I : Integer;
 
 begin

packages/fcl-base/src/os2/eventlog.inc

@@ -64,26 +64,26 @@ type
     Len: word;          { length of this record (including the Len field) }
     Rec_ID: word;       { record ID }
     Status: cardinal;   { record status bits (see lf_Bit_* constants) }
-    Qualifier: array [1..4] of char;    { qualifier tag }
+    Qualifier: array [1..4] of AnsiChar;    { qualifier tag }
     Reserved: cardinal;
     Time: cardinal;     { hours, minutes, seconds, hundreds }
     Date: cardinal;     { day, month, year (stored as word) }
     case byte of
-     0: (Data: array [1..MaxDataSize] of char);
-     1: (Originator256: array [0..255] of char;
-         ProcessName_O256: array [1..260] of char;
-         FormatDLLName_O256_ProcName: array [1..12] of char;
-         Data_O256_ProcName: array [1..MaxDataSize] of char);
-     2: (Originator256b: array [0..255] of char;
-         FormatDLLName_O256: array [1..12] of char;
-         Data_O256: array [1..MaxDataSize] of char);
-     3: (Originator8: array [0..7] of char;
-         ProcessName_O8: array [1..260] of char;
-         FormatDLLName_O8_ProcName: array [1..12] of char;
-         Data_O8_ProcName: array [1..MaxDataSize] of char);
-     4: (Originator8b: array [0..7] of char;
-         FormatDLLName_O8: array [1..12] of char;
-         Data_O8: array [1..MaxDataSize] of char);
+     0: (Data: array [1..MaxDataSize] of AnsiChar);
+     1: (Originator256: array [0..255] of AnsiChar;
+         ProcessName_O256: array [1..260] of AnsiChar;
+         FormatDLLName_O256_ProcName: array [1..12] of AnsiChar;
+         Data_O256_ProcName: array [1..MaxDataSize] of AnsiChar);
+     2: (Originator256b: array [0..255] of AnsiChar;
+         FormatDLLName_O256: array [1..12] of AnsiChar;
+         Data_O256: array [1..MaxDataSize] of AnsiChar);
+     3: (Originator8: array [0..7] of AnsiChar;
+         ProcessName_O8: array [1..260] of AnsiChar;
+         FormatDLLName_O8_ProcName: array [1..12] of AnsiChar;
+         Data_O8_ProcName: array [1..MaxDataSize] of AnsiChar);
+     4: (Originator8b: array [0..7] of AnsiChar;
+         FormatDLLName_O8: array [1..12] of AnsiChar;
+         Data_O8: array [1..MaxDataSize] of AnsiChar);
   end;
   LogRecord = TLogRecord;
   PLogRecord = ^TLogRecord;
@@ -113,7 +113,7 @@ function LogAddEntries (Handle: cardinal; Service: cardinal;
   var LogEntries: TLogEntryRec): longint; cdecl; external 'DOSCALLS' index 432;
 
 
-function TEventLog.DefaultFileName: string;
+function TEventLog.DefaultFileName: ;
 
 begin
   Result := GetEnvironmentVariable ('TEMP');
@@ -164,14 +164,14 @@ begin
 end;
 
 
-procedure TEventLog.WriteSystemLog (EventType: TEventType; const Msg: string);
+procedure TEventLog.WriteSystemLog (EventType: TEventType; const Msg: );
 
 const
   WinET: array [TEventType] of Str3 = ('USR', 'INF', 'WRN', 'ERR', 'DBG');
 
 var
   P: PLogEntryRec;
-  S: string;
+  S: ;
   Cnt, TSize, DSize: cardinal;
   W: word;
 
@@ -222,7 +222,7 @@ begin
     end;
 end;
 
-Function TEventLog.RegisterMessageFile(AFileName : String) : Boolean;
+Function TEventLog.RegisterMessageFile(AFileName : ) : Boolean;
 
 begin
   Result:=True;

packages/fcl-base/src/rtfdata.inc

@@ -412,7 +412,7 @@ TRTFFuncPtr = procedure of object;
 
 PRTFFONT = ^TRTFFONT;
 TRTFFont = Record
-        rtfFName    : string;           { font name }
+        rtfFName    : AnsiString;           { font name }
         rtfFNum     : integer;          { font number }
         rtfFFamily  : integer;          { font family }
         rtfNextFont : PRTFFONT;         { next font in list }
@@ -439,13 +439,13 @@ TRTFStyleElt = record
         rtfSEMajor,                     { token major number }
         rtfSEMinor,                     { token minor number }
         rtfSEParam : Integer;           { control symbol parameter }
-        rtfSEText : String;             { text of symbol }
+        rtfSEText : AnsiString;             { text of symbol }
         rtfNextSE : PRTFStyleElt;       { next element in style }
 end;
 
 PRTFSTyle = ^TRTFStyle;
 TRTFStyle = record
-        rtfSName : string;              { style name }
+        rtfSName : Ansistring;              { style name }
         rtfSNum,                        { style number }
         rtfSBasedOn,                    { style this one's based on }
         rtfSNextPar : integer;          { style next paragraph style }
@@ -463,7 +463,7 @@ Type
   TRTFKey = record
     rtfKMajor : Integer;        { major number }
     rtfKMinor : Integer;        { minor number }
-    rtfKStr   : string[20];     { symbol name }
+    rtfKStr   : String[20];     { symbol name }
     rtfKHash  : Integer;        { symbol name hash value }
     End;
 

packages/fcl-base/src/rtfpars.pp

@@ -39,7 +39,7 @@ TRTFParser = class(TObject)
     FrtfParam : Integer;
     rtfTextBuf : string [rtfBufSiz];
     rtfTextLen : Integer;
-    pushedChar : Integer;               { pushback char if read too far }
+    pushedChar : Integer;               { pushback AnsiChar if read too far }
     pushedClass : Integer;      { pushed token info for RTFUngetToken() }
     pushedMajor,
     pushedMinor,
@@ -62,7 +62,7 @@ TRTFParser = class(TObject)
     Function  CheckMM (major, minor : Integer) : Boolean;
     Procedure Real_RTFGetToken;
     Function  GetChar : Integer;
-    Procedure Lookup (S : String);
+    Procedure Lookup (S : AnsiString );
     Function  GetFont (num : Integer) : PRTFFont;
     Function  GetColor (num : Integer) : PRTFColor;
     Function  GetStyle (num : Integer) : PRTFStyle;
@@ -83,9 +83,9 @@ TRTFParser = class(TObject)
     Procedure StartReading;
     Procedure SetReadHook (Hook : TRTFFuncPtr);
     Procedure UngetToken;
-    Procedure SetToken (Aclass, major, minor, param : Integer; const text : string);
+    Procedure SetToken (Aclass, major, minor, param : Integer; const text : String);
     Procedure ExpandStyle (n : Integer);
-    Function GetRtfBuf : String;
+    Function GetRtfBuf : AnsiString;
     { Properties }
     Property Colors [Index : Integer]: PRTFColor Read GetColor;
     Property ClassCallBacks [AClass : Integer]: TRTFFuncptr
@@ -112,7 +112,7 @@ Const EOF = -255;
          Utility functions
   ---------------------------------------------------------------------}
 
-Function Hash (const s : String) : Integer;
+Function Hash (const s : AnsiString) : Integer;
 
 var
   val,i : integer;
@@ -505,7 +505,7 @@ if c<>ord('\') then
   Begin
   { Two possibilities here:
     1) ASCII 9, effectively like \tab control symbol
-    2) literal text char }
+    2) literal text AnsiChar }
   if c=ord(#8) then                     { ASCII 9 }
     Begin
     FrtfClass := rtfControl;
@@ -526,10 +526,10 @@ if (c=EOF) then
 if ( not isalpha (c)) then
   Begin
   { Three possibilities here:
-   1) hex encoded text char, e.g., \'d5, \'d3
-   2) special escaped text char, e.g., \, \;
+   1) hex encoded text AnsiChar, e.g., \'d5, \'d3
+   2) special escaped text AnsiChar, e.g., \, \;
    3) control symbol, e.g., \_, \-, \|, \<10> }
-  if c=ord('''') then { hex char }
+  if c=ord('''') then { hex AnsiChar }
      Begin
      c:=getchar;
      if (c<>EOF) then
@@ -546,7 +546,7 @@ if ( not isalpha (c)) then
        { early eof, whoops (class is rtfUnknown) }
        exit;
        End;
-  if pos (chr(c),':{};\')<>0 then { escaped char }
+  if pos (chr(c),':{};\')<>0 then { escaped AnsiChar }
     Begin
     FrtfClass := rtfText;
     FrtfMajor := c;
@@ -576,8 +576,8 @@ FTokenClass:=rtfControl;
 if (c <>EOF) then
   rtfTextBuf:=rtfTextBuf+chr(c);
 { Should be looking at first digit of parameter if there
-  is one, unless it's negative.  In that case, next char
-  is '-', so need to gobble next char, and remember sign. }
+  is one, unless it's negative.  In that case, next AnsiChar
+  is '-', so need to gobble next AnsiChar, and remember sign. }
 sign := 1;
 if c = ord('-') then
   Begin
@@ -598,7 +598,7 @@ if (c<>EOF) then
   FrtfParam:= sign*FrtfParam;
   End;
 { If control symbol delimiter was a blank, gobble it.
- Otherwise the character is first char of next token, so
+ Otherwise the character is first AnsiChar of next token, so
  push it back for next call.  In either case, delete the
  delimiter from the token buffer. }
 if (c<>EOF) then
@@ -1003,7 +1003,7 @@ while se<>nil do
 s^.rtfExpanding:=0;     { done - clear expansion flag }
 End;
 
-function TRTFParser.GetRtfBuf: String;
+function TRTFParser.GetRtfBuf: AnsiString;
 begin
   Result:=rtfTextBuf;
 end;
@@ -1032,7 +1032,7 @@ End;
        not found, the class turns into rtfUnknown.
   ---------------------------------------------------------------------}
 
-Procedure TRTFParser.Lookup(S : String);
+Procedure TRTFParser.Lookup (S : AnsiString);
 
 var
  thehash,rp : Integer;

packages/fcl-base/src/singleinstance.pp

@@ -40,7 +40,7 @@ type
     function GetIsClient: Boolean; virtual; abstract;
     function GetIsServer: Boolean; virtual; abstract;
     function GetStartResult: TSingleInstanceStart; virtual;
-    procedure DoServerReceivedParams(const aParamsDelimitedText: string);
+    procedure DoServerReceivedParams(const aParamsDelimitedText: AnsiString);
     Procedure SetStartResult(AValue : TSingleInstanceStart); 
   public
     constructor Create(aOwner: TComponent); override;
@@ -91,7 +91,7 @@ begin
 end;
 
 procedure TBaseSingleInstance.DoServerReceivedParams(
-  const aParamsDelimitedText: string);
+  const aParamsDelimitedText: AnsiString);
 var
   xSL: TStringList;
 begin

packages/fcl-base/src/streamex.pp

@@ -62,7 +62,7 @@ type
       function CreateDriver(Stream: TStream; BufSize: Integer): TAbstractObjectReader; override;
    public
       function GetDriver: TBidirBinaryObjectReader;
-      function ReadStr: string;
+      function ReadStr: AnsiString;
       procedure Read(var Buf; Count: LongInt); override;
       property Position: LongInt read GetPosition write SetPosition;
    end;
@@ -78,7 +78,7 @@ type
       function GetDriver: TBidirBinaryObjectWriter;
       procedure FlushBuffer;
       procedure Write(const Buf; Count: LongInt); override;
-      procedure WriteStr(const Value: string);
+      procedure WriteStr(const Value: Ansistring);
       procedure WriteValue(Value: TValueType);
       property Position: LongInt read GetPosition write SetPosition;
    end;
@@ -92,8 +92,8 @@ type
      constructor Create; virtual;
      procedure Reset; virtual; abstract;
      procedure Close; virtual; abstract;
-     procedure ReadLine(out AString: string); virtual; abstract; overload;
-     function ReadLine: string; overload;
+     procedure ReadLine(out AString: AnsiString); virtual; abstract; overload;
+     function ReadLine: AnsiString; overload;
      property Eof: Boolean read IsEof;
    end;
 
@@ -117,7 +117,7 @@ type
      destructor Destroy; override;
      procedure Reset; override;
      procedure Close; override;
-     procedure ReadLine(out AString: string); override; overload;
+     procedure ReadLine(out AString:Ansistring ); override; overload;
      property BaseStream: TStream read FStream;
      property OwnsStream: Boolean read FOwnsStream write FOwnsStream;
    end;
@@ -130,12 +130,12 @@ type
    Protected  
      function IsEof: Boolean; override;
    public
-     constructor Create(const AString: string; ABufferSize: Integer); virtual;
-     constructor Create(const AString: string); virtual;
+     constructor Create(const AString: AnsiString; ABufferSize: Integer); virtual;
+     constructor Create(const AString: AnsiString); virtual;
      destructor Destroy; override;
      procedure Reset; override;
      procedure Close; override;
-     procedure ReadLine(out AString: string); override; overload;
+     procedure ReadLine(out AString: AnsiString); override; overload;
    end;
 
    { TFileReader }
@@ -155,7 +155,7 @@ type
      destructor Destroy; override;
      procedure Reset; override;
      procedure Close; override;
-     procedure ReadLine(out AString: string); override; overload;
+     procedure ReadLine(out AString: AnsiString); override; overload;
    end;
 
    { TTextWriter }
@@ -855,7 +855,7 @@ begin
 end;
 
 
-function TDelphiReader.ReadStr: string;
+function TDelphiReader.ReadStr: AnsiString ;
 begin
    Result := GetDriver.ReadStr;
 end;
@@ -897,7 +897,7 @@ begin
    GetDriver.Write(Buf, Count);
 end;
 
-procedure TDelphiWriter.WriteStr(const Value: string);
+procedure TDelphiWriter.WriteStr(const Value: AnsiString );
 begin
    GetDriver.WriteStr(Value);
 end;
@@ -914,7 +914,7 @@ begin
   inherited Create;
 end;
 
-function TTextReader.ReadLine: string;
+function TTextReader.ReadLine: AnsiString;
 
 begin
   ReadLine(Result);
@@ -990,7 +990,7 @@ begin
   end;
 end;
 
-procedure TStreamReader.ReadLine(out AString: string);
+procedure TStreamReader.ReadLine(out AString: AnsiString );
 var
   VPByte: PByte;
   VPosition, VStrLength, VLength: Integer;
@@ -1042,13 +1042,13 @@ end;
 
 { TStringReader }
 
-constructor TStringReader.Create(const AString: string; ABufferSize: Integer);
+constructor TStringReader.Create(const AString: AnsiString; ABufferSize: Integer);
 begin
   inherited Create;
   FReader := TStreamReader.Create(TStringStream.Create(AString), ABufferSize, True);
 end;
 
-constructor TStringReader.Create(const AString: string);
+constructor TStringReader.Create(const AString: AnsiString);
 begin
   Create(AString, BUFFER_SIZE);
 end;
@@ -1074,7 +1074,7 @@ begin
   Result := FReader.IsEof;
 end;
 
-procedure TStringReader.ReadLine(out AString: string);
+procedure TStringReader.ReadLine(out AString: AnsiString );
 begin
   FReader.ReadLine(AString);
 end;
@@ -1126,7 +1126,7 @@ begin
   Result := FReader.IsEof;
 end;
 
-procedure TFileReader.ReadLine(out AString: string);
+procedure TFileReader.ReadLine(out AString: AnsiString);
 begin
   FReader.ReadLine(AString);
 end;

packages/fcl-base/src/unix/eventlog.inc

@@ -49,9 +49,9 @@ const
   LOG_AUTHPRIV = 10 shl 3;
 
 procedure closelog;cdecl;external;
-procedure openlog(__ident:pchar; __option:longint; __facilit:longint);cdecl;external;
+procedure openlog(__ident:PAnsiChar; __option:longint; __facilit:longint);cdecl;external;
 function setlogmask(__mask:longint):longint;cdecl;external;
-procedure syslog(__pri:longint; __fmt:pchar; args:array of const);cdecl;external;
+procedure syslog(__pri:longint; __fmt:PAnsiChar; args:array of const);cdecl;external;
 
 Function TEventLog.DefaultFileName : String;
 
@@ -67,7 +67,7 @@ Procedure TEventLog.ActivateSystemLog;
 
 begin
   CheckIdentification;
-  OpenLog(Pchar(Identification),LOG_NOWAIT,LOG_USER);
+  OpenLog(PAnsiChar(Identification),LOG_NOWAIT,LOG_USER);
 end;
 
 Procedure TEventLog.DeActivateSystemLog;
@@ -79,13 +79,13 @@ end;
 procedure TEventLog.WriteSystemLog(EventType : TEventType; const Msg : String);
 
 Var
-  P,PT : PChar;
+  P,PT : PAnsiChar;
   T : String;
 
 begin
-  P:=PChar(Msg);
+  P:=PAnsiChar(Msg);
   T:=EventTypeToString(EventType);
-  PT:=PChar(T);
+  PT:=PAnsiChar(T);
   syslog(MapTypeToEvent(EventType),'[%s] %s',[PT,P]);
 end;
 

packages/fcl-base/src/win/eventlog.inc

@@ -32,7 +32,7 @@ Procedure TEventLog.ActivateSystemLog;
 
 begin
   CheckIdentification;
-  FLogHandle := Pointer(OpenEventLogA(Nil,Pchar(Identification)));
+  FLogHandle := Pointer(OpenEventLogA(Nil,PAnsiChar(Identification)));
   If (FLogHandle=Nil) and FRaiseExceptionOnError then
     Raise ELogError.CreateFmt(SErrNoSysLog,[GetLastError]);
 end;
@@ -52,7 +52,7 @@ function ReportEvent(hEventLog: THandle; wType, wCategory: Word;
 procedure TEventLog.WriteSystemLog(EventType : TEventType; const Msg : String);
 
 Var
-  P : PChar;
+  P : PAnsiChar;
   I : Integer;
   FCategory : Word;
   FEventID : DWord;
@@ -62,7 +62,7 @@ begin
   FCategory:=MapTypeToCategory(EventType);
   FEventID:=MapTypeToEventID(EventType);
   FEventType:=MapTypeToEvent(EventType);
-  P:=PChar(Msg);
+  P:=PAnsiChar(Msg);
   If Not ReportEvent(Cardinal(FLogHandle),FEventType,FCategory,FEventID,Nil,1,0,@P,Nil) and FRaiseExceptionOnError then
     begin
     I:=GetLastError;
@@ -89,7 +89,7 @@ begin
   CheckIdentification;
   ELKey:=Format(SKeyEventLog,[IDentification]);
   Result:=RegCreateKeyExA(HKEY_LOCAL_MACHINE,
-                          PChar(ELKey),0,'',
+                          PAnsiChar(ELKey),0,'',
                           REG_OPTION_NON_VOLATILE,
                           KEY_ALL_ACCESS,
                           SecurityAttributes,Handle,
@@ -99,11 +99,11 @@ begin
       If AFileName='' then
         AFileName:=ParamStr(0);
       Value:=4;
-      Result:=Result and (RegSetValueExA(Handle,PChar(SKeyCategoryCount),0,REG_DWORD,@Value,sizeof(DWORD))=ERROR_SUCCESS);
+      Result:=Result and (RegSetValueExA(Handle,PAnsiChar(SKeyCategoryCount),0,REG_DWORD,@Value,sizeof(DWORD))=ERROR_SUCCESS);
       Value:=7;
-      Result:=Result and (RegSetValueExA(Handle,PChar(SKeyTypesSupported),0,REG_DWORD,@Value,sizeof(DWORD))=ERROR_SUCCESS);
-      Result:=Result and (RegSetValueExA(Handle,PChar(SKeyCategoryMessageFile),0,REG_SZ,@AFileName[1],Length(AFileName))=ERROR_SUCCESS);
-      Result:=Result and (RegSetValueExA(Handle,PChar(SKeyEventMessageFile),0,REG_SZ,@AFileName[1],Length(AFileName))=ERROR_SUCCESS);
+      Result:=Result and (RegSetValueExA(Handle,PAnsiChar(SKeyTypesSupported),0,REG_DWORD,@Value,sizeof(DWORD))=ERROR_SUCCESS);
+      Result:=Result and (RegSetValueExA(Handle,PAnsiChar(SKeyCategoryMessageFile),0,REG_SZ,@AFileName[1],Length(AFileName))=ERROR_SUCCESS);
+      Result:=Result and (RegSetValueExA(Handle,PAnsiChar(SKeyEventMessageFile),0,REG_SZ,@AFileName[1],Length(AFileName))=ERROR_SUCCESS);
     end;
 end;
 
@@ -113,7 +113,7 @@ Var
   ELKey : String;
 begin
   ELKey:=Format(SKeyEventLog,[IDentification]);
-  Result:=(RegDeleteKeyA(HKEY_LOCAL_MACHINE,pchar(ELKey))=ERROR_SUCCESS);
+  Result:=(RegDeleteKeyA(HKEY_LOCAL_MACHINE,PAnsiChar(ELKey))=ERROR_SUCCESS);
 end;
 
 function TEventLog.MapTypeToCategory(EventType: TEventType): Word;

packages/fcl-base/src/wince/fileinfo.pp

@@ -52,7 +52,7 @@ type
   public
      constructor Create(AOwner: TComponent);  override;
      destructor Destroy; override;
-     function getVersionSetting(inp : string): String;
+     function getVersionSetting(inp : ): ;
   published
     property fileName : widestring  read FFileName write SetFileName;
     property VersionStrings  : TStringList  read FmyVersionStrings;
@@ -155,8 +155,8 @@ begin
   finally ts.Free end;
 end;
 
-{ get single version string }
-function TFileVersionInfo.getVersionSetting(inp : string): String;
+{ get single version  }
+function TFileVersionInfo.getVersionSetting(inp : ): ;
 var i : integer;
 begin
   inp:=LowerCase(inp);

packages/fcl-base/tests/tcbufferedfilestream.pp

@@ -36,7 +36,7 @@ procedure TTestBufferedFileStream.TestCacheRead;
 var
   lBufferedStream: TBufferedFileStream;
   lStream: TFileStream;
-  b: array [0..10000-1] of char;
+  b: array [0..10000-1] of AnsiChar;
   j,k: integer;
   lBytesToRead: integer;
   lEffectiveRead: integer;
@@ -75,7 +75,7 @@ begin
       {$ELSE}
       lCheckInitV:=lReadPosition mod 10;
       for k := 0 to Pred(lEffectiveRead) do begin
-        if b[k]<>char(ord('0')+lCheckInitV mod 10) then begin
+        if b[k]<>AnsiChar(ord('0')+lCheckInitV mod 10) then begin
           FAIL('Expected data error');
         end;
         inc(lCheckInitV);
@@ -98,7 +98,7 @@ begin
 
       lCheckInitV:=lReadPosition mod 10;
       for k := 0 to Pred(lEffectiveRead) do begin
-        if b[k]<>char(ord('0')+lCheckInitV mod 10) then begin
+        if b[k]<>AnsiChar(ord('0')+lCheckInitV mod 10) then begin
           FAIL('Expected data error');
         end;
         inc(lCheckInitV);
@@ -132,7 +132,7 @@ begin
       {$ELSE}
       lCheckInitV:=lReadPosition mod 10;
       for k := 0 to Pred(lEffectiveRead) do begin
-        if b[k]<>char(ord('0')+lCheckInitV mod 10) then begin
+        if b[k]<>AnsiChar(ord('0')+lCheckInitV mod 10) then begin
           FAIL('Expected data error');
         end;
         inc(lCheckInitV);
@@ -154,7 +154,7 @@ begin
 
       lCheckInitV:=lReadPosition mod 10;
       for k := 0 to Pred(lEffectiveRead) do begin
-        if b[k]<>char(ord('0')+lCheckInitV mod 10) then begin
+        if b[k]<>AnsiChar(ord('0')+lCheckInitV mod 10) then begin
           FAIL('Expected data error');
         end;
         inc(lCheckInitV);
@@ -185,7 +185,7 @@ var
   lBufferedStream: TBufferedFileStream;
   lStream: TFileStream;
   lVerifyStream1,lVerifyStream2: TFileStream;
-  b: array [0..10000-1] of char;
+  b: array [0..10000-1] of AnsiChar;
   j: integer;
   lBytesToWrite: integer;
   lWritePosition: int64;
@@ -205,7 +205,7 @@ begin
       lStream.Write(b,sizeof(b));
     end;
     for j := 0 to Pred(Sizeof(b)) do begin
-      b[j]:=char(ord('0')+j mod 10);
+      b[j]:=AnsiChar(ord('0')+j mod 10);
     end;
   finally
     lBufferedStream.Free;
@@ -334,11 +334,11 @@ end;
 procedure TTestBufferedFileStream.SetUp;
 var
   F: TFileStream;
-  b: array [0..10000-1] of char;
+  b: array [0..10000-1] of AnsiChar;
   j: integer;
 begin
   for j := 0 to Pred(10000) do begin
-    b[j]:=char(ord('0')+j mod 10);
+    b[j]:=AnsiChar(ord('0')+j mod 10);
   end;
   F:=TFileStream.Create(TEST_FILENAME,fmCreate);
   for j := 0 to Pred(1000) do begin

packages/fcl-base/tests/tccsvdocument.pp

@@ -15,7 +15,7 @@ Type
   private
     FDoc: TCSVDocument;
     procedure RemoveTestFile;
-    function StripQuotes(S: String): string;
+    function StripQuotes(S: ): ;
     procedure TestTestFile;
   Public
     Procedure SetUp; override;
@@ -63,7 +63,7 @@ Const
   RowCount = 4;
 
 Type
-  TRow = Array[0..ColCount-1] of string;
+  TRow = Array[0..ColCount-1] of ;
   TCells = Array[0..RowCount-1] of TRow;
 
 Const
@@ -79,7 +79,7 @@ procedure TTestCSVDocument.CreateTestFile;
 Var
   L : TStringList;
   R,C : Integer;
-  S : String;
+  S : ;
 
 begin
   L:=TStringList.Create;
@@ -106,7 +106,7 @@ begin
   AssertNotNull('Have document',Doc);
 end;
 
-Function TTestCSVDocument.StripQuotes(S : String) : string;
+Function TTestCSVDocument.StripQuotes(S : ) : ;
 
 Var
   L : integer;

packages/fcl-base/tests/tccsvreadwrite.pp

@@ -15,8 +15,8 @@ type
   private
     FData: TStrings;
     FParser: TCSVParser;
-    procedure AssertLine(ARow: Integer; AValues: array of string);
-    procedure HaveNext(ARow, ACol: integer; AValue: String);
+    procedure AssertLine(ARow: Integer; AValues: array of );
+    procedure HaveNext(ARow, ACol: integer; AValue: );
   protected
     procedure SetUp; override;
     procedure TearDown; override;
@@ -39,10 +39,10 @@ begin
   AssertNotNull('Have parser',Parser);
 end;
 
-procedure TTestCSVReadWrite.HaveNext(ARow,ACol: integer; AValue : String);
+procedure TTestCSVReadWrite.HaveNext(ARow,ACol: integer; AValue : );
 
 Var
-  CN : String;
+  CN : ;
 
 begin
   CN:=Format('Cell(row: %d, col: %d)',[ARow,ACol]);
@@ -52,7 +52,7 @@ begin
   AssertEquals(CN+': Value',AValue,Parser.CurrentCellText);
 end;
 
-procedure TTestCSVReadWrite.AssertLine(ARow: Integer; AValues: array of string);
+procedure TTestCSVReadWrite.AssertLine(ARow: Integer; AValues: array of );
 
 Var
   I : Integer;

packages/fcl-base/tests/testbasenenc.lpr

@@ -18,9 +18,9 @@ program testbasenenc;
 uses sysutils, basenenc;
 
 
-Procedure AssertEquals(Const aActual,aExpected : TBytes; aMsg : String);
+Procedure AssertEquals(Const aActual,aExpected : TBytes; aMsg : );
 
-  function ToStr(aBytes : TBytes) : string;
+  function ToStr(aBytes : TBytes) : ;
 
   Var
     I : Integer;
@@ -45,7 +45,7 @@ begin
     end;
 end;
 
-Procedure AssertEquals(Const aActual,aExpected,aMsg : String);
+Procedure AssertEquals(Const aActual,aExpected,aMsg : );
 
 begin
   if aActual<>aExpected then
@@ -55,7 +55,7 @@ begin
     end;
 end;
 
-Procedure DoTest(B : Tbytes; aExpected : String; aURL : Boolean = False);
+Procedure DoTest(B : Tbytes; aExpected : ; aURL : Boolean = False);
 
 Var
   B2 : TBytes;
@@ -74,13 +74,13 @@ begin
   AssertEquals(B2,B,'DoTest Wrong decode');
 end;
 
-Procedure DoTest64(aValue, aExpected : String);
+Procedure DoTest64(aValue, aExpected : );
 
 begin
   DoTest(TEncoding.UTF8.GetAnsiBytes(aValue),aExpected);
 end;
 
-Procedure DoTest32(aValue, aExpected : String);
+Procedure DoTest32(aValue, aExpected : );
 
 Var
   B2 : TBytes;
@@ -93,7 +93,7 @@ begin
   AssertEquals(b2,TEncoding.UTF8.GetAnsiBytes(aValue),'Base32 Wrong encode for '+aValue);
 end;
 
-Procedure DoTest32Hex(aValue, aExpected : String);
+Procedure DoTest32Hex(aValue, aExpected : );
 
 Var
   B2 : TBytes;
@@ -106,7 +106,7 @@ begin
   AssertEquals(B2,TEncoding.UTF8.GetAnsiBytes(aValue),'Base32Hex Wrong encode for '+aValue);
 end;
 
-Procedure DoTest16(aValue, aExpected : String);
+Procedure DoTest16(aValue, aExpected : );
 
 Var
   B2 : TBytes;

packages/fcl-base/tests/testexprpars.pp

@@ -29,15 +29,15 @@ type
   TTestExpressionScanner = class(TTestCase)
   Private
     FP : TFPExpressionScanner;
-    FInvalidString : String;
-    procedure DoInvalidNumber(AString: String);
-    procedure TestIdentifier(const ASource, ATokenName: string);
+    FInvalidString : ;
+    procedure DoInvalidNumber(AString: );
+    procedure TestIdentifier(const ASource, ATokenName: );
     procedure TestInvalidNumber;
   protected
     procedure SetUp; override; 
     procedure TearDown; override;
-    Procedure AssertEquals(Msg : string; AExpected, AActual : TTokenType); overload;
-    Procedure TestString(Const AString : String; AToken : TTokenType);
+    Procedure AssertEquals(Msg : ; AExpected, AActual : TTokenType); overload;
+    Procedure TestString(Const AString : ; AToken : TTokenType);
   published
     procedure TestCreate;
     procedure TestSetSource;
@@ -68,16 +68,16 @@ type
   Protected
     FDestroyCalled : Integer;
     FCheckNode : TFPExprNode;
-    procedure AssertNodeType(Msg: String; AClass: TClass; ANode: TFPExprNode); overload;
-    procedure AssertEquals(Msg: String; AResultType : TResultType; ANode: TFPExprNode); overload;
-    procedure AssertEquals(Msg: String; AExpected,AActual : TResultType); overload;
+    procedure AssertNodeType(Msg: ; AClass: TClass; ANode: TFPExprNode); overload;
+    procedure AssertEquals(Msg: ; AResultType : TResultType; ANode: TFPExprNode); overload;
+    procedure AssertEquals(Msg: ; AExpected,AActual : TResultType); overload;
     Function CreateBoolNode(ABoolean: Boolean) : TFPExprNode;
     Function CreateIntNode(AInteger: Integer) : TFPExprNode;
     Function CreateFloatNode(AFloat : TExprFloat) : TFPExprNode;
-    Function CreateStringNode(Astring : String) : TFPExprNode;
+    Function CreateStringNode(Astring : ) : TFPExprNode;
     Function CreateDateTimeNode(ADateTime : TDateTime) : TFPExprNode;
     Procedure AssertNodeOK(FN : TFPExprNode);
-    Procedure AssertNodeNotOK(Const Msg : String; FN : TFPExprNode);
+    Procedure AssertNodeNotOK(Const Msg : ; FN : TFPExprNode);
     Procedure Setup; override;
   end;
 
@@ -272,7 +272,7 @@ type
     Procedure TearDown; override;
     Class Function NodeClass : TFPBooleanResultOperationClass; virtual;
     Class Function ExpectedResult : Boolean; virtual;
-    Class Function OperatorString : String; virtual;
+    Class Function OperatorString : ; virtual;
   Published
     Procedure TestCreateIntegerEqual;
     procedure TestCreateIntegerUnEqual;
@@ -299,7 +299,7 @@ type
   Protected
     Class Function NodeClass : TFPBooleanResultOperationClass; override;
     Class Function ExpectedResult : Boolean; override;
-    Class Function OperatorString : String; override;
+    Class Function OperatorString : ; override;
   end;
 
   { TTestLessThanNode }
@@ -311,7 +311,7 @@ type
     Class Function NodeClass : TFPBooleanResultOperationClass; virtual;
     Class Function Larger : Boolean; virtual;
     Class Function AllowEqual : Boolean; virtual;
-    Class Function OperatorString : String; virtual;
+    Class Function OperatorString : ; virtual;
     Procedure TearDown; override;
   Published
     Procedure TestCreateIntegerEqual;
@@ -343,7 +343,7 @@ type
   protected
     Class Function NodeClass : TFPBooleanResultOperationClass; override;
     Class Function AllowEqual : Boolean; override;
-    Class Function OperatorString : String; override;
+    Class Function OperatorString : ; override;
   end;
 
   { TTestLargerThanNode }
@@ -352,7 +352,7 @@ type
   protected
     Class Function NodeClass : TFPBooleanResultOperationClass; override;
     Class Function Larger : Boolean; override;
-    Class Function OperatorString : String; override;
+    Class Function OperatorString : ; override;
   end;
   { TTestLargerThanEqualNode }
 
@@ -360,7 +360,7 @@ type
   protected
     Class Function NodeClass : TFPBooleanResultOperationClass; override;
     Class Function AllowEqual : Boolean; override;
-    Class Function OperatorString : String; override;
+    Class Function OperatorString : ; override;
   end;
 
   { TTestAddNode }
@@ -423,7 +423,7 @@ type
   Protected
     Procedure Setup; override;
     Procedure TearDown; override;
-    procedure Calc(AExpr: String; Expected: Double = NaN);
+    procedure Calc(AExpr: ; Expected: Double = NaN);
   Published
     Procedure TestCreateInteger;
     Procedure TestCreateFloat;
@@ -498,7 +498,7 @@ type
   TTestExpressionParser = class(TTestBaseParser)
   Private
     FP : TMyFPExpressionParser;
-    FTestExpr : String;
+    FTestExpr : ;
     procedure DoAddInteger(var Result: TFPExpressionResult;
       const Args: TExprParameterArray);
     procedure DoDeleteString(var Result: TFPExpressionResult;
@@ -511,7 +511,7 @@ type
     procedure DoEchoString(var Result: TFPExpressionResult; Const Args: TExprParameterArray);
     procedure DoGetDate(var Result: TFPExpressionResult; Const Args: TExprParameterArray);
     procedure DoParse;
-    procedure TestParser(AExpr: string);
+    procedure TestParser(AExpr: );
   protected
     procedure SetUp; override;
     procedure TearDown; override;
@@ -521,7 +521,7 @@ type
     Procedure AssertResult(F : TExprFloat);
     Procedure AssertCurrencyResult(C : Currency);
     Procedure AssertResult(I : Int64);
-    Procedure AssertResult(S : String);
+    Procedure AssertResult(S : );
     Procedure AssertResult(B : Boolean);
     Procedure AssertDateTimeResult(D : TDateTime);
   end;
@@ -728,11 +728,11 @@ type
   TTestParserVariables = Class(TTestExpressionParser)
   private
     FAsWrongType : TResultType;
-    FEventName: String;
+    FEventName: ;
     FBoolValue : Boolean;
     FTest33 : TFPExprIdentifierDef;
     FIdentifiers : TStrings;
-    procedure AddIdentifier(Sender: TObject; const aIdentifier: String; var aIdent : TFPExprIdentifierDef);
+    procedure AddIdentifier(Sender: TObject; const aIdentifier: ; var aIdent : TFPExprIdentifierDef);
     procedure DoGetBooleanVar(var Res: TFPExpressionResult; ConstRef AName: ShortString);
     procedure DoGetBooleanVarWrong(var Res: TFPExpressionResult; ConstRef AName: ShortString);
     procedure TestAccess(Skip: TResultType);
@@ -911,23 +911,23 @@ type
   private
     FValue : Integer;
     FM : TExprBuiltInManager;
-    FExpr : String;
+    FExpr : ;
     procedure DoAverage(Var Result : TFPExpressionResult; ConstRef AName : ShortString);
     procedure DoSeries(var Result: TFPExpressionResult; ConstRef AName: ShortString);
   Protected
     procedure Setup; override;
     procedure Teardown; override;
-    Procedure SetExpression(Const AExpression : String);
-    Procedure AssertVariable(Const ADefinition : String; AResultType : TResultType);
-    Procedure AssertFunction(Const ADefinition,AResultType,ArgumentTypes : String; ACategory : TBuiltinCategory);
-    procedure AssertExpression(Const AExpression : String; AResult : Int64);
-    procedure AssertExpression(Const AExpression : String; Const AResult : String);
-    procedure AssertExpression(Const AExpression : String; Const AResult : TExprFloat);
-    procedure AssertExpression(Const AExpression : String; Const AResult : Boolean);
-    procedure AssertDateTimeExpression(Const AExpression : String; Const AResult : TDateTime);
-    procedure AssertAggregateExpression(Const AExpression : String; AResult : Int64; AUpdateCount : integer);
-    procedure AssertAggregateExpression(Const AExpression : String; AResult : TExprFloat; AUpdateCount : integer);
-    procedure AssertAggregateCurrExpression(Const AExpression : String; AResult : Currency; AUpdateCount : integer);
+    Procedure SetExpression(Const AExpression : );
+    Procedure AssertVariable(Const ADefinition : ; AResultType : TResultType);
+    Procedure AssertFunction(Const ADefinition,AResultType,ArgumentTypes : ; ACategory : TBuiltinCategory);
+    procedure AssertExpression(Const AExpression : ; AResult : Int64);
+    procedure AssertExpression(Const AExpression : ; Const AResult : );
+    procedure AssertExpression(Const AExpression : ; Const AResult : TExprFloat);
+    procedure AssertExpression(Const AExpression : ; Const AResult : Boolean);
+    procedure AssertDateTimeExpression(Const AExpression : ; Const AResult : TDateTime);
+    procedure AssertAggregateExpression(Const AExpression : ; AResult : Int64; AUpdateCount : integer);
+    procedure AssertAggregateExpression(Const AExpression : ; AResult : TExprFloat; AUpdateCount : integer);
+    procedure AssertAggregateCurrExpression(Const AExpression : ; AResult : Currency; AUpdateCount : integer);
   Published
     procedure TestRegister;
     Procedure TestVariablepi;
@@ -1392,7 +1392,7 @@ end;
 procedure TTestExpressionScanner.TestTokens;
 
 Const
-  TestStrings : Array[TTokenType] of String
+  TestStrings : Array[TTokenType] of
   (*
   TTokenType = (ttPlus, ttMinus, ttLessThan, ttLargerThan, ttEqual, ttDiv,
                 ttMod, ttMul, ttLeft, ttRight, ttLessThanEqual,
@@ -1421,7 +1421,7 @@ begin
   TestString(FInvalidString,ttNumber);
 end;
 
-procedure TTestExpressionScanner.DoInvalidNumber(AString : String);
+procedure TTestExpressionScanner.DoInvalidNumber(AString : );
 
 begin
   FInvalidString:=AString;
@@ -1466,7 +1466,7 @@ begin
   TestString('''s it''''''',ttString);
 end;
 
-procedure TTestExpressionScanner.TestIdentifier(Const ASource,ATokenName : string);
+procedure TTestExpressionScanner.TestIdentifier(Const ASource,ATokenName : );
 
 begin
   FP.Source:=ASource;
@@ -1497,11 +1497,11 @@ begin
   FreeAndNil(FP);
 end;
 
-procedure TTestExpressionScanner.AssertEquals(Msg: string; AExpected,
+procedure TTestExpressionScanner.AssertEquals(Msg: ; AExpected,
   AActual: TTokenType);
 
 Var
-  S1,S2 : String;
+  S1,S2 : ;
 
 begin
   S1:=TokenName(AExpected);
@@ -1509,7 +1509,7 @@ begin
   AssertEquals(Msg,S1,S2);
 end;
 
-procedure TTestExpressionScanner.TestString(const AString: String;
+procedure TTestExpressionScanner.TestString(const AString: ;
   AToken: TTokenType);
 begin
   FP.Source:=AString;
@@ -1529,21 +1529,21 @@ begin
   FCheckNode.Check;
 end;
 
-procedure TTestBaseParser.AssertNodeType(Msg: String; AClass: TClass;
+procedure TTestBaseParser.AssertNodeType(Msg: ; AClass: TClass;
   ANode: TFPExprNode);
 begin
   AssertNotNull(Msg+': Not null',ANode);
   AssertEquals(Msg+': Class OK',AClass,ANode.ClassType);
 end;
 
-procedure TTestBaseParser.AssertEquals(Msg: String; AResultType: TResultType;
+procedure TTestBaseParser.AssertEquals(Msg: ; AResultType: TResultType;
   ANode: TFPExprNode);
 begin
   AssertNotNull(Msg+': Node not null',ANode);
   AssertEquals(Msg,AResultType,Anode.NodeType);
 end;
 
-procedure TTestBaseParser.AssertEquals(Msg: String; AExpected,
+procedure TTestBaseParser.AssertEquals(Msg: ; AExpected,
   AActual: TResultType);
 
 begin
@@ -1560,7 +1560,7 @@ begin
   Result:=TFPConstExpression.CreateFloat(AFloat);
 end;
 
-function TTestBaseParser.CreateStringNode(Astring: String): TFPExprNode;
+function TTestBaseParser.CreateStringNode(Astring: ): TFPExprNode;
 begin
   Result:=TFPConstExpression.CreateString(AString);
 end;
@@ -1574,7 +1574,7 @@ procedure TTestBaseParser.AssertNodeOK(FN: TFPExprNode);
 
 Var
   B : Boolean;
-  Msg : String;
+  Msg : ;
 
 begin
   AssertNotNull('Node to test OK',FN);
@@ -1590,7 +1590,7 @@ begin
     Fail(Format('Node %s not OK: %s',[FN.ClassName,Msg]));
 end;
 
-procedure TTestBaseParser.AssertNodeNotOK(const MSg : String; FN: TFPExprNode);
+procedure TTestBaseParser.AssertNodeNotOK(const MSg : ; FN: TFPExprNode);
 begin
   FCheckNode:=FN;
   AssertException(Msg,EExprParser,@DoCheck);
@@ -1657,7 +1657,7 @@ procedure TTestConstExprNode.TestCreateDateTime;
 
 Var
   D : TDateTime;
-  S : String;
+  S : ;
 
 begin
   D:=Now;
@@ -1672,7 +1672,7 @@ end;
 procedure TTestConstExprNode.TestCreateString;
 
 Var
-  S : String;
+  S : ;
 
 begin
   S:='Ohlala';
@@ -1705,7 +1705,7 @@ end;
 procedure TTestNegateExprNode.TestCreateFloat;
 
 Var
-  S : String;
+  S : ;
 
 begin
   FN:=TFPNegateOperation.Create(CreateFloatNode(1.23));
@@ -1956,7 +1956,7 @@ begin
   Result:=True
 end;
 
-class function TTestEqualNode.OperatorString: String;
+class function TTestEqualNode.OperatorString: ;
 begin
   Result:='=';
 end;
@@ -2108,7 +2108,7 @@ begin
   Result:=False;
 end;
 
-class function TTestUnEqualNode.OperatorString: String;
+class function TTestUnEqualNode.OperatorString: ;
 begin
   Result:='<>';
 end;
@@ -2130,7 +2130,7 @@ begin
   Result:=False;
 end;
 
-class function TTestLessThanNode.OperatorString: String;
+class function TTestLessThanNode.OperatorString: ;
 begin
   Result:='<';
 end;
@@ -2318,7 +2318,7 @@ begin
   Result:=True;
 end;
 
-class function TTestLessThanEqualNode.OperatorString: String;
+class function TTestLessThanEqualNode.OperatorString: ;
 begin
   Result:='<=';
 end;
@@ -2335,7 +2335,7 @@ begin
   Result:=True;
 end;
 
-class function TTestLargerThanNode.OperatorString: String;
+class function TTestLargerThanNode.OperatorString: ;
 begin
   Result:='>';
 end;
@@ -2352,7 +2352,7 @@ begin
   Result:=True;
 end;
 
-class function TTestLargerThanEqualNode.OperatorString: String;
+class function TTestLargerThanEqualNode.OperatorString: ;
 begin
   Result:='>=';
 end;
@@ -2553,7 +2553,7 @@ begin
   FE.Builtins := [bcMath];
 end;
 
-procedure TTestPowerNode.Calc(AExpr: String; Expected: Double =NaN);
+procedure TTestPowerNode.Calc(AExpr: ; Expected: Double =NaN);
 const
   EPS = 1e-9;
 var
@@ -2825,7 +2825,7 @@ end;
 procedure TTestFloatToDateTimeNode.TestAsString;
 
 Var
-  S : String;
+  S : ;
 
 begin
   FN:=TFloatToDateTimeNode.Create(CreateFloatNode(1.2));
@@ -2860,7 +2860,7 @@ begin
   FP.Expression:=FTestExpr;
 end;
 
-procedure TTestExpressionParser.TestParser(AExpr : string);
+procedure TTestExpressionParser.TestParser(AExpr : );
 
 begin
   FTestExpr:=AExpr;
@@ -2913,9 +2913,9 @@ begin
   AssertEquals('Correct integer result',I,FP.Evaluate.ResInteger);
 end;
 
-procedure TTestExpressionParser.AssertResult(S: String);
+procedure TTestExpressionParser.AssertResult(S: );
 begin
-  AssertEquals('Correct string result',S,FP.ExprNode.NodeValue.ResString);
+  AssertEquals('Correct  result',S,FP.ExprNode.NodeValue.ResString);
   AssertEquals('Correct string result',S,FP.Evaluate.ResString);
 end;
 
@@ -2940,7 +2940,7 @@ end;
 
 procedure TTestParserExpressions.TestNumberValues;
 
-  Procedure DoTest(E :  String; V : integer);
+  Procedure DoTest(E :  ; V : integer);
 
   var
     res: TFPExpressionResult;
@@ -5016,7 +5016,7 @@ begin
   Res.ResBoolean:=FBoolValue;
 end;
 
-procedure TTestParserVariables.AddIdentifier(Sender: TObject; const aIdentifier: String; var aIdent : TFPExprIdentifierDef);
+procedure TTestParserVariables.AddIdentifier(Sender: TObject; const aIdentifier: ; var aIdent : TFPExprIdentifierDef);
 begin
   aIdent:=Nil;
   AssertNotNull('Have identifier list',FIdentifiers);
@@ -5044,7 +5044,7 @@ begin
 end;
 
 Var
-  FVarCallBackName:String;
+  FVarCallBackName:;
   FVarBoolValue : Boolean;
 
 procedure DoGetBooleanVar2(var Res: TFPExpressionResult; ConstRef AName: ShortString);
@@ -6097,10 +6097,10 @@ begin
   inherited Teardown;
 end;
 
-procedure TTestBuiltins.SetExpression(const AExpression: String);
+procedure TTestBuiltins.SetExpression(const AExpression: );
 
 Var
-  Msg : String;
+  Msg : ;
 
 begin
   Msg:='';
@@ -6114,7 +6114,7 @@ begin
     Fail('Parsing of expression "'+AExpression+'" failed :'+Msg);
 end;
 
-procedure TTestBuiltins.AssertVariable(const ADefinition: String;
+procedure TTestBuiltins.AssertVariable(const ADefinition: ;
   AResultType: TResultType);
 
 Var
@@ -6127,7 +6127,7 @@ begin
 end;
 
 procedure TTestBuiltins.AssertFunction(const ADefinition, AResultType,
-  ArgumentTypes: String; ACategory : TBuiltinCategory);
+  ArgumentTypes: ; ACategory : TBuiltinCategory);
 
 Var
   I : TFPBuiltinExprIdentifierDef;
@@ -6141,7 +6141,7 @@ begin
   AssertEquals(ADefinition+' has correct category',Ord(ACategory),Ord(I.Category));
 end;
 
-procedure TTestBuiltins.AssertExpression(const AExpression: String;
+procedure TTestBuiltins.AssertExpression(const AExpression: ;
   AResult: Int64);
 
 begin
@@ -6150,15 +6150,15 @@ begin
   AssertResult(AResult);
 end;
 
-procedure TTestBuiltins.AssertExpression(const AExpression: String;
-  const AResult: String);
+procedure TTestBuiltins.AssertExpression(const AExpression: ;
+  const AResult: );
 begin
   FP.BuiltIns:=AllBuiltIns;
   SetExpression(AExpression);
   AssertResult(AResult);
 end;
 
-procedure TTestBuiltins.AssertExpression(const AExpression: String;
+procedure TTestBuiltins.AssertExpression(const AExpression: ;
   const AResult: TExprFloat);
 begin
   FP.BuiltIns:=AllBuiltIns;
@@ -6166,7 +6166,7 @@ begin
   AssertResult(AResult);
 end;
 
-procedure TTestBuiltins.AssertExpression(const AExpression: String;
+procedure TTestBuiltins.AssertExpression(const AExpression: ;
   const AResult: Boolean);
 begin
   FP.BuiltIns:=AllBuiltIns;
@@ -6174,7 +6174,7 @@ begin
   AssertResult(AResult);
 end;
 
-procedure TTestBuiltins.AssertDateTimeExpression(const AExpression: String;
+procedure TTestBuiltins.AssertDateTimeExpression(const AExpression: ;
   const AResult: TDateTime);
 begin
   FP.BuiltIns:=AllBuiltIns;
@@ -6182,7 +6182,7 @@ begin
   AssertDatetimeResult(AResult);
 end;
 
-procedure TTestBuiltins.AssertAggregateExpression(const AExpression: String;
+procedure TTestBuiltins.AssertAggregateExpression(const AExpression: ;
   AResult: Int64; AUpdateCount: integer);
 begin
   FP.BuiltIns:=AllBuiltIns;
@@ -6197,7 +6197,7 @@ begin
   AssertResult(AResult);
 end;
 
-procedure TTestBuiltins.AssertAggregateExpression(const AExpression: String;
+procedure TTestBuiltins.AssertAggregateExpression(const AExpression: ;
   AResult: TExprFloat; AUpdateCount: integer);
 begin
   FP.BuiltIns:=AllBuiltIns;
@@ -6212,7 +6212,7 @@ begin
   AssertResult(AResult);
 end;
 
-procedure TTestBuiltins.AssertAggregateCurrExpression(Const AExpression : String; AResult : Currency; AUpdateCount : integer);
+procedure TTestBuiltins.AssertAggregateCurrExpression(Const AExpression : ; AResult : Currency; AUpdateCount : integer);
 
 begin
   FP.BuiltIns:=AllBuiltIns;
@@ -6647,7 +6647,7 @@ end;
 procedure TTestBuiltins.TestFunctionstrtofloat;
 
 Var
-  S : String;
+  S : ;
 
 begin
   S:='1.23';
@@ -6731,7 +6731,7 @@ procedure TTestBuiltins.TestFunctionstrtodatetime;
 
 Var
   T : TDateTime;
-  S : String;
+  S : ;
 
 begin
   T:=Now;
@@ -6743,7 +6743,7 @@ procedure TTestBuiltins.TestFunctionstrtodatetimedef;
 
 Var
   T : TDateTime;
-  S : String;
+  S : ;
 
 begin
   T:=Now;