paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-13 05:49:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

lazbuild: less warnings

Browse Source 
git-svn-id: trunk@36247 -
This commit is contained in:
mattias 2012-03-23 08:37:45 +00:00
parent cbe4f9ea76
commit a1d2be124b
17 changed files with 66 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ide/aboutfrm.pas
View File

@ -87,11 +87,11 @@ type
ContributorsPage: TTabSheet; ContributorsPage: TTabSheet;
AcknowledgementsPage:TTabSheet; AcknowledgementsPage:TTabSheet;
procedure AboutFormCreate(Sender:TObject); procedure AboutFormCreate(Sender:TObject);
procedure FormClose(Sender: TObject; var CloseAction: TCloseAction); procedure FormClose(Sender: TObject; var {%H-}CloseAction: TCloseAction);
procedure miVerToClipboardClick(Sender: TObject); procedure miVerToClipboardClick(Sender: TObject);
procedure NotebookPageChanged(Sender: TObject); procedure NotebookPageChanged(Sender: TObject);
procedure URLLabelMouseDown(Sender: TObject; Button: TMouseButton; procedure URLLabelMouseDown(Sender: TObject; {%H-}Button: TMouseButton;
Shift: TShiftState; X, Y: Integer); {%H-}Shift: TShiftState; {%H-}X, {%H-}Y: Integer);
procedure URLLabelMouseEnter(Sender: TObject); procedure URLLabelMouseEnter(Sender: TObject);
procedure URLLabelMouseLeave(Sender: TObject); procedure URLLabelMouseLeave(Sender: TObject);
private private

11
ide/buildlazdialog.pas
View File

@ -45,14 +45,13 @@ interface
uses uses
Classes, SysUtils, LCLProc, LConvEncoding, Forms, Controls, LCLType, LCLIntf, Classes, SysUtils, LCLProc, LConvEncoding, Forms, Controls, LCLType, LCLIntf,
Graphics, GraphType, StdCtrls, ExtCtrls, Buttons, FileUtil, Dialogs, Types, Graphics, GraphType, StdCtrls, ExtCtrls, Buttons, FileUtil, Dialogs,
InterfaceBase, Themes, ComCtrls, CheckLst, Menus, DividerBevel, InterfaceBase, Themes, CheckLst, Menus, DividerBevel,
DefineTemplates, DefineTemplates,
// IDEIntf // IDEIntf
LazIDEIntf, IDEMsgIntf, IDEHelpIntf, IDEImagesIntf, IDEWindowIntf, LazIDEIntf, IDEMsgIntf, IDEHelpIntf, IDEImagesIntf, IDEWindowIntf,
// IDE // IDE
LazarusIDEStrConsts, TransferMacros, LazConf, IDEProcs, DialogProcs, LazarusIDEStrConsts, TransferMacros, LazConf, IDEProcs, DialogProcs, MainBar,
IDEContextHelpEdit, MainBar,
InputHistory, ExtToolDialog, ExtToolEditDlg, EnvironmentOpts, InputHistory, ExtToolDialog, ExtToolEditDlg, EnvironmentOpts,
{$IFDEF win32} {$IFDEF win32}
CodeToolManager, // added for windres workaround CodeToolManager, // added for windres workaround
@ -111,7 +110,7 @@ type
procedure CompileAdvancedButtonClick(Sender: TObject); procedure CompileAdvancedButtonClick(Sender: TObject);
procedure CompileButtonClick(Sender: TObject); procedure CompileButtonClick(Sender: TObject);
procedure DefinesButtonClick(Sender: TObject); procedure DefinesButtonClick(Sender: TObject);
procedure FormClose(Sender: TObject; var CloseAction: TCloseAction); procedure FormClose(Sender: TObject; var {%H-}CloseAction: TCloseAction);
procedure FormCreate(Sender: TObject); procedure FormCreate(Sender: TObject);
procedure FormDestroy(Sender: TObject); procedure FormDestroy(Sender: TObject);
procedure FormResize(Sender: TObject); procedure FormResize(Sender: TObject);
@ -160,8 +159,6 @@ implementation
const const
DefaultIDEMakeOptionFilename = 'idemake.cfg'; DefaultIDEMakeOptionFilename = 'idemake.cfg';
ButtonSize = 24;
ModeColumnWidth = 170;
function ShowConfigureBuildLazarusDlg(AProfiles: TBuildLazarusProfiles): TModalResult; function ShowConfigureBuildLazarusDlg(AProfiles: TBuildLazarusProfiles): TModalResult;
// mrOk=save // mrOk=save

