浏览代码

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

git-svn-id: trunk@37965 -
michael 7 年之前
父节点
当前提交
cbc50c5fe6
共有 2 个文件被更改,包括 18 次插入4 次删除
  1. 4 2
      rtl/objpas/classes/classesh.inc
  2. 14 2
      rtl/objpas/classes/stringl.inc

+ 4 - 2
rtl/objpas/classes/classesh.inc

@@ -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;

+ 14 - 2
rtl/objpas/classes/stringl.inc

@@ -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.