mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-21 09:58:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

FIX: FPC 3.3 compatibility (#385)

Browse source
This commit is contained in:
larinsv 2022-03-27 20:21:21 +03:00 • committed by GitHub
commit f5809a23f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 23 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/doublecmd/dcdatetimeutils.pas
View file

@ -31,7 +31,7 @@ uses
{$IF DEFINED(MSWINDOWS)}
, Windows
{$ELSEIF DEFINED(UNIX)}
, UnixUtil, DCUnix
, Unix, UnixUtil, DCUnix
{$ENDIF}
;

3
plugins/wcx/unrar/src/unrarfunc.pas
View file

@ -25,6 +25,9 @@
unit UnRARFunc;
{$mode objfpc}{$H+}
{$ifndef VER3_2}
{$modeswitch arraytodynarray}
{$endif}
{$include calling.inc}
interface

4
src/dmcommondata.pas
View file

@ -40,7 +40,7 @@ type
SaveDialog: TSaveDialog;
procedure DataModuleCreate(Sender: TObject);
private
procedure LoadImages(Images: TImageList; ANames: TStringArray);
procedure LoadImages(Images: TImageList; const ANames: array of String);
public
{ public declarations }
end;
@ -145,7 +145,7 @@ begin
end;
end;
procedure TdmComData.LoadImages(Images: TImageList; ANames: TStringArray);
procedure TdmComData.LoadImages(Images: TImageList; const ANames: array of String);
var
AName: String;
ASize16, ASize24: Integer;

8
src/filesources/filesystem/ufilesystemutil.pas
View file

@ -1610,20 +1610,22 @@ end;
function TFileSystemOperationHelper.FileExists(aFile: TFile;
var AbsoluteTargetFileName: String; AllowAppend: Boolean
): TFileSourceOperationOptionFileExists;
type
TFileSourceOperationUIResponses = array of TFileSourceOperationUIResponse;
const
Responses: array[0..13] of TFileSourceOperationUIResponse
Responses: TFileSourceOperationUIResponses
= (fsourOverwrite, fsourSkip, fsourRenameSource, fsourOverwriteAll,
fsourSkipAll, fsourResume, fsourOverwriteOlder, fsourCancel,
fsouaCompare, fsourAppend, fsourOverwriteSmaller, fsourOverwriteLarger,
fsourAutoRenameSource, fsourAutoRenameTarget);
ResponsesNoAppend: array[0..11] of TFileSourceOperationUIResponse
ResponsesNoAppend: TFileSourceOperationUIResponses
= (fsourOverwrite, fsourSkip, fsourRenameSource, fsourOverwriteAll,
fsourSkipAll, fsourOverwriteSmaller, fsourOverwriteOlder, fsourCancel,
fsouaCompare, fsourOverwriteLarger, fsourAutoRenameSource, fsourAutoRenameTarget);
var
Answer: Boolean;
Message: String;
PossibleResponses: array of TFileSourceOperationUIResponse;
PossibleResponses: TFileSourceOperationUIResponses;
function RenameTarget: TFileSourceOperationOptionFileExists;
var

8
src/filesources/wcxarchive/uwcxarchivecopyoutoperation.pas
View file

@ -569,17 +569,19 @@ end;
function TWcxArchiveCopyOutOperation.DoFileExists(Header: TWcxHeader;
var AbsoluteTargetFileName: String): TFileSourceOperationOptionFileExists;
type
TFileSourceOperationUIResponses = array of TFileSourceOperationUIResponse;
const
Responses: array[0..10] of TFileSourceOperationUIResponse
Responses: TFileSourceOperationUIResponses
= (fsourOverwrite, fsourSkip, fsourOverwriteLarger, fsourOverwriteAll,
fsourSkipAll, fsourOverwriteSmaller, fsourOverwriteOlder, fsourCancel,
fsouaCompare, fsourRenameSource, fsourAutoRenameSource);
ResponsesNoCompare: array[0..9] of TFileSourceOperationUIResponse
ResponsesNoCompare: TFileSourceOperationUIResponses
= (fsourOverwrite, fsourSkip, fsourOverwriteLarger, fsourOverwriteAll,
fsourSkipAll, fsourOverwriteSmaller, fsourOverwriteOlder, fsourCancel,
fsourRenameSource, fsourAutoRenameSource);
var
PossibleResponses: array of TFileSourceOperationUIResponse;
PossibleResponses: TFileSourceOperationUIResponses;
Answer: Boolean;
Message: String;

8
src/filesources/wfxplugin/uwfxpluginutil.pas
View file

@ -438,16 +438,18 @@ end;
function TWfxPluginOperationHelper.FileExists(aFile: TFile;
AbsoluteTargetFileName: String; AllowResume: Boolean
): TFileSourceOperationOptionFileExists;
type
TFileSourceOperationUIResponses = array of TFileSourceOperationUIResponse;
const
Responses: array[0..6] of TFileSourceOperationUIResponse
Responses: TFileSourceOperationUIResponses
= (fsourOverwrite, fsourSkip, fsourResume, fsourOverwriteAll, fsourSkipAll,
fsouaCompare, fsourCancel);
ResponsesNoResume: array[0..5] of TFileSourceOperationUIResponse
ResponsesNoResume: TFileSourceOperationUIResponses
= (fsourOverwrite, fsourSkip, fsourOverwriteAll, fsourSkipAll, fsouaCompare,
fsourCancel);
var
Message: String;
PossibleResponses: array of TFileSourceOperationUIResponse;
PossibleResponses: TFileSourceOperationUIResponses;
begin
case FFileExistsOption of
fsoofeNone:

2
src/fmain.pas
View file

@ -1479,7 +1479,7 @@ begin
// Button was moved.
SaveToolBar(Toolbar)
else
if Sender is TKASToolButton and not Draging then
if (Sender is TKASToolButton) and not Draging then
begin
ToolItem := TKASToolButton(Sender).ToolItem;
if ToolItem is TKASProgramItem then

2
src/ufilefunctions.pas
View file

@ -255,7 +255,7 @@ begin
fsfAttr:
if fpAttributes in AFile.SupportedProperties then
begin
if AFile.Properties[fpAttributes] is TUnixFileAttributesProperty and (AParam = ATTR_OCTAL) then
if (AFile.Properties[fpAttributes] is TUnixFileAttributesProperty) and (AParam = ATTR_OCTAL) then
Result := FormatUnixModeOctal(AFile.Attributes)
else
Result := AFile.Properties[fpAttributes].Format(DefaultFilePropertyFormatter);