2
ide/buildprofilemanager.pas
View File

@ -34,7 +34,7 @@ uses
Classes, SysUtils, FileUtil, Laz2_XMLCfg, LResources, Forms, Controls, Classes, SysUtils, FileUtil, Laz2_XMLCfg, LResources, Forms, Controls,
Graphics, Dialogs, ExtCtrls, Buttons, StdCtrls, ComCtrls, Contnrs, Graphics, Dialogs, ExtCtrls, Buttons, StdCtrls, ComCtrls, Contnrs,
ButtonPanel, DefineTemplates, IDEImagesIntf, IDEMsgIntf, IDEHelpIntf, ButtonPanel, DefineTemplates, IDEImagesIntf, IDEMsgIntf, IDEHelpIntf,
LazarusIDEStrConsts, LazConf, InterfaceBase, IDEProcs, IDEContextHelpEdit, LazarusIDEStrConsts, LazConf, InterfaceBase, IDEProcs,
CompilerOptions; CompilerOptions;
type type

6
ide/compileroptions.pp
View File

@ -90,9 +90,9 @@ type
procedure Assign(Source: TLazBuildMacro); override; procedure Assign(Source: TLazBuildMacro); override;
function Equals(Other: TLazBuildMacro): boolean; reintroduce; function Equals(Other: TLazBuildMacro): boolean; reintroduce;
procedure LoadFromXMLConfig(aXMLConfig: TXMLConfig; const Path: string; procedure LoadFromXMLConfig(aXMLConfig: TXMLConfig; const Path: string;
DoSwitchPathDelims: boolean); {%H-}DoSwitchPathDelims: boolean);
procedure SaveToXMLConfig(aXMLConfig: TXMLConfig; const Path: string; procedure SaveToXMLConfig(aXMLConfig: TXMLConfig; const Path: string;
UsePathDelim: TPathDelimSwitch); {%H-}UsePathDelim: TPathDelimSwitch);
function CreateDiff(OtherMode: TLazBuildMacro; Tool: TCompilerDiffTool = nil): boolean; function CreateDiff(OtherMode: TLazBuildMacro; Tool: TCompilerDiffTool = nil): boolean;
procedure IncreaseChangeStamp; procedure IncreaseChangeStamp;
property ChangeStamp: integer read FChangeStamp; property ChangeStamp: integer read FChangeStamp;
@ -711,6 +711,7 @@ const
function EnumToStr(opt: TParsedCompilerOptString): string; function EnumToStr(opt: TParsedCompilerOptString): string;
begin begin
Result:='';
WriteStr(Result, opt); WriteStr(Result, opt);
end; end;
@ -1661,6 +1662,7 @@ begin
{ Linking } { Linking }
p:=Path+'Linking/'; p:=Path+'Linking/';
aXMLConfig.SetDeleteValue(p+'Debugging/GenerateDebugInfo/Value', GenerateDebugInfo, True); // Default = True, since version 11 (was False before) aXMLConfig.SetDeleteValue(p+'Debugging/GenerateDebugInfo/Value', GenerateDebugInfo, True); // Default = True, since version 11 (was False before)
s:='';
WriteStr(s, DebugInfoType); WriteStr(s, DebugInfoType);
aXMLConfig.SetDeleteValue(p+'Debugging/DebugInfoType/Value', s, 'dsAuto'); aXMLConfig.SetDeleteValue(p+'Debugging/DebugInfoType/Value', s, 'dsAuto');
aXMLConfig.DeletePath(p+'Debugging/GenerateDwarf'); // old deprecated setting aXMLConfig.DeletePath(p+'Debugging/GenerateDwarf'); // old deprecated setting

