paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-07 12:07:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

* remove old ifdefs

Browse Source 
git-svn-id: trunk@39642 -
This commit is contained in:
marco 2018-08-19 14:54:58 +00:00
parent 98f00acb06
commit 15fcd0ab61
6 changed files with 0 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
rtl/inc/typshrd.inc
View File

@ -200,45 +200,6 @@ begin
(L.Top = R.Top) and (L.Bottom = R.Bottom);
end;
{$IFDEF VER3_0_0}
class function TRect.Create(ALeft, ATop, ARight, ABottom: Longint): TRect;
begin
Result.Left := ALeft;
Result.Top := ATop;
Result.Right := ARight;
Result.Bottom := ABottom;
end;
class function TRect.Create(P1, P2: TPoint; Normalize: Boolean): TRect;
begin
Result.TopLeft := P1;
Result.BottomRight := P2;
if Normalize then
Result.NormalizeRect;
end;
class function TRect.Create(Origin: TPoint): TRect;
begin
Result.TopLeft := Origin;
Result.BottomRight := Origin;
end;
class function TRect.Create(Origin: TPoint; AWidth, AHeight: Longint): TRect;
begin
Result.TopLeft := Origin;
Result.Width := AWidth;
Result.Height := AHeight;
end;
class function TRect.Create(R: TRect; Normalize: Boolean): TRect;
begin
Result := R;
if Normalize then
Result.NormalizeRect;
end;
{$ELSE}
constructor TRect.Create(ALeft, ATop, ARight, ABottom: Longint);
begin
Left := ALeft;
@ -274,7 +235,6 @@ begin
if Normalize then
NormalizeRect;
end;
{$ENDIF}
function TRect.CenterPoint: TPoint;
begin

8
rtl/inc/typshrdh.inc
View File

@ -112,19 +112,11 @@
procedure setSize(AValue: TSize);
procedure setWidth (AValue: Longint);
public
{$IFDEF VER3_0_0}
class function Create(Origin: TPoint): TRect; static; // empty rect at given origin
class function Create(Origin: TPoint; AWidth, AHeight: Longint): TRect; static;
class function Create(ALeft, ATop, ARight, ABottom: Longint): TRect; static;
class function Create(P1, P2: TPoint; Normalize: Boolean = False): TRect; static;
class function Create(R: TRect; Normalize: Boolean = False): TRect; static;
{$ELSE}
constructor Create(Origin: TPoint); // empty rect at given origin
constructor Create(Origin: TPoint; AWidth, AHeight: Longint);
constructor Create(ALeft, ATop, ARight, ABottom: Longint);
constructor Create(P1, P2: TPoint; Normalize: Boolean = False);
constructor Create(R: TRect; Normalize: Boolean = False);
{$ENDIF}
class operator = (L, R: TRect): Boolean;
class operator <> (L, R: TRect): Boolean;
class operator + (L, R: TRect): TRect; // union

7
rtl/inc/ustrings.inc
View File

@ -599,11 +599,7 @@ end;
{$ifndef FPC_HAS_UCHAR_TO_SHORTSTR}
{$define FPC_HAS_UCHAR_TO_SHORTSTR}
{$ifdef VER2_6}
procedure fpc_UChar_To_ShortStr(out result : shortstring;const c : WideChar); compilerproc;
{$else}
function fpc_UChar_To_ShortStr(const c : WideChar): shortstring; compilerproc;
{$endif}
{
Converts a WideChar to a ShortString;
}
@ -959,9 +955,6 @@ Var
nl,lens, lena : SizeUInt;
begin
nl:=l;
{$IFDEF VER2_6}
nl:=nl*2;
{$ENDIF}
if (l>0) then
begin
if Pointer(S)=nil then

12
rtl/objpas/fgl.pp
View File

@ -1619,11 +1619,7 @@ begin
if Result then
AData := TData(inherited GetData(I)^)
else
{$IFDEF VER2_6}
FillChar(AData,SizeOf(TData),0);
{$ELSE}
AData := Default(TData);
{$ENDIF}
end;
procedure TFPGMap.AddOrSetData(const AKey: TKey; const AData: TData);
@ -1805,11 +1801,7 @@ begin
if Result then
AData := TData(inherited GetData(I)^)
else
{$IFDEF VER2_6}
FillChar(AData,SizeOf(TData),0);
{$ELSE}
AData := Default(TData);
{$ENDIF}
end;
procedure TFPGMapObject.AddOrSetData(const AKey: TKey; const AData: TData);
@ -1987,11 +1979,7 @@ begin
if Result then
AData := TData(inherited GetData(I)^)
else
{$IFDEF VER2_6}
FillChar(AData,SizeOf(TData),0);
{$ELSE}
AData := Default(TData);
{$ENDIF}
end;
procedure TFPGMapInterfacedObjectData.AddOrSetData(const AKey: TKey;

2
rtl/objpas/sysutils/sysutilh.inc
View File

@ -326,9 +326,7 @@ Type
{$i systhrdh.inc}
{ Type Helpers}
{$IFNDEF VER2_6}
{$i syshelph.inc}
{$ENDIF}
procedure FreeAndNil(var obj);
procedure FreeMemAndNil(var p);

2
rtl/objpas/sysutils/sysutils.inc
View File

@ -41,9 +41,7 @@
{$i varerror.inc}
{ Type helpers}
{$IFNDEF VER2_6}
{$i syshelp.inc}
{$ENDIF}
{$ifndef OS_FILEISREADONLY}
Function FileIsReadOnly(const FileName: RawByteString): Boolean;