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

Qt: renamed TQtFont Widget: QFontH to FHandle: QFontH, also TQtFontMetrics Widget: QFontMetricsH to FHandle: QFontMetricsH

Browse Source 
git-svn-id: trunk@33289 -
This commit is contained in:
zeljko 2011-11-04 10:31:30 +00:00
parent 121b0d4e52
commit 7a3d27f62c
6 changed files with 67 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lcl/interfaces/qt/qtlclintf.inc
View File

@ -341,7 +341,7 @@ begin
Result := IsValidGDIObject(Font); Result := IsValidGDIObject(Font);
if Result then if Result then
begin begin
QtFontInfo := QFontInfo_create(TQtFont(Font).Widget); QtFontInfo := QFontInfo_create(TQtFont(Font).FHandle);
try try
Result := QFontInfo_fixedPitch(QtFontInfo); Result := QFontInfo_fixedPitch(QtFontInfo);
finally finally

2
lcl/interfaces/qt/qtobject.inc
View File

@ -956,7 +956,7 @@ var
begin begin
QtFont := TQtFont.Create(True); QtFont := TQtFont.Create(True);
QtFont.FShared := True; QtFont.FShared := True;
QApplication_font(QtFont.Widget); QApplication_font(QtFont.FHandle);
Result := HFONT(QtFont); Result := HFONT(QtFont);
end; end;

123
lcl/interfaces/qt/qtobjects.pas
View File