3
ide/dialogprocs.pas
View File

@ -36,8 +36,7 @@ unit DialogProcs;
interface interface
uses uses
Classes, SysUtils, LCLProc, LResources, Forms, Controls, Dialogs, FileProcs, Classes, SysUtils, LCLProc, LResources, Forms, Controls, Dialogs, FileProcs, FileUtil, LazFileUtils, Laz2_XMLCfg,
Laz2_XMLWrite, FileUtil, LazFileUtils, Laz2_XMLCfg,
CodeToolsConfig, CodeCache, CodeToolManager, CodeToolsConfig, CodeCache, CodeToolManager,
AVL_Tree, LazIDEIntf, AVL_Tree, LazIDEIntf,
IDEProcs, LazarusIDEStrConsts, IDEDialogs; IDEProcs, LazarusIDEStrConsts, IDEDialogs;

32
ide/environmentopts.pp
View File

@ -370,22 +370,22 @@ type
// macro functions // macro functions
procedure InitMacros(AMacroList: TTransferMacroList); procedure InitMacros(AMacroList: TTransferMacroList);
function MacroFuncCompPath(const s:string; const Data: PtrInt; function MacroFuncCompPath(const {%H-}s:string; const {%H-}Data: PtrInt;
var Abort: boolean): string; var {%H-}Abort: boolean): string;
function MacroFuncFPCSrcDir(const s:string; const Data: PtrInt; function MacroFuncFPCSrcDir(const {%H-}s:string; const {%H-}Data: PtrInt;
var Abort: boolean): string; var {%H-}Abort: boolean): string;
function MacroFuncLazarusDir(const s:string; const Data: PtrInt; function MacroFuncLazarusDir(const {%H-}s:string; const {%H-}Data: PtrInt;
var Abort: boolean): string; var {%H-}Abort: boolean): string;
function MacroFuncExeExt(const s:string; const Data: PtrInt; function MacroFuncExeExt(const {%H-}s:string; const {%H-}Data: PtrInt;
var Abort: boolean): string; var {%H-}Abort: boolean): string;
function MacroFuncLanguageID(const s:string; const Data: PtrInt; function MacroFuncLanguageID(const {%H-}s:string; const {%H-}Data: PtrInt;
var Abort: boolean): string; var {%H-}Abort: boolean): string;
function MacroFuncLanguageName(const s:string; const Data: PtrInt; function MacroFuncLanguageName(const {%H-}s:string; const {%H-}Data: PtrInt;
var Abort: boolean): string; var {%H-}Abort: boolean): string;
function MacroFuncTestDir(const s:string; const Data: PtrInt; function MacroFuncTestDir(const {%H-}s:string; const {%H-}Data: PtrInt;
var Abort: boolean): string; var {%H-}Abort: boolean): string;
function MacroFuncConfDir(const s:string; const Data: PtrInt; function MacroFuncConfDir(const {%H-}s:string; const {%H-}Data: PtrInt;
var Abort: boolean): string; var {%H-}Abort: boolean): string;
// debugger // debugger
procedure SaveDebuggerPropertiesList; procedure SaveDebuggerPropertiesList;

4
ide/exttooleditdlg.pas
View File

@ -43,7 +43,7 @@ uses
MemCheck, MemCheck,
{$ENDIF} {$ENDIF}
Classes, SysUtils, FileUtil, Classes, SysUtils, FileUtil,
LCLType, Controls, Forms, Buttons, StdCtrls, ComCtrls, LCLType, Controls, Forms, Buttons, StdCtrls,
Dialogs, ExtCtrls, LCLProc, ButtonPanel, Dialogs, ExtCtrls, LCLProc, ButtonPanel,
IDEMsgIntf, IDEExternToolIntf, IDEHelpIntf, IDEMsgIntf, IDEExternToolIntf, IDEHelpIntf,
PropEdits, TransferMacros, LazarusIDEStrConsts, PropEdits, TransferMacros, LazarusIDEStrConsts,
@ -95,7 +95,7 @@ type
procedure MacrosListboxClick(Sender: TObject); procedure MacrosListboxClick(Sender: TObject);
procedure MacrosListboxDblClick(Sender: TObject); procedure MacrosListboxDblClick(Sender: TObject);
procedure OKButtonClick(Sender: TObject); procedure OKButtonClick(Sender: TObject);
procedure OpenButtonClick(sender : TOBject); procedure OpenButtonClick({%H-}sender : TOBject);
procedure ScannersButtonClick(Sender: TObject); procedure ScannersButtonClick(Sender: TObject);
private private
fOptions: TExternalToolOptions; fOptions: TExternalToolOptions;

