paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-19 00:49:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Restore signature of loadfromstream/loadfromfile, make default delphi compatible

Browse Source 
git-svn-id: trunk@37965 -
This commit is contained in:
michael 2018-01-14 10:11:56 +00:00
parent 5c4b1737c4
commit cbc50c5fe6
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rtl/objpas/classes/classesh.inc
View File

@ -690,9 +690,11 @@ type
procedure Insert(Index: Integer; const S: string); virtual; abstract; procedure Insert(Index: Integer; const S: string); virtual; abstract;
procedure InsertObject(Index: Integer; const S: string; procedure InsertObject(Index: Integer; const S: string;
AObject: TObject); AObject: TObject);
procedure LoadFromFile(const FileName: string; IgnoreEncoding : Boolean = True); overload; virtual; procedure LoadFromFile(const FileName: string); overload;
procedure LoadFromFile(const FileName: string; IgnoreEncoding : Boolean);
procedure LoadFromFile(const FileName: string; AEncoding: TEncoding); overload; virtual; procedure LoadFromFile(const FileName: string; AEncoding: TEncoding); overload; virtual;
procedure LoadFromStream(Stream: TStream; IgnoreEncoding : Boolean = True); overload; virtual; procedure LoadFromStream(Stream: TStream); overload; virtual;
procedure LoadFromStream(Stream: TStream; IgnoreEncoding : Boolean); overload;
procedure LoadFromStream(Stream: TStream; AEncoding: TEncoding); overload; virtual; procedure LoadFromStream(Stream: TStream; AEncoding: TEncoding); overload; virtual;
procedure Move(CurIndex, NewIndex: Integer); virtual; procedure Move(CurIndex, NewIndex: Integer); virtual;
procedure SaveToFile(const FileName: string); overload; virtual; procedure SaveToFile(const FileName: string); overload; virtual;

16
rtl/objpas/classes/stringl.inc
View File

@ -975,7 +975,13 @@ end;
Procedure TStrings.LoadFromFile(const FileName: string; IgnoreEncoding : Boolean = True); Procedure TStrings.LoadFromFile(const FileName: string);
begin
LoadFromFile(FileName,False)
end;
Procedure TStrings.LoadFromFile(const FileName: string; IgnoreEncoding : Boolean);
Var Var
TheStream : TFileStream; TheStream : TFileStream;
begin begin
@ -1001,7 +1007,13 @@ begin
end; end;
end; end;
Procedure TStrings.LoadFromStream(Stream: TStream; IgnoreEncoding : Boolean = True); Procedure TStrings.LoadFromStream(Stream: TStream);
begin
LoadFromStream(Stream,False);
end;
Procedure TStrings.LoadFromStream(Stream: TStream; IgnoreEncoding : Boolean);
{ {
Borlands method is no good, since a pipe for Borlands method is no good, since a pipe for
instance doesn't have a size. instance doesn't have a size.