mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-04-09 01:48:03 +02:00
Qt6: reduced string conversions.
This commit is contained in:
Željan Rikalo
parent
c630749f27
commit
36a99bdd26
@ -3048,7 +3048,7 @@ begin
|
||||
SetLength(Files, FilesList.Count);
|
||||
for i := 0 to High(Files) do
|
||||
begin
|
||||
WStr := GetUTF8String(FilesList.Strings[i]);
|
||||
WStr := FilesList{%H-}.Strings[i];
|
||||
Url := QUrl_create(@WStr);
|
||||
QUrl_toLocalFile(Url, @WStr);
|
||||
Files[i] := UTF16ToUTF8(WStr);
|
||||
@ -5734,11 +5734,8 @@ begin
|
||||
end;
|
||||
|
||||
function TQtWidget.GetStyleSheet: WideString;
|
||||
var
|
||||
WStr: WideString;
|
||||
begin
|
||||
QWidget_styleSheet(Widget, @WStr);
|
||||
Result := UTF16ToUTF8(WStr);
|
||||
QWidget_styleSheet(Widget, @Result);
|
||||
end;
|
||||
|
||||
{------------------------------------------------------------------------------
|
||||
@ -5819,11 +5816,8 @@ begin
|
||||
end;
|
||||
|
||||
procedure TQtWidget.SetStyleSheet(const AValue: WideString);
|
||||
var
|
||||
WStr: WideString;
|
||||
begin
|
||||
WStr := GetUTF8String(AValue);
|
||||
QWidget_setStyleSheet(Widget, @WStr);
|
||||
QWidget_setStyleSheet(Widget, @AValue);
|
||||
end;
|
||||
|
||||
procedure TQtWidget.SetWidget(const AValue: QWidgetH);
|
||||
@ -11340,7 +11334,7 @@ procedure TQtComboBox.insertItem(AIndex: Integer; AText: String);
|
||||
var
|
||||
Str: WideString;
|
||||
begin
|
||||
Str := GetUtf8String(AText);
|
||||
Str := {%H-}AText;
|
||||
insertItem(AIndex, @Str);
|
||||
end;
|
||||
|
||||
@ -11406,7 +11400,7 @@ var
|
||||
begin
|
||||
if (AIndex >= 0) and (AIndex < QComboBox_count(QComboBoxH(Widget))) then
|
||||
begin
|
||||
Str := GetUTF8String(AText);
|
||||
Str := {%H-}AText;
|
||||
QComboBox_setItemText(QComboBoxH(Widget), AIndex, @Str);
|
||||
{we must update our custom delegate}
|
||||
if (FDropList <> nil) and
|
||||
@ -12690,7 +12684,7 @@ begin
|
||||
end;
|
||||
end;
|
||||
|
||||
WStr := GetUTF8String(TCustomListViewHack(LCLObject).Items[TopItem].Caption);
|
||||
WStr := TCustomListViewHack(LCLObject){%H-}.Items[TopItem].Caption;
|
||||
|
||||
// reduce paint overhead by checking text
|
||||
v := QVariant_create();
|
||||
@ -13603,7 +13597,7 @@ procedure TQtListWidget.insertItem(AIndex: Integer; AText: String);
|
||||
var
|
||||
Str: WideString;
|
||||
begin
|
||||
Str := GetUtf8String(AText);
|
||||
Str := {%H-}AText;
|
||||
insertItem(AIndex, @Str);
|
||||
end;
|
||||
|
||||
@ -13756,7 +13750,7 @@ var
|
||||
Str: WideString;
|
||||
R: TRect;
|
||||
begin
|
||||
Str := GetUTF8String(AText);
|
||||
Str := {%H-}AText;
|
||||
if (AIndex >= 0) and (AIndex < rowCount) then
|
||||
begin
|
||||
Item := getItem(AIndex);
|
||||
@ -13778,7 +13772,7 @@ var
|
||||
Str: WideString;
|
||||
R: TRect;
|
||||
begin
|
||||
Str := GetUTF8String(AText);
|
||||
Str := {%H-}AText;
|
||||
if (AIndex >= 0) and (AIndex < rowCount) then
|
||||
begin
|
||||
Item := getItem(AIndex);
|
||||
@ -14824,7 +14818,7 @@ begin
|
||||
if (TopItem < 0) or (TopItem > TCustomListViewHack(LCLObject).Items.Count - 1) then
|
||||
continue;
|
||||
|
||||
WStr := GetUTF8String(TCustomListViewHack(LCLObject).Items[TopItem].Caption);
|
||||
WStr := TCustomListViewHack(LCLObject){%H-}.Items[TopItem].Caption;
|
||||
ASelected := TCustomListViewHack(LCLObject).Items[TopItem].Selected;
|
||||
|
||||
v := QVariant_create(PWideString(@WStr));
|
||||
@ -14946,7 +14940,7 @@ begin
|
||||
itemChild := QTreeWidgetItem_child(item, j);
|
||||
if itemChild <> nil then
|
||||
begin
|
||||
WStr := GetUTF8String(TCustomListViewHack(LCLObject).Items[TopItem].SubItems[j]);
|
||||
WStr := TCustomListViewHack(LCLObject){%H-}.Items[TopItem].SubItems[j];
|
||||
v := QVariant_create(PWideString(@WStr));
|
||||
v2 := QVariant_create;
|
||||
try
|
||||
@ -14966,7 +14960,7 @@ begin
|
||||
begin
|
||||
for j := 0 to TCustomListViewHack(LCLObject).Items[TopItem].SubItems.Count - 1 do
|
||||
begin
|
||||
WStr := GetUTF8String(TCustomListViewHack(LCLObject).Items[TopItem].SubItems[j]);
|
||||
WStr := TCustomListViewHack(LCLObject){%H-}.Items[TopItem].SubItems[j];
|
||||
v := QVariant_create(PWideString(@WStr));
|
||||
QTreeWidgetItem_setData(item, j + 1, Ord(QtDisplayRole), v);
|
||||
|
||||
@ -17483,7 +17477,7 @@ var
|
||||
WStr: WideString;
|
||||
begin
|
||||
inherited InitializeAccessibility;
|
||||
WStr := GetUtf8String(ClassName+':ViewPort');
|
||||
WStr := UTF8ToUTF16(ClassName+':ViewPort');
|
||||
QWidget_setAccessibleName(viewPortWidget, @WStr);
|
||||
end;
|
||||
|
||||
@ -19391,7 +19385,7 @@ begin
|
||||
try
|
||||
for i := 0 to AList.Count - 1 do
|
||||
begin
|
||||
WStr := GetUTF8String(AList.Strings[i]);
|
||||
WStr := AList{%H-}.Strings[i];
|
||||
QStringList_append(List, @WStr);
|
||||
end;
|
||||
QFileDialog_setHistory(QFileDialogH(Widget), List);
|
||||
@ -19704,11 +19698,11 @@ begin
|
||||
else
|
||||
ATitle := 'error file';
|
||||
if path <> nil then
|
||||
ATitle := Format('%d x %d x %d',[ASize.cx, ASize.cy, QPixmap_depth(APixmap)]);
|
||||
ATitle := {%H-}Format('%d x %d x %d',[ASize.cx, ASize.cy, QPixmap_depth(APixmap)]);
|
||||
QLabel_setText(FTextWidget, @ATitle);
|
||||
ATitle := ExtractFileName(path^);
|
||||
QWidget_setToolTip(FTextWidget, @ATitle);
|
||||
ATitle := ATitle + LineEnding + Format('w %d x h %d x %d',[ASize.cx, ASize.cy, QPixmap_depth(APixmap)]);
|
||||
ATitle := ATitle + LineEnding + {%H-}Format('w %d x h %d x %d',[ASize.cx, ASize.cy, QPixmap_depth(APixmap)]);
|
||||
QWidget_setToolTip(FPreviewWidget, @ATitle);
|
||||
ANewPixmap := QPixmap_create;
|
||||
// QPixmap_scaled(APixmap, ANewPixmap,
|
||||
@ -20039,35 +20033,23 @@ begin
|
||||
end;
|
||||
|
||||
procedure TQtMessageBox.setDetailText(const AValue: WideString);
|
||||
var
|
||||
Str: WideString;
|
||||
begin
|
||||
Str := GetUTF8String(AValue);
|
||||
QMessageBox_setDetailedText(QMessageBoxH(Widget), @Str);
|
||||
QMessageBox_setDetailedText(QMessageBoxH(Widget), @AValue);
|
||||
end;
|
||||
|
||||
function TQtMessageBox.getMessageStr: WideString;
|
||||
var
|
||||
Str: WideString;
|
||||
begin
|
||||
QMessageBox_text(QMessageBoxH(Widget), @Str);
|
||||
Result := UTF16ToUTF8(Str);
|
||||
QMessageBox_text(QMessageBoxH(Widget), @Result);
|
||||
end;
|
||||
|
||||
function TQtMessageBox.getDetailText: WideString;
|
||||
var
|
||||
Str: WideString;
|
||||
begin
|
||||
QMessageBox_detailedText(QMessageBoxH(Widget), @Str);
|
||||
Result := UTF16ToUTF8(Str);
|
||||
QMessageBox_detailedText(QMessageBoxH(Widget), @Result);
|
||||
end;
|
||||
|
||||
procedure TQtMessageBox.setMessageStr(const AValue: WideString);
|
||||
var
|
||||
Str: WideString;
|
||||
begin
|
||||
Str := GetUTF8String(AValue);
|
||||
QMessageBox_setText(QMessageBoxH(Widget), @Str);
|
||||
QMessageBox_setText(QMessageBoxH(Widget), @AValue);
|
||||
end;
|
||||
|
||||
procedure TQtMessageBox.setMsgBoxType(const AValue: QMessageBoxIcon);
|
||||
@ -20084,7 +20066,7 @@ procedure TQtMessageBox.setTitle(const AValue: WideString);
|
||||
begin
|
||||
if AValue <> FTitle then
|
||||
begin
|
||||
FTitle := GetUTF8String(AValue);
|
||||
FTitle := AValue;
|
||||
QMessageBox_setWindowTitle(QMessageBoxH(Widget), @FTitle);
|
||||
end;
|
||||
end;
|
||||
@ -20188,22 +20170,16 @@ end;
|
||||
|
||||
function TQtMessageBox.AddButton(ACaption: WideString; ABtnType: QMessageBoxStandardButton;
|
||||
AResult: Int64; const ADefaultBtn: Boolean; const AEscapeBtn: Boolean): QPushButtonH;
|
||||
var
|
||||
Str: WideString;
|
||||
begin
|
||||
Result := QMessageBox_addButton(QMessageBoxH(Widget), ABtnType);
|
||||
Str := GetUTF8String(ACaption);
|
||||
QAbstractButton_setText(Result, @Str);
|
||||
QAbstractButton_setText(Result, @ACaption);
|
||||
SetButtonProps(Result, AResult, ADefaultBtn, AEscapeBtn);
|
||||
end;
|
||||
|
||||
function TQtMessageBox.AddButton(ACaption: WideString; AResult: Int64; const ADefaultBtn: Boolean;
|
||||
const AEscapeBtn: Boolean): QPushButtonH;
|
||||
var
|
||||
Str: WideString;
|
||||
begin
|
||||
Str := GetUTF8String(ACaption);
|
||||
Result := QMessageBox_addButton(QMessageBoxH(Widget), @Str, QMessageBoxActionRole);
|
||||
Result := QMessageBox_addButton(QMessageBoxH(Widget), @ACaption, QMessageBoxActionRole);
|
||||
SetButtonProps(Result, AResult, ADefaultBtn, AEscapeBtn);
|
||||
end;
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user