replace NativeUInt and NativeInt with FreePascal style alias

This commit is contained in:
Basile Burg 2020-05-27 15:30:43 +02:00
parent 015bdd6062
commit 5c37dc198c
7 changed files with 15 additions and 15 deletions

View File

@ -39,7 +39,7 @@ type
fConfigs: TCollection; fConfigs: TCollection;
fSrcs: TStringList; fSrcs: TStringList;
fConfIx: Integer; fConfIx: Integer;
fUpdateCount: NativeInt; fUpdateCount: PtrInt;
fProjectSubject: TProjectSubject; fProjectSubject: TProjectSubject;
fRunner: TDexedProcess; fRunner: TDexedProcess;
fOutputFilename: string; fOutputFilename: string;
@ -222,7 +222,7 @@ end;
procedure TNativeProject.setOptsColl(value: TCollection); procedure TNativeProject.setOptsColl(value: TCollection);
var var
i: nativeInt; i: PtrInt;
begin begin
fConfigs.Assign(value); fConfigs.Assign(value);
for i:= 0 to fConfigs.Count-1 do for i:= 0 to fConfigs.Count-1 do
@ -286,7 +286,7 @@ procedure TNativeProject.customSaveToFile(const fname: string);
var var
oldAbs, newRel, oldBase: string; oldAbs, newRel, oldBase: string;
f: string; f: string;
i: NativeInt; i: PtrInt;
begin begin
beginUpdate; beginUpdate;
f := fname; f := fname;

View File

@ -406,7 +406,7 @@ end;
procedure TProjectConfigurationWidget.updateImperative; procedure TProjectConfigurationWidget.updateImperative;
var var
i: NativeInt; i: PtrInt;
begin begin
selConf.ItemIndex:= -1; selConf.ItemIndex:= -1;
selConf.Clear; selConf.Clear;

View File

@ -764,13 +764,13 @@ end;
function uniqueObjStr(const value: TObject): string; function uniqueObjStr(const value: TObject): string;
begin begin
{$PUSH}{$HINTS OFF}{$WARNINGS OFF}{$R-} {$PUSH}{$HINTS OFF}{$WARNINGS OFF}{$R-}
exit( format('%.8X',[NativeUint(value)])); exit( format('%.8X',[PtrUint(value)]));
{$POP} {$POP}
end; end;
function shortenPath(const path: string; thresh: Word = 60): string; function shortenPath(const path: string; thresh: Word = 60): string;
var var
i: NativeInt; i: PtrInt;
sepCnt: integer = 0; sepCnt: integer = 0;
drv: string; drv: string;
pth1: string; pth1: string;

View File

@ -11,7 +11,7 @@ object MainForm: TMainForm
OnDropFiles = FormDropFiles OnDropFiles = FormDropFiles
OnResize = FormResize OnResize = FormResize
ShowHint = True ShowHint = True
LCLVersion = '2.0.6.0' LCLVersion = '2.0.8.0'
object mainMenu: TMainMenu object mainMenu: TMainMenu
top = 1 top = 1
object MenuItem1: TMenuItem object MenuItem1: TMenuItem

View File

@ -400,7 +400,7 @@ type
fFirstTimeRun: boolean; fFirstTimeRun: boolean;
fMultidoc: IMultiDocHandler; fMultidoc: IMultiDocHandler;
fProcInputHandler: IProcInputHandler; fProcInputHandler: IProcInputHandler;
fUpdateCount: NativeInt; fUpdateCount: PtrInt;
fProj: ICommonProject; fProj: ICommonProject;
fFreeProj: ICommonProject; fFreeProj: ICommonProject;
fProjBeforeGroup: ICommonProject; fProjBeforeGroup: ICommonProject;

View File

@ -725,7 +725,7 @@ begin
exit; exit;
{$PUSH}{$WARNINGS OFF}{$HINTS OFF} {$PUSH}{$WARNINGS OFF}{$HINTS OFF}
line := NativeUInt(Tree.Selected.Data); line := PtrUInt(Tree.Selected.Data);
{$POP} {$POP}
fDoc.setFocus; fDoc.setFocus;
fDoc.CaretY := line; fDoc.CaretY := line;
@ -903,7 +903,7 @@ var
or (n.Parent = ndVar) then or (n.Parent = ndVar) then
continue; continue;
{$PUSH}{$WARNINGS OFF}{$HINTS OFF} {$PUSH}{$WARNINGS OFF}{$HINTS OFF}
j := NativeUInt(n.Data); j := PtrUint(n.Data);
{$POP} {$POP}
if j > target then if j > target then
continue; continue;

View File

@ -936,7 +936,7 @@ begin
Inc(fPos); Inc(fPos);
{$HINTS OFF} {$HINTS OFF}
if fPos < fList.Count then if fPos < fList.Count then
fMemo.CaretY := NativeInt(fList.Items[fPos]) fMemo.CaretY := PtrInt(fList.Items[fPos])
{$HINTS ON} {$HINTS ON}
else Dec(fPos); else Dec(fPos);
end; end;
@ -946,14 +946,14 @@ begin
Dec(fPos); Dec(fPos);
{$HINTS OFF} {$HINTS OFF}
if fPos > -1 then if fPos > -1 then
fMemo.CaretY := NativeInt(fList.Items[fPos]) fMemo.CaretY := PtrInt(fList.Items[fPos])
{$HINTS ON} {$HINTS ON}
else Inc(fPos); else Inc(fPos);
end; end;
procedure TSynMemoPositions.store; procedure TSynMemoPositions.store;
var var
delta: NativeInt; delta: PtrInt;
const const
thresh = 6; thresh = 6;
begin begin
@ -962,11 +962,11 @@ begin
{$HINTS OFF}{$WARNINGS OFF} {$HINTS OFF}{$WARNINGS OFF}
if fList.Count > 0 then if fList.Count > 0 then
begin begin
delta := fMemo.CaretY - NativeInt(fList.Items[fPos]); delta := fMemo.CaretY - PtrInt(fList.Items[fPos]);
if (delta > -thresh) and (delta < thresh) then if (delta > -thresh) and (delta < thresh) then
exit; exit;
end; end;
fList.Insert(0, Pointer(NativeInt(fMemo.CaretY))); fList.Insert(0, Pointer(PtrInt(fMemo.CaretY)));
{$POP} {$POP}
while fList.Count > fMax do while fList.Count > fMax do
fList.Delete(fList.Count-1); fList.Delete(fList.Count-1);