瀏覽代碼

FIX: FPC 3.0.4 compatibility

Alexander Koblov 3 年之前
父節點
當前提交
27282fdf9b
共有 2 個文件被更改,包括 3 次插入3 次删除
  1. 1 1
      components/doublecmd/dcstrutils.pas
  2. 2 2
      src/fmain.pas

+ 1 - 1
components/doublecmd/dcstrutils.pas

@@ -849,7 +849,7 @@ function ApplyRenameMask(aFileName: String; NameMask: String; ExtMask: String):
     if (Length(TargetString) < Length(Mask)) then
     if (Length(TargetString) < Length(Mask)) then
       Result:= TargetString
       Result:= TargetString
     else begin
     else begin
-      Result:= String.Empty;
+      Result:= EmptyStr;
       for I:= 1 to Length(Mask) do
       for I:= 1 to Length(Mask) do
       begin
       begin
         if Mask[I] = '?' then
         if Mask[I] = '?' then

+ 2 - 2
src/fmain.pas

@@ -1058,13 +1058,13 @@ procedure TfrmMain.FormCreate(Sender: TObject);
     if Length(UniqueInstance.ServernameByUser) > 0 then
     if Length(UniqueInstance.ServernameByUser) > 0 then
       AServerName := ' [' + UniqueInstance.ServernameByUser + ']'
       AServerName := ' [' + UniqueInstance.ServernameByUser + ']'
     else begin
     else begin
-      AServerName := String.Empty;
+      AServerName := EmptyStr;
     end;
     end;
 
 
     if TryStrToInt(dcRevision, R) then
     if TryStrToInt(dcRevision, R) then
       ARevision:= '.' + dcRevision
       ARevision:= '.' + dcRevision
     else begin
     else begin
-      ARevision:= String.Empty;
+      ARevision:= EmptyStr;
     end;
     end;
 
 
     Result := Format('%s%s %s%s',
     Result := Format('%s%s %s%s',