@ -175,7 +175,7 @@ type
function GetMetrics: TQtFontMetrics; function GetMetrics: TQtFontMetrics;
function GetDefaultFont: QFontH; function GetDefaultFont: QFontH;
public public
Widget: QFontH; FHandle: QFontH;
Angle: Integer; Angle: Integer;
public public
constructor Create(CreateHandle: Boolean); virtual; constructor Create(CreateHandle: Boolean); virtual;
@ -214,7 +214,7 @@ type
TQtFontMetrics = class(TObject) TQtFontMetrics = class(TObject)
private private
public public
Widget: QFontMetricsH; FHandle: QFontMetricsH;
public public
constructor Create(Parent: QFontH); virtual; constructor Create(Parent: QFontH); virtual;
destructor Destroy; override; destructor Destroy; override;
@ -1403,18 +1403,18 @@ function TQtFont.GetMetrics: TQtFontMetrics;
begin begin
if FMetrics = nil then if FMetrics = nil then
begin begin
if Widget = nil then if FHandle = nil then
FMetrics := TQtFontMetrics.Create(getDefaultFont) FMetrics := TQtFontMetrics.Create(getDefaultFont)
else else
FMetrics := TQtFontMetrics.Create(Widget); FMetrics := TQtFontMetrics.Create(FHandle);
end; end;
Result := FMetrics; Result := FMetrics;
end; end;
function TQtFont.GetFontInfo: TQtFontInfo; function TQtFont.GetFontInfo: TQtFontInfo;
begin begin
if not Assigned(FFontInfo) and Assigned(Widget) then if not Assigned(FFontInfo) and Assigned(FHandle) then
FFontInfo := TQtFontInfo.Create(Widget); FFontInfo := TQtFontInfo.Create(FHandle);
Result := FFontInfo; Result := FFontInfo;
end; end;
@ -1446,9 +1446,9 @@ begin
{$endif} {$endif}
if CreateHandle then if CreateHandle then
Widget := QFont_create FHandle := QFont_create
else else
Widget := nil; FHandle := nil;
FShared := False; FShared := False;
FMetrics := nil; FMetrics := nil;
@ -1462,7 +1462,7 @@ begin
WriteLn('TQtFont.Create AFromFont: ', dbgs(AFromFont)); WriteLn('TQtFont.Create AFromFont: ', dbgs(AFromFont));
{$endif} {$endif}
Widget := QFont_create(AFromFont); FHandle := QFont_create(AFromFont);
FShared := False; FShared := False;
FMetrics := nil; FMetrics := nil;
FDefaultFont := nil; FDefaultFont := nil;
@ -1486,8 +1486,8 @@ begin
if FFontInfo <> nil then if FFontInfo <> nil then
FFontInfo.Free; FFontInfo.Free;
if not FShared and (Widget <> nil) then if not FShared and (FHandle <> nil) then
QFont_destroy(Widget); QFont_destroy(FHandle);
if FDefaultFont <> nil then if FDefaultFont <> nil then
QFont_destroy(FDefaultFont); QFont_destroy(FDefaultFont);
@ -1497,111 +1497,111 @@ end;
function TQtFont.getPointSize: Integer; function TQtFont.getPointSize: Integer;
begin begin
if Widget = nil then if FHandle = nil then
Result := QFont_pointSize(getDefaultFont) Result := QFont_pointSize(getDefaultFont)
else else
Result := QFont_pointSize(Widget); Result := QFont_pointSize(FHandle);
end; end;
procedure TQtFont.setPointSize(p1: Integer); procedure TQtFont.setPointSize(p1: Integer);
begin begin
if p1 > 0 then if p1 > 0 then
QFont_setPointSize(Widget, p1); QFont_setPointSize(FHandle, p1);
end; end;
function TQtFont.getPixelSize: Integer; function TQtFont.getPixelSize: Integer;
begin begin
if Widget = nil then if FHandle = nil then
Result := QFont_pixelSize(getDefaultFont) Result := QFont_pixelSize(getDefaultFont)
else else
Result := QFont_pixelSize(Widget); Result := QFont_pixelSize(FHandle);
end; end;
procedure TQtFont.setPixelSize(p1: Integer); procedure TQtFont.setPixelSize(p1: Integer);
begin begin
if p1 > 0 then if p1 > 0 then
QFont_setPixelSize(Widget, p1); QFont_setPixelSize(FHandle, p1);
end; end;
function TQtFont.getWeight: Integer; function TQtFont.getWeight: Integer;
begin begin
if Widget = nil then if FHandle = nil then
Result := QFont_weight(getDefaultFont) Result := QFont_weight(getDefaultFont)
else else
Result := QFont_weight(Widget); Result := QFont_weight(FHandle);
end; end;
function TQtFont.getItalic: Boolean; function TQtFont.getItalic: Boolean;
begin begin
if Widget = nil then if FHandle = nil then
Result := QFont_italic(getDefaultFont) Result := QFont_italic(getDefaultFont)
else else
Result := QFont_italic(Widget); Result := QFont_italic(FHandle);
end; end;
function TQtFont.getBold: Boolean; function TQtFont.getBold: Boolean;
begin begin
if Widget = nil then if FHandle = nil then
Result := QFont_bold(getDefaultFont) Result := QFont_bold(getDefaultFont)
else else
Result := QFont_bold(Widget); Result := QFont_bold(FHandle);
end; end;
function TQtFont.getUnderline: Boolean; function TQtFont.getUnderline: Boolean;
begin begin
if Widget = nil then if FHandle = nil then
Result := QFont_underline(getDefaultFont) Result := QFont_underline(getDefaultFont)
else else
Result := QFont_underline(Widget); Result := QFont_underline(FHandle);
end; end;
function TQtFont.getStrikeOut: Boolean; function TQtFont.getStrikeOut: Boolean;
begin begin
if Widget = nil then if FHandle = nil then
Result := QFont_strikeOut(getDefaultFont) Result := QFont_strikeOut(getDefaultFont)
else else
Result := QFont_strikeOut(Widget); Result := QFont_strikeOut(FHandle);
end; end;
function TQtFont.getFamily: WideString; function TQtFont.getFamily: WideString;
begin begin
if Widget = nil then if FHandle = nil then
QFont_family(getDefaultFont, @Result) QFont_family(getDefaultFont, @Result)
else else
QFont_family(Widget, @Result); QFont_family(FHandle, @Result);
end; end;
function TQtFont.getStyleStategy: QFontStyleStrategy; function TQtFont.getStyleStategy: QFontStyleStrategy;
begin begin
if Widget = nil then if FHandle = nil then
Result := QFont_styleStrategy(getDefaultFont) Result := QFont_styleStrategy(getDefaultFont)
else else
Result := QFont_styleStrategy(Widget); Result := QFont_styleStrategy(FHandle);
end; end;
procedure TQtFont.setWeight(p1: Integer); procedure TQtFont.setWeight(p1: Integer);
begin begin
QFont_setWeight(Widget, p1); QFont_setWeight(FHandle, p1);
end; end;
procedure TQtFont.setBold(p1: Boolean); procedure TQtFont.setBold(p1: Boolean);
begin begin
QFont_setBold(Widget, p1); QFont_setBold(FHandle, p1);
end; end;
procedure TQtFont.setItalic(b: Boolean); procedure TQtFont.setItalic(b: Boolean);
begin begin
QFont_setItalic(Widget, b); QFont_setItalic(FHandle, b);
end; end;
procedure TQtFont.setUnderline(p1: Boolean); procedure TQtFont.setUnderline(p1: Boolean);
begin begin
QFont_setUnderline(Widget, p1); QFont_setUnderline(FHandle, p1);
end; end;
procedure TQtFont.setStrikeOut(p1: Boolean); procedure TQtFont.setStrikeOut(p1: Boolean);
begin begin
QFont_setStrikeOut(Widget, p1); QFont_setStrikeOut(FHandle, p1);
end; end;
procedure TQtFont.setRawName(p1: string); procedure TQtFont.setRawName(p1: string);
@ -1610,7 +1610,7 @@ var
begin begin
Str := GetUtf8String(p1); Str := GetUtf8String(p1);
QFont_setRawName(Widget, @Str); QFont_setRawName(FHandle, @Str);
end; end;
procedure TQtFont.setFamily(p1: string); procedure TQtFont.setFamily(p1: string);
@ -1619,99 +1619,100 @@ var
begin begin
Str := GetUtf8String(p1); Str := GetUtf8String(p1);
QFont_setFamily(Widget, @Str); QFont_setFamily(FHandle, @Str);
end; end;
procedure TQtFont.setStyleStrategy(s: QFontStyleStrategy); procedure TQtFont.setStyleStrategy(s: QFontStyleStrategy);
begin begin
QFont_setStyleStrategy(Widget, s); QFont_setStyleStrategy(FHandle, s);
end; end;
procedure TQtFont.family(retval: PWideString); procedure TQtFont.family(retval: PWideString);
begin begin
if Widget = nil then if FHandle = nil then
QFont_family(getDefaultFont, retval) QFont_family(getDefaultFont, retval)
else else
QFont_family(Widget, retval); QFont_family(FHandle, retval);
end; end;
function TQtFont.fixedPitch: Boolean; function TQtFont.fixedPitch: Boolean;
begin begin
if Widget = nil then if FHandle = nil then
Result := QFont_fixedPitch(getDefaultFont) Result := QFont_fixedPitch(getDefaultFont)
else else
Result := QFont_fixedPitch(Widget); Result := QFont_fixedPitch(FHandle);
end; end;
{ TQtFontMetrics } { TQtFontMetrics }
constructor TQtFontMetrics.Create(Parent: QFontH); constructor TQtFontMetrics.Create(Parent: QFontH);
begin begin
Widget := QFontMetrics_create(Parent); FHandle := QFontMetrics_create(Parent);
end; end;
destructor TQtFontMetrics.Destroy; destructor TQtFontMetrics.Destroy;
begin begin
QFontMetrics_destroy(Widget); QFontMetrics_destroy(FHandle);
FHandle := nil;
inherited Destroy; inherited Destroy;
end; end;
function TQtFontMetrics.height: Integer; function TQtFontMetrics.height: Integer;
begin begin
Result := QFontMetrics_height(Widget); Result := QFontMetrics_height(FHandle);
end; end;
function TQtFontMetrics.width(p1: PWideString): Integer; function TQtFontMetrics.width(p1: PWideString): Integer;
begin begin
Result := QFontMetrics_width(Widget, p1); Result := QFontMetrics_width(FHandle, p1);
end; end;
function TQtFontMetrics.width(p1: PWideString; ALen: Integer): Integer; function TQtFontMetrics.width(p1: PWideString; ALen: Integer): Integer;
begin begin
Result := QFontMetrics_width(Widget, p1, ALen); Result := QFontMetrics_width(FHandle, p1, ALen);
end; end;
function TQtFontMetrics.ascent: Integer; function TQtFontMetrics.ascent: Integer;
begin begin
Result := QFontMetrics_ascent(Widget); Result := QFontMetrics_ascent(FHandle);
end; end;
function TQtFontMetrics.descent: Integer; function TQtFontMetrics.descent: Integer;
begin begin
Result := QFontMetrics_descent(Widget); Result := QFontMetrics_descent(FHandle);
end; end;
function TQtFontMetrics.leading: Integer; function TQtFontMetrics.leading: Integer;
begin begin
Result := QFontMetrics_leading(Widget); Result := QFontMetrics_leading(FHandle);
end; end;
function TQtFontMetrics.maxWidth: Integer; function TQtFontMetrics.maxWidth: Integer;
begin begin
Result := QFontMetrics_maxWidth(Widget); Result := QFontMetrics_maxWidth(FHandle);
end; end;
procedure TQtFontMetrics.boundingRect(retval: PRect; r: PRect; flags: Integer; text: PWideString; tabstops: Integer = 0; tabarray: PInteger = nil); procedure TQtFontMetrics.boundingRect(retval: PRect; r: PRect; flags: Integer; text: PWideString; tabstops: Integer = 0; tabarray: PInteger = nil);
begin begin
QFontMetrics_boundingRect(Widget, retval, r, flags, text, tabstops, tabarray); QFontMetrics_boundingRect(FHandle, retval, r, flags, text, tabstops, tabarray);
end; end;
function TQtFontMetrics.charWidth(str: WideString; pos: Integer): Integer; function TQtFontMetrics.charWidth(str: WideString; pos: Integer): Integer;
begin begin
Result := QFontMetrics_charWidth(Widget, @str, pos); Result := QFontMetrics_charWidth(FHandle, @str, pos);
end; end;
function TQtFontMetrics.averageCharWidth: Integer; function TQtFontMetrics.averageCharWidth: Integer;
begin begin
Result := QFontMetrics_averageCharWidth(Widget); Result := QFontMetrics_averageCharWidth(FHandle);
end; end;
function TQtFontMetrics.elidedText(const AText: WideString; function TQtFontMetrics.elidedText(const AText: WideString;
const AMode: QtTextElideMode; const AWidth: Integer; const AMode: QtTextElideMode; const AWidth: Integer;
const AFlags: Integer = 0): WideString; const AFlags: Integer = 0): WideString;
begin begin
QFontMetrics_elidedText(Widget, @Result, @AText, AMode, AWidth, AFlags); QFontMetrics_elidedText(FHandle, @Result, @AText, AMode, AWidth, AFlags);
end; end;
{ TQtBrush } { TQtBrush }
@ -2914,8 +2915,8 @@ begin
begin begin
if vFont <> nil then if vFont <> nil then
begin begin
if vFont.Widget <> nil then if vFont.FHandle <> nil then
QFont_destroy(vFont.Widget); QFont_destroy(vFont.FHandle);
end; end;
Result := vFont; Result := vFont;
end end
@ -2936,14 +2937,14 @@ begin
Write('TQtDeviceContext.setFont() '); Write('TQtDeviceContext.setFont() ');
{$endif} {$endif}
SelFont := AFont; SelFont := AFont;
if (AFont.Widget <> nil) and (Widget <> nil) then if (AFont.FHandle <> nil) and (Widget <> nil) then
begin begin
if not FOwnPainter then if not FOwnPainter then
begin begin
QFnt := QPainter_font(Widget); QFnt := QPainter_font(Widget);
AssignQtFont(AFont.Widget, QFnt); AssignQtFont(AFont.FHandle, QFnt);
end else end else
QPainter_setFont(Widget, QFontH(AFont.Widget)); QPainter_setFont(Widget, QFontH(AFont.FHandle));
vFont.Angle := AFont.Angle; vFont.Angle := AFont.Angle;
end; end;
end; end;