3
ide/genericchecklist.pas
View File

@ -6,8 +6,7 @@ unit GenericCheckList;
interface interface
uses uses
Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ButtonPanel, Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ButtonPanel, CheckLst, LazarusIDEStrConsts, Buttons;
StdCtrls, CheckLst, LazarusIDEStrConsts, Buttons;
type type

4
ide/idecontexthelpedit.pas
View File

@ -57,7 +57,7 @@ type
constructor Create(AOwner: TComponent); override; constructor Create(AOwner: TComponent); override;
procedure Run; procedure Run;
destructor Destroy; override; destructor Destroy; override;
procedure OnIdle(Sender: TObject; var Done: Boolean); procedure OnIdle(Sender: TObject; var {%H-}Done: Boolean);
end; end;
@ -83,7 +83,7 @@ type
WindowControlsGroupBox: TGroupBox; WindowControlsGroupBox: TGroupBox;
procedure ControlsTreeViewShowHint(Sender: TObject; HintInfo: PHintInfo); procedure ControlsTreeViewShowHint(Sender: TObject; HintInfo: PHintInfo);
procedure CreateHelpNodeForControlButtonClick(Sender: TObject); procedure CreateHelpNodeForControlButtonClick(Sender: TObject);
procedure FormClose(Sender: TObject; var CloseAction: TCloseAction); procedure FormClose(Sender: TObject; var {%H-}CloseAction: TCloseAction);
procedure FormCreate(Sender: TObject); procedure FormCreate(Sender: TObject);
procedure FormDestroy(Sender: TObject); procedure FormDestroy(Sender: TObject);
procedure HelpNodesTreeViewSelectionChanged(Sender: TObject); procedure HelpNodesTreeViewSelectionChanged(Sender: TObject);

4
ide/infobuild.pp
View File

@ -68,9 +68,9 @@ type
PnlTitle : TPanel; PnlTitle : TPanel;
tmrCloseForm: TTimer; tmrCloseForm: TTimer;
procedure BCloseClick(Sender: TObject); procedure BCloseClick(Sender: TObject);
procedure FormClose(Sender: TObject; var CloseAction: TCloseAction); procedure FormClose(Sender: TObject; var {%H-}CloseAction: TCloseAction);
procedure FormCreate(Sender: TObject); procedure FormCreate(Sender: TObject);
procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState); procedure FormKeyDown(Sender: TObject; var Key: Word; {%H-}Shift: TShiftState);
procedure tmrCloseFormTimer(Sender: TObject); procedure tmrCloseFormTimer(Sender: TObject);
private private
NHints : Integer; NHints : Integer;

10
ide/initialsetupdlgs.pas
View File

