paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-12-08 20:47:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

LCL, fix QT compile with FPC trunk, works also with FPC fixes

Browse Source 
git-svn-id: trunk@40512 -
This commit is contained in:
jesus 2013-03-08 05:57:36 +00:00
parent d9e6ef063f
commit 39be94eb13
6 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lcl/interfaces/qt/qt45.pas
View File

@ -9150,10 +9150,10 @@ type
QListWidgetItemType = 0,
QListWidgetItemUserType = 1000 );
function QListWidgetItem_create(view: QListWidgetH = nil; _type: Integer = QListWidgetItemType): QListWidgetItemH; cdecl; external Qt4PasLib name 'QListWidgetItem_create';
function QListWidgetItem_create(view: QListWidgetH = nil; _type: QListWidgetItemItemType = QListWidgetItemType): QListWidgetItemH; cdecl; external Qt4PasLib name 'QListWidgetItem_create';
procedure QListWidgetItem_destroy(handle: QListWidgetItemH); cdecl; external Qt4PasLib name 'QListWidgetItem_destroy';
function QListWidgetItem_create(text: PWideString; view: QListWidgetH = nil; _type: Integer = QListWidgetItemType): QListWidgetItemH; cdecl; external Qt4PasLib name 'QListWidgetItem_create2';
function QListWidgetItem_create(icon: QIconH; text: PWideString; view: QListWidgetH = nil; _type: Integer = QListWidgetItemType): QListWidgetItemH; cdecl; external Qt4PasLib name 'QListWidgetItem_create3';
function QListWidgetItem_create(text: PWideString; view: QListWidgetH = nil; _type: QListWidgetItemItemType = QListWidgetItemType): QListWidgetItemH; cdecl; external Qt4PasLib name 'QListWidgetItem_create2';
function QListWidgetItem_create(icon: QIconH; text: PWideString; view: QListWidgetH = nil; _type: QListWidgetItemItemType = QListWidgetItemType): QListWidgetItemH; cdecl; external Qt4PasLib name 'QListWidgetItem_create3';
function QListWidgetItem_create(other: QListWidgetItemH): QListWidgetItemH; cdecl; external Qt4PasLib name 'QListWidgetItem_create4';
function QListWidgetItem_clone(handle: QListWidgetItemH): QListWidgetItemH; cdecl; external Qt4PasLib name 'QListWidgetItem_clone';
function QListWidgetItem_listWidget(handle: QListWidgetItemH): QListWidgetH; cdecl; external Qt4PasLib name 'QListWidgetItem_listWidget';
@ -9326,15 +9326,15 @@ type
QTreeWidgetItemType = 0,
QTreeWidgetItemUserType = 1000 );
function QTreeWidgetItem_create(_type: Integer = QTreeWidgetItemType): QTreeWidgetItemH; cdecl; external Qt4PasLib name 'QTreeWidgetItem_create';
function QTreeWidgetItem_create(_type: QTreeWidgetItemItemType = QTreeWidgetItemType): QTreeWidgetItemH; cdecl; external Qt4PasLib name 'QTreeWidgetItem_create';
procedure QTreeWidgetItem_destroy(handle: QTreeWidgetItemH); cdecl; external Qt4PasLib name 'QTreeWidgetItem_destroy';
function QTreeWidgetItem_create(strings: QStringListH; _type: Integer = QTreeWidgetItemType): QTreeWidgetItemH; cdecl; external Qt4PasLib name 'QTreeWidgetItem_create2';
function QTreeWidgetItem_create(view: QTreeWidgetH; _type: Integer = QTreeWidgetItemType): QTreeWidgetItemH; cdecl; external Qt4PasLib name 'QTreeWidgetItem_create3';
function QTreeWidgetItem_create(view: QTreeWidgetH; strings: QStringListH; _type: Integer = QTreeWidgetItemType): QTreeWidgetItemH; cdecl; external Qt4PasLib name 'QTreeWidgetItem_create4';
function QTreeWidgetItem_create(view: QTreeWidgetH; after: QTreeWidgetItemH; _type: Integer = QTreeWidgetItemType): QTreeWidgetItemH; cdecl; external Qt4PasLib name 'QTreeWidgetItem_create5';
function QTreeWidgetItem_create(parent: QTreeWidgetItemH; _type: Integer = QTreeWidgetItemType): QTreeWidgetItemH; cdecl; external Qt4PasLib name 'QTreeWidgetItem_create6';
function QTreeWidgetItem_create(parent: QTreeWidgetItemH; strings: QStringListH; _type: Integer = QTreeWidgetItemType): QTreeWidgetItemH; cdecl; external Qt4PasLib name 'QTreeWidgetItem_create7';
function QTreeWidgetItem_create(parent: QTreeWidgetItemH; after: QTreeWidgetItemH; _type: Integer = QTreeWidgetItemType): QTreeWidgetItemH; cdecl; external Qt4PasLib name 'QTreeWidgetItem_create8';
function QTreeWidgetItem_create(strings: QStringListH; _type: QTreeWidgetItemItemType = QTreeWidgetItemType): QTreeWidgetItemH; cdecl; external Qt4PasLib name 'QTreeWidgetItem_create2';
function QTreeWidgetItem_create(view: QTreeWidgetH; _type: QTreeWidgetItemItemType = QTreeWidgetItemType): QTreeWidgetItemH; cdecl; external Qt4PasLib name 'QTreeWidgetItem_create3';
function QTreeWidgetItem_create(view: QTreeWidgetH; strings: QStringListH; _type: QTreeWidgetItemItemType = QTreeWidgetItemType): QTreeWidgetItemH; cdecl; external Qt4PasLib name 'QTreeWidgetItem_create4';
function QTreeWidgetItem_create(view: QTreeWidgetH; after: QTreeWidgetItemH; _type: QTreeWidgetItemItemType = QTreeWidgetItemType): QTreeWidgetItemH; cdecl; external Qt4PasLib name 'QTreeWidgetItem_create5';
function QTreeWidgetItem_create(parent: QTreeWidgetItemH; _type: QTreeWidgetItemItemType = QTreeWidgetItemType): QTreeWidgetItemH; cdecl; external Qt4PasLib name 'QTreeWidgetItem_create6';
function QTreeWidgetItem_create(parent: QTreeWidgetItemH; strings: QStringListH; _type: QTreeWidgetItemItemType = QTreeWidgetItemType): QTreeWidgetItemH; cdecl; external Qt4PasLib name 'QTreeWidgetItem_create7';
function QTreeWidgetItem_create(parent: QTreeWidgetItemH; after: QTreeWidgetItemH; _type: QTreeWidgetItemItemType = QTreeWidgetItemType): QTreeWidgetItemH; cdecl; external Qt4PasLib name 'QTreeWidgetItem_create8';
function QTreeWidgetItem_create(other: QTreeWidgetItemH): QTreeWidgetItemH; cdecl; external Qt4PasLib name 'QTreeWidgetItem_create9';
function QTreeWidgetItem_clone(handle: QTreeWidgetItemH): QTreeWidgetItemH; cdecl; external Qt4PasLib name 'QTreeWidgetItem_clone';
function QTreeWidgetItem_treeWidget(handle: QTreeWidgetItemH): QTreeWidgetH; cdecl; external Qt4PasLib name 'QTreeWidgetItem_treeWidget';
@ -9819,10 +9819,10 @@ function QTableWidgetSelectionRange_rightColumn(handle: QTableWidgetSelectionRan
function QTableWidgetSelectionRange_rowCount(handle: QTableWidgetSelectionRangeH): Integer; cdecl; external Qt4PasLib name 'QTableWidgetSelectionRange_rowCount';
function QTableWidgetSelectionRange_columnCount(handle: QTableWidgetSelectionRangeH): Integer; cdecl; external Qt4PasLib name 'QTableWidgetSelectionRange_columnCount';
function QTableWidgetItem_create(_type: Integer = QTableWidgetItemType): QTableWidgetItemH; cdecl; external Qt4PasLib name 'QTableWidgetItem_create';
function QTableWidgetItem_create(_type: QTableWidgetItemItemType = QTableWidgetItemType): QTableWidgetItemH; cdecl; external Qt4PasLib name 'QTableWidgetItem_create';
procedure QTableWidgetItem_destroy(handle: QTableWidgetItemH); cdecl; external Qt4PasLib name 'QTableWidgetItem_destroy';
function QTableWidgetItem_create(text: PWideString; _type: Integer = QTableWidgetItemType): QTableWidgetItemH; cdecl; external Qt4PasLib name 'QTableWidgetItem_create2';
function QTableWidgetItem_create(icon: QIconH; text: PWideString; _type: Integer = QTableWidgetItemType): QTableWidgetItemH; cdecl; external Qt4PasLib name 'QTableWidgetItem_create3';
function QTableWidgetItem_create(text: PWideString; _type: QTableWidgetItemItemType = QTableWidgetItemType): QTableWidgetItemH; cdecl; external Qt4PasLib name 'QTableWidgetItem_create2';
function QTableWidgetItem_create(icon: QIconH; text: PWideString; _type: QTableWidgetItemItemType = QTableWidgetItemType): QTableWidgetItemH; cdecl; external Qt4PasLib name 'QTableWidgetItem_create3';
function QTableWidgetItem_create(other: QTableWidgetItemH): QTableWidgetItemH; cdecl; external Qt4PasLib name 'QTableWidgetItem_create4';
function QTableWidgetItem_clone(handle: QTableWidgetItemH): QTableWidgetItemH; cdecl; external Qt4PasLib name 'QTableWidgetItem_clone';
function QTableWidgetItem_tableWidget(handle: QTableWidgetItemH): QTableWidgetH; cdecl; external Qt4PasLib name 'QTableWidgetItem_tableWidget';
@ -11600,7 +11600,7 @@ procedure QStyleOption_fontMetrics(handle : QStyleOptionH; retval : QFontMetrics
procedure QStyleOption_setFontMetrics(handle : QStyleOptionH; fontMetrics : QFontMetricsH); cdecl; external Qt4PasLib name 'QStyleOption_setFontMetrics';
procedure QStyleOption_palette(handle : QStyleOptionH; retval : QPaletteH ); cdecl; external Qt4PasLib name 'QStyleOption_palette';
procedure QStyleOption_setPalette(handle : QStyleOptionH; palette : QPaletteH); cdecl; external Qt4PasLib name 'QStyleOption_setPalette';
function QStyleOption_create(version: Integer = QStyleOptionVersion; _type: Integer = QStyleOptionSO_Default): QStyleOptionH; cdecl; external Qt4PasLib name 'QStyleOption_create';
function QStyleOption_create(version: QStyleOptionStyleOptionVersion = QStyleOptionVersion; _type: QStyleOptionOptionType = QStyleOptionSO_Default): QStyleOptionH; cdecl; external Qt4PasLib name 'QStyleOption_create';
procedure QStyleOption_destroy(handle: QStyleOptionH); cdecl; external Qt4PasLib name 'QStyleOption_destroy';
function QStyleOption_create(other: QStyleOptionH): QStyleOptionH; cdecl; external Qt4PasLib name 'QStyleOption_create2';
procedure QStyleOption_init(handle: QStyleOptionH; w: QWidgetH); cdecl; external Qt4PasLib name 'QStyleOption_init';
@ -12047,7 +12047,7 @@ function QStyleHintReturn_version(handle : QStyleHintReturnH) : Integer; cdecl;
procedure QStyleHintReturn_setVersion(handle : QStyleHintReturnH; version : Integer); cdecl; external Qt4PasLib name 'QStyleHintReturn_setVersion';
function QStyleHintReturn__type(handle : QStyleHintReturnH) : Integer; cdecl; external Qt4PasLib name 'QStyleHintReturn__type';
procedure QStyleHintReturn_setType(handle : QStyleHintReturnH; _type : Integer); cdecl; external Qt4PasLib name 'QStyleHintReturn_setType';
function QStyleHintReturn_create(version: Integer = QStyleOptionVersion; _type: Integer = QStyleHintReturnSH_Default): QStyleHintReturnH; cdecl; external Qt4PasLib name 'QStyleHintReturn_create';
function QStyleHintReturn_create(version: QStyleOptionStyleOptionVersion = QStyleOptionVersion; _type: QStyleHintReturnHintReturnType = QStyleHintReturnSH_Default): QStyleHintReturnH; cdecl; external Qt4PasLib name 'QStyleHintReturn_create';
procedure QStyleHintReturn_destroy(handle: QStyleHintReturnH); cdecl; external Qt4PasLib name 'QStyleHintReturn_destroy';
procedure QStyleHintReturnMask_region(handle : QStyleHintReturnMaskH; retval : QRegionH ); cdecl; external Qt4PasLib name 'QStyleHintReturnMask_region';

9
lcl/interfaces/qt/qtthemes.pas
View File

@ -297,8 +297,7 @@ begin
QStylePE_IndicatorBranch:
begin
opt := QStyleOption_create(Integer(QStyleOptionVersion),
Integer(QStyleOptionSO_Default));
opt := QStyleOption_create(QStyleOptionVersion, QStyleOptionSO_Default);
QStyleOption_setState(opt, StyleState);
if AViewPortPaint then
@ -324,7 +323,7 @@ begin
end;
end;
else
opt := QStyleOption_create(Integer(QStyleOptionVersion), Integer(QStyleOptionSO_Default));
opt := QStyleOption_create(QStyleOptionVersion, QStyleOptionSO_Default);
end;
QStyleOption_setState(opt, StyleState);
@ -335,7 +334,7 @@ begin
end;
qdvStandardPixmap:
begin
opt := QStyleOption_create(Integer(QStyleOptionVersion), Integer(QStyleOptionSO_Default));
opt := QStyleOption_create(QStyleOptionVersion, QStyleOptionSO_Default);
AIcon := QIcon_create();
QStyle_standardIcon(Style, AIcon, Element.StandardPixmap, opt);
QIcon_paint(AIcon, Context.Widget, ARect.Left, ARect.Top,
@ -648,7 +647,7 @@ begin
end;
end;
opt := QStyleOption_create(Integer(QStyleOptionVersion), Integer(QStyleOptionSO_Default));
opt := QStyleOption_create(QStyleOptionVersion, QStyleOptionSO_Default);
APixmap := QPixmap_create();
if StockID in [idButtonOk..idButtonShield] then
IconSize := GetPixelMetric(QStylePM_ButtonIconSize, opt, nil)

6
lcl/interfaces/qt/qtwidgets.pas
View File

@ -11331,7 +11331,7 @@ procedure TQtListWidget.insertItem(AIndex: Integer; AText: PWideString);
var
Item: QListWidgetItemH;
begin
Item := QListWidgetItem_create(AText, nil, 0);
Item := QListWidgetItem_create(AText, nil, QListWidgetItemType);
if Checkable then
QListWidgetItem_setCheckState(Item, QtUnChecked);
QListWidget_insertItem(QListWidgetH(Widget), AIndex, Item);
@ -12527,10 +12527,10 @@ begin
SetLength(Items, AValue);
for i := 0 to High(Items) do
begin
Item := QTreeWidgetItem_create(QTreeWidgetH(Widget), 0);
Item := QTreeWidgetItem_create(QTreeWidgetH(Widget), QTreeWidgetItemType);
for j := 0 to ColCount - 1 do
begin
ItemChild := QTreeWidgetItem_create(item, 0);
ItemChild := QTreeWidgetItem_create(item, QTreeWidgetItemType);
QTreeWidgetItem_addChild(item, ItemChild);
end;
Items[i] := PtrUInt(Item);

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

@ -1260,7 +1260,7 @@ var
if Element = QStylePE_CustomBase then
exit;
Opt := QStyleOption_create(1, 0);
Opt := QStyleOption_create(QStyleOptionVersion, QStyleOptionSO_Default);
QStyleOption_setRect(Opt, @Rect);
QStyleOption_setState(Opt, State);
QStyle_drawPrimitive(QApplication_style(), Element, Opt, Painter, Widget);

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

@ -114,7 +114,7 @@ begin
DC := TQtDeviceContext(ACanvas.Handle);
ARect := AArrow.ClientRect;
StyleOption := QStyleOption_create(1, integer(QStyleOptionSO_Default));
StyleOption := QStyleOption_create(QStyleOptionVersion, QStyleOptionSO_Default);
try
// I do not know the reason, but under windows down arrow size is very small
// and is not dependent on passed ARect.

4
lcl/interfaces/qt/qtwscomctrls.pp
View File

@ -792,7 +792,7 @@ begin
if QTreeWidgetItem_childCount(TWI) < (AIndex + 1) then
begin
TWIChild := QTreeWidgetItem_create(0);
TWIChild := QTreeWidgetItem_create(QTreeWidgetItemType);
QTreeWidgetItem_setFlags(TWIChild, QtItemIsEnabled);
QTreeWidgetItem_addChild(TWI, TWIChild);
Str := GetUtf8String(ALV.Column[AIndex].Caption);
@ -1423,7 +1423,7 @@ begin
end else
begin
QtTreeWidget := TQtTreeWidget(ALV.Handle);
TWI := QTreeWidgetItem_create(Integer(0));
TWI := QTreeWidgetItem_create(QTreeWidgetItemType);
if AItem.Caption <> '' then
Str := GetUtf8String(AItem.Caption)
else