2
lcl/interfaces/qt/qtwinapi.inc
View File

@ -4053,7 +4053,7 @@ begin
MaxCount^ := 0; MaxCount^ := 0;
for i := 0 to Count - 1 do for i := 0 to Count - 1 do
begin begin
w := QFontMetrics_charWidth(Font.Metrics.Widget, @AStr, i); w := QFontMetrics_charWidth(Font.Metrics.FHandle, @AStr, i);
Inc(Size.cx, w); Inc(Size.cx, w);
if MaxCount <> nil then if MaxCount <> nil then
begin begin

2
lcl/interfaces/qt/qtwscontrols.pp
View File

@ -575,7 +575,7 @@ begin
Exit; Exit;
QtWidget := TQtWidget(AWinControl.Handle); QtWidget := TQtWidget(AWinControl.Handle);
QtWidget.setFont(TQtFont(AFont.Reference.Handle).Widget); QtWidget.setFont(TQtFont(AFont.Reference.Handle).FHandle);
// tscrollbar, ttrackbar etc. // tscrollbar, ttrackbar etc.
if not QtWidget.CanChangeFontColor then if not QtWidget.CanChangeFontColor then

2
lcl/interfaces/qt/qtwsdialogs.pp
View File

@ -730,7 +730,7 @@ begin
{------------------------------------------------------------------------------ {------------------------------------------------------------------------------
Code to call the dialog Code to call the dialog
------------------------------------------------------------------------------} ------------------------------------------------------------------------------}
CurrentFont := TQtFont(TFontDialog(ACommonDialog).Font.Reference.Handle).Widget; CurrentFont := TQtFont(TFontDialog(ACommonDialog).Font.Reference.Handle).FHandle;
ReturnFont := QFont_create; ReturnFont := QFont_create;
try try