@ -43,7 +43,7 @@ uses
Classes, SysUtils, contnrs, LCLProc, Forms, Controls, Buttons, Dialogs, Classes, SysUtils, contnrs, LCLProc, Forms, Controls, Buttons, Dialogs,
FileUtil, Laz2_XMLCfg, Graphics, ComCtrls, ExtCtrls, StdCtrls, FileUtil, Laz2_XMLCfg, Graphics, ComCtrls, ExtCtrls, StdCtrls,
DefineTemplates, CodeToolManager, DefineTemplates, CodeToolManager,
TextTools, IDEDialogs, TextTools,
TransferMacros, LazarusIDEStrConsts, LazConf, EnvironmentOpts, IDEProcs, TransferMacros, LazarusIDEStrConsts, LazConf, EnvironmentOpts, IDEProcs,
AboutFrm; AboutFrm;
@ -106,7 +106,7 @@ type
procedure PropertiesTreeViewSelectionChanged(Sender: TObject); procedure PropertiesTreeViewSelectionChanged(Sender: TObject);
procedure StartIDEBitBtnClick(Sender: TObject); procedure StartIDEBitBtnClick(Sender: TObject);
procedure WelcomePaintBoxPaint(Sender: TObject); procedure WelcomePaintBoxPaint(Sender: TObject);
procedure OnIdle(Sender: TObject; var Done: Boolean); procedure OnIdle(Sender: TObject; var {%H-}Done: Boolean);
private private
FFPCSrcNeedsUpdate: boolean; FFPCSrcNeedsUpdate: boolean;
FCompilerNeedsUpdate: boolean; FCompilerNeedsUpdate: boolean;
@ -174,9 +174,9 @@ type
TSetupMacros = class(TTransferMacroList) TSetupMacros = class(TTransferMacroList)
protected protected
procedure DoSubstitution(TheMacro: TTransferMacro; const MacroName: string; procedure DoSubstitution({%H-}TheMacro: TTransferMacro; const MacroName: string;
var s: string; const Data: PtrInt; var Handled, Abort: boolean; var s: string; const {%H-}Data: PtrInt; var Handled, {%H-}Abort: boolean;
Depth: integer); override; {%H-}Depth: integer); override;
public public
FPCVer: string; FPCVer: string;
LazarusDir: string; LazarusDir: string;

2
ide/keymapping.pp
View File

