paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-26 17:21:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

LCL: TIdentToInt: var to out

Browse Source 
git-svn-id: trunk@33420 -
This commit is contained in:
mattias 2011-11-08 17:08:10 +00:00
parent 5db4db8822
commit 78e66fbc68
2 changed files with 14 additions and 14 deletions

24
lcl/graphics.pp
View File

@ -1896,10 +1896,10 @@ type
// Color / Identifier mapping
TGetColorStringProc = procedure(const s: AnsiString) of object;
function IdentEntry(Entry: Longint; var MapEntry: TIdentMapEntry): boolean;
function ColorToIdent(Color: Longint; var Ident: String): Boolean;
function IdentToColor(const Ident: string; var Color: Longint): Boolean;
function ColorIndex(Color: Longint; var Index: Integer): Boolean;
function IdentEntry(Entry: Longint; out MapEntry: TIdentMapEntry): boolean;
function ColorToIdent(Color: Longint; out Ident: String): Boolean;
function IdentToColor(const Ident: string; out Color: Longint): Boolean;
function ColorIndex(Color: Longint; out Index: Integer): Boolean;
function SysColorToSysColorIndex(Color: TColor): integer;
function ColorToRGB(Color: TColor): Longint;
function ColorToString(Color: TColor): AnsiString;
@ -1921,8 +1921,8 @@ function TColorToFPColor(const c: TColor): TFPColor; overload; // does not work
// fonts
procedure GetCharsetValues(Proc: TGetStrProc);
function CharsetToIdent(Charset: Longint; var Ident: string): Boolean;
function IdentToCharset(const Ident: string; var Charset: Longint): Boolean;
function CharsetToIdent(Charset: Longint; out Ident: string): Boolean;
function IdentToCharset(const Ident: string; out Charset: Longint): Boolean;
function GetFontData(Font: HFont): TFontData;
function GetDefFontCharSet: TFontCharSet;
@ -2466,7 +2466,7 @@ const
{$warnings on}
);
function IdentEntry(Entry: Longint; var MapEntry: TIdentMapEntry): boolean;
function IdentEntry(Entry: Longint; out MapEntry: TIdentMapEntry): boolean;
begin
Result := False;
if (Entry >= 0) and (Entry <= High(Colors)) then
@ -2476,17 +2476,17 @@ begin
end;
end;
function ColorToIdent(Color: Longint; var Ident: String): Boolean;
function ColorToIdent(Color: Longint; out Ident: String): Boolean;
begin
Result := IntToIdent(Color, Ident, Colors);
end;
function IdentToColor(const Ident: string; var Color: Longint): Boolean;
function IdentToColor(const Ident: string; out Color: Longint): Boolean;
begin
Result := IdentToInt(Ident, Color, Colors);
end;
function ColorIndex(Color: Longint; var Index: Integer): Boolean;
function ColorIndex(Color: Longint; out Index: Integer): Boolean;
var
i: integer;
begin
@ -2729,8 +2729,8 @@ end;
initialization
UpdateLock := TCriticalSection.Create;
OnGetSystemFont := @LocalGetSystemFont;
RegisterIntegerConsts(TypeInfo(TColor), @IdentToColor, @ColorToIdent);
RegisterIntegerConsts(TypeInfo(TFontCharset), @IdentToCharset, @CharsetToIdent);
RegisterIntegerConsts(TypeInfo(TColor), TIdentToInt(@IdentToColor), TIntToIdent(@ColorToIdent));
RegisterIntegerConsts(TypeInfo(TFontCharset), TIdentToInt(@IdentToCharset), TIntToIdent(@CharsetToIdent));
RegisterInterfaceInitializationHandler(@InterfaceInit);
RegisterInterfaceFinalizationHandler(@InterfaceFinal);

4
lcl/include/font.inc
View File

@ -128,12 +128,12 @@ begin
Proc(FontCharsets[I].Name);
end;
function CharsetToIdent(Charset: Longint; var Ident: string): Boolean;
function CharsetToIdent(Charset: Longint; out Ident: string): Boolean;
begin
Result := IntToIdent(Charset, Ident, FontCharsets);
end;
function IdentToCharset(const Ident: string; var Charset: Longint): Boolean;
function IdentToCharset(const Ident: string; out Charset: Longint): Boolean;
begin
Result := IdentToInt(Ident, CharSet, FontCharsets);
end;