@ -172,7 +172,7 @@ type
function CreateUniqueCategoryName(const AName: string): string; function CreateUniqueCategoryName(const AName: string): string;
function CreateUniqueCommandName(const AName: string): string; function CreateUniqueCommandName(const AName: string): string;
function CreateNewCommandID: word; function CreateNewCommandID: word;
function CreateCategory(Parent: TIDECommandCategory; function CreateCategory({%H-}Parent: TIDECommandCategory;
const AName, Description: string; const AName, Description: string;
Scope: TIDECommandScope = nil): TIDECommandCategory; override; Scope: TIDECommandScope = nil): TIDECommandCategory; override;
function CreateCommand(Category: TIDECommandCategory; function CreateCommand(Category: TIDECommandCategory;

2
ide/mainbar.pas
View File

@ -38,7 +38,7 @@ uses
{$IFDEF IDE_MEM_CHECK} {$IFDEF IDE_MEM_CHECK}
MemCheck, MemCheck,
{$ENDIF} {$ENDIF}
Classes, SysUtils, LCLProc, StdCtrls, Forms, Controls, Buttons, Menus, Classes, SysUtils, LCLProc, Forms, Controls, Buttons, Menus,
ComCtrls, ExtCtrls, Dialogs, LMessages, ComCtrls, ExtCtrls, Dialogs, LMessages,
// IDEIntf // IDEIntf
ProjectIntf, NewItemIntf, MenuIntf, LazIDEIntf, ProjectIntf, NewItemIntf, MenuIntf, LazIDEIntf,

2
ide/miscoptions.pas
View File

@ -30,7 +30,7 @@ unit MiscOptions;
interface interface
uses uses
Classes, SysUtils, LCLProc, BuildLazDialog, BuildProfileManager, Classes, SysUtils, LCLProc, BuildProfileManager,
CodeToolsStructs, TextTools, FileUtil, Laz2_XMLCfg, LazConf, IDEProcs; CodeToolsStructs, TextTools, FileUtil, Laz2_XMLCfg, LazConf, IDEProcs;
type type

6
ide/outputfilter.pas
View File

@ -94,8 +94,8 @@ type
public public
constructor Create(TheFilter: TOutputFilter); constructor Create(TheFilter: TOutputFilter);
procedure Init(const aLine, aWorkDir: string; const aLineNumber: integer); procedure Init(const aLine, aWorkDir: string; const aLineNumber: integer);
procedure LineChanged(const OldValue: string); override; procedure LineChanged(const {%H-}OldValue: string); override;
procedure WorkingDirectoryChanged(const OldValue: string); override; procedure WorkingDirectoryChanged(const {%H-}OldValue: string); override;
property Filter: TOutputFilter read FFilter; property Filter: TOutputFilter read FFilter;
end; end;
@ -159,7 +159,7 @@ type
procedure ClearScanners; procedure ClearScanners;
procedure InitExecute; procedure InitExecute;
procedure CleanUpExecute; procedure CleanUpExecute;
procedure ContinueAsyncExecute(Data: PtrInt); procedure ContinueAsyncExecute({%H-}Data: PtrInt);
protected protected
procedure SetErrorName(errtype: TFPCErrorType; const AValue: String ); procedure SetErrorName(errtype: TFPCErrorType; const AValue: String );
function GetErrorName(errtype: TFPCErrorType): string; function GetErrorName(errtype: TFPCErrorType): string;

24
ide/sourcesyneditor.pas
View File

@ -142,7 +142,7 @@ type
FTopInfoMarkup: TSynSelectedColor; FTopInfoMarkup: TSynSelectedColor;
function GetIDEGutterMarks: TIDESynGutterMarks; function GetIDEGutterMarks: TIDESynGutterMarks;
procedure GetTopInfoMarkupForLine(Sender: TObject; Line: integer; var Special: boolean; procedure GetTopInfoMarkupForLine(Sender: TObject; {%H-}Line: integer; var Special: boolean;
aMarkup: TSynSelectedColor); aMarkup: TSynSelectedColor);
procedure SetShowTopInfo(AValue: boolean); procedure SetShowTopInfo(AValue: boolean);
procedure SetTopInfoMarkup(AValue: TSynSelectedColor); procedure SetTopInfoMarkup(AValue: TSynSelectedColor);
@ -184,7 +184,7 @@ type
function GetInitializationLine: Integer; function GetInitializationLine: Integer;
function GetInterfaceLine: Integer; function GetInterfaceLine: Integer;
protected protected
function CreateRangeList(ALines: TSynEditStringsBase): TSynHighlighterRangeList; override; function CreateRangeList({%H-}ALines: TSynEditStringsBase): TSynHighlighterRangeList; override;
function StartCodeFoldBlock(ABlockType: Pointer; function StartCodeFoldBlock(ABlockType: Pointer;
IncreaseLevel: Boolean = true): TSynCustomCodeFoldBlock; override; IncreaseLevel: Boolean = true): TSynCustomCodeFoldBlock; override;
public public
@ -221,7 +221,7 @@ type
procedure SetSingleLine(const AValue: Boolean); procedure SetSingleLine(const AValue: Boolean);
protected protected
procedure BufferChanged(Sender: TObject); procedure BufferChanged(Sender: TObject);
procedure HighlightChanged(Sender: TSynEditStrings; AIndex, ACount : Integer); procedure HighlightChanged(Sender: TSynEditStrings; {%H-}AIndex, {%H-}ACount : Integer);
procedure ReCalc; override; procedure ReCalc; override;
procedure Paint(Canvas: TCanvas; AClip: TRect; TopOffset: integer); override; procedure Paint(Canvas: TCanvas; AClip: TRect; TopOffset: integer); override;
@ -649,7 +649,7 @@ begin
InfCnt := List.Count; InfCnt := List.Count;
for i := InfCnt-1 downto 0 do begin for i := InfCnt-1 downto 0 do begin
if not(TPascalCodeFoldBlockType(PtrUInt(List.NodeFoldType[i])) in if not(TPascalCodeFoldBlockType({%H-}PtrUInt(List.NodeFoldType[i])) in
[cfbtClass, cfbtClassSection, cfbtProcedure]) [cfbtClass, cfbtClassSection, cfbtProcedure])
then then
continue; continue;
@ -658,7 +658,7 @@ begin
if sfaInvalid in Inf.FoldAction then if sfaInvalid in Inf.FoldAction then
continue; continue;
NodeFoldType:=TPascalCodeFoldBlockType(PtrUInt(Inf.FoldType)); NodeFoldType:=TPascalCodeFoldBlockType({%H-}PtrUInt(Inf.FoldType));
if (NodeFoldType in [cfbtClassSection]) and (ListCnt = 0) then begin if (NodeFoldType in [cfbtClassSection]) and (ListCnt = 0) then begin
InfList[ListCnt] := Inf; InfList[ListCnt] := Inf;
inc(ListCnt); inc(ListCnt);
@ -674,7 +674,7 @@ begin
inc(ListCnt); inc(ListCnt);
end; end;
if (NodeFoldType in [cfbtProcedure]) and (ListCnt = 2) and if (NodeFoldType in [cfbtProcedure]) and (ListCnt = 2) and
(TPascalCodeFoldBlockType(PtrUInt(InfList[ListCnt-1].FoldType)) = cfbtProcedure) (TPascalCodeFoldBlockType({%H-}PtrUInt(InfList[ListCnt-1].FoldType)) = cfbtProcedure)
then begin then begin
InfList[ListCnt-1] := Inf; InfList[ListCnt-1] := Inf;
end; end;
@ -864,8 +864,8 @@ end;
function TIDESynPasSyn.StartCodeFoldBlock(ABlockType: Pointer; function TIDESynPasSyn.StartCodeFoldBlock(ABlockType: Pointer;
IncreaseLevel: Boolean): TSynCustomCodeFoldBlock; IncreaseLevel: Boolean): TSynCustomCodeFoldBlock;
begin begin
if (ABlockType = Pointer(PtrInt(cfbtUnitSection))) or if (ABlockType = Pointer(PtrUInt(cfbtUnitSection))) or
(ABlockType = Pointer(PtrInt(cfbtUnitSection)) + PtrUInt(CountPascalCodeFoldBlockOffset)) (ABlockType = Pointer(PtrUInt(cfbtUnitSection)) + {%H-}PtrUInt(CountPascalCodeFoldBlockOffset))
then begin then begin
if KeyComp('Interface') then if KeyComp('Interface') then
TIDESynHighlighterPasRangeList(CurrentRanges).FInterfaceLine := LineIndex + 1; TIDESynHighlighterPasRangeList(CurrentRanges).FInterfaceLine := LineIndex + 1;
@ -1427,7 +1427,7 @@ begin
dec(j); dec(j);
if FoldView.IsFoldedAtTextIndex(i,j) then begin if FoldView.IsFoldedAtTextIndex(i,j) then begin
FldInf := FoldView.FoldProvider.FoldOpenInfo(i, j); FldInf := FoldView.FoldProvider.FoldOpenInfo(i, j);
if TPascalCodeFoldBlockType(PtrUInt(FldInf.FoldType)) in if TPascalCodeFoldBlockType({%H-}PtrUInt(FldInf.FoldType)) in
[cfbtAnsiComment, cfbtBorCommand, cfbtSlashComment] [cfbtAnsiComment, cfbtBorCommand, cfbtSlashComment]
then begin then begin
FoldView.UnFoldAtTextIndex(i, j, 1, False, 0); FoldView.UnFoldAtTextIndex(i, j, 1, False, 0);
@ -1452,7 +1452,7 @@ begin
while j > 0 do begin while j > 0 do begin
dec(j); dec(j);
FldInf := FoldView.FoldProvider.FoldOpenInfo(i, j); FldInf := FoldView.FoldProvider.FoldOpenInfo(i, j);
if (TPascalCodeFoldBlockType(PtrUInt(FldInf.FoldType)) in if (TPascalCodeFoldBlockType({%H-}PtrUInt(FldInf.FoldType)) in
[cfbtAnsiComment, cfbtBorCommand, cfbtSlashComment]) and [cfbtAnsiComment, cfbtBorCommand, cfbtSlashComment]) and
(sfaFoldFold in FldInf.FoldAction) (sfaFoldFold in FldInf.FoldAction)
then begin then begin
@ -1476,7 +1476,7 @@ begin
while j > 0 do begin while j > 0 do begin
dec(j); dec(j);
FldInf := FoldView.FoldProvider.FoldOpenInfo(i, j); FldInf := FoldView.FoldProvider.FoldOpenInfo(i, j);
if (TPascalCodeFoldBlockType(PtrUInt(FldInf.FoldType)) in if (TPascalCodeFoldBlockType({%H-}PtrUInt(FldInf.FoldType)) in
[cfbtAnsiComment, cfbtBorCommand, cfbtSlashComment]) and [cfbtAnsiComment, cfbtBorCommand, cfbtSlashComment]) and
(sfaFoldHide in FldInf.FoldAction) (sfaFoldHide in FldInf.FoldAction)
then begin then begin
@ -1539,7 +1539,7 @@ begin
j := FoldView.FoldProvider.FoldOpenCount(i); j := FoldView.FoldProvider.FoldOpenCount(i);
while j > 0 do begin while j > 0 do begin
dec(j); dec(j);
ft := TPascalCodeFoldBlockType(PtrUInt(FoldView.FoldProvider.FoldOpenInfo(i, j).FoldType)); ft := TPascalCodeFoldBlockType({%H-}PtrUInt(FoldView.FoldProvider.FoldOpenInfo(i, j).FoldType));
if ((ft in Foldable) or (ft in HideAble)) and FoldView.IsFoldedAtTextIndex(i,j) then if ((ft in Foldable) or (ft in HideAble)) and FoldView.IsFoldedAtTextIndex(i,j) then
HasCollapsedComments := True HasCollapsedComments := True
else begin else begin

14
ide/transfermacros.pp
View File

@ -87,13 +87,13 @@ type
procedure SetItems(Index: integer; NewMacro: TTransferMacro); procedure SetItems(Index: integer; NewMacro: TTransferMacro);
procedure SetMarkUnhandledMacros(const AValue: boolean); procedure SetMarkUnhandledMacros(const AValue: boolean);
protected protected
function MF_Ext(const Filename:string; const Data: PtrInt; var Abort: boolean):string; virtual; function MF_Ext(const Filename:string; const {%H-}Data: PtrInt; var {%H-}Abort: boolean):string; virtual;
function MF_Path(const Filename:string; const Data: PtrInt; var Abort: boolean):string; virtual; function MF_Path(const Filename:string; const {%H-}Data: PtrInt; var {%H-}Abort: boolean):string; virtual;
function MF_Name(const Filename:string; const Data: PtrInt; var Abort: boolean):string; virtual; function MF_Name(const Filename:string; const {%H-}Data: PtrInt; var {%H-}Abort: boolean):string; virtual;
function MF_NameOnly(const Filename:string; const Data: PtrInt; var Abort: boolean):string; virtual; function MF_NameOnly(const Filename:string; const {%H-}Data: PtrInt; var {%H-}Abort: boolean):string; virtual;
function MF_MakeDir(const Filename:string; const Data: PtrInt; var Abort: boolean):string; virtual; function MF_MakeDir(const Filename:string; const {%H-}Data: PtrInt; var {%H-}Abort: boolean):string; virtual;
function MF_MakeFile(const Filename:string; const Data: PtrInt; var Abort: boolean):string; virtual; function MF_MakeFile(const Filename:string; const {%H-}Data: PtrInt; var {%H-}Abort: boolean):string; virtual;
function MF_Trim(const Filename:string; const Data: PtrInt; var Abort: boolean):string; virtual; function MF_Trim(const Filename:string; const {%H-}Data: PtrInt; var {%H-}Abort: boolean):string; virtual;
procedure DoSubstitution(TheMacro: TTransferMacro; const MacroName: string; procedure DoSubstitution(TheMacro: TTransferMacro; const MacroName: string;
var s:string; const Data: PtrInt; var Handled, Abort: boolean; var s:string; const Data: PtrInt; var Handled, Abort: boolean;
Depth: integer); virtual; Depth: integer); virtual;