diff --git a/components/printers/qt/qtprinters.inc b/components/printers/qt/qtprinters.inc index 948adcb2b9..3d57fd5e61 100644 --- a/components/printers/qt/qtprinters.inc +++ b/components/printers/qt/qtprinters.inc @@ -50,7 +50,7 @@ var PrnInfo: QPrinterInfoH; Prntr: QPrinterInfoH; PrnList: TPtrIntArray; - PrnName: UnicodeString; + PrnName: WideString; begin inherited DoEnumPrinters(Lst); @@ -352,7 +352,7 @@ end; procedure TQtPrinters.DoEnumPrinters(Lst: TStrings); var - Str: UnicodeString; + Str: WideString; i: Integer; begin {$IFDEF VERBOSE_QT_PRINTING} diff --git a/lcl/interfaces/qt/qt45.pas b/lcl/interfaces/qt/qt45.pas index 06d1646dbf..39243147a6 100644 --- a/lcl/interfaces/qt/qt45.pas +++ b/lcl/interfaces/qt/qt45.pas @@ -13989,14 +13989,14 @@ begin Dispose(S); end; -// UnicodeString Access from c-code -procedure CopyUnicodeToPWideString(Unicode: PWideChar; var S: UnicodeString; Len: Integer); cdecl; export; +// WideString Access from c-code +procedure CopyUnicodeToPWideString(Unicode: PWideChar; var S: WideString; Len: Integer); cdecl; export; begin SetString(S, Unicode, Len); end; -function UnicodeOfPWideString(var S: UnicodeString): PWideChar; cdecl; export; +function UnicodeOfPWideString(var S: WideString): PWideChar; cdecl; export; const cEmptyStr = ''; begin @@ -14006,7 +14006,7 @@ begin Result := PWideChar(Pointer(S)); end; -function LengthOfPWideString(var S: UnicodeString): Integer; cdecl; export; +function LengthOfPWideString(var S: WideString): Integer; cdecl; export; begin if @S <> nil then Result := Length(S) diff --git a/lcl/interfaces/qt/qtint.pp b/lcl/interfaces/qt/qtint.pp index d946f82af0..4cc942b47c 100644 --- a/lcl/interfaces/qt/qtint.pp +++ b/lcl/interfaces/qt/qtint.pp @@ -81,7 +81,7 @@ type FAppSaveSessionRequest: QApplication_hookH; // default application font name (FamilyName for "default" font) - FDefaultAppFontName: UnicodeString; + FDefaultAppFontName: WideString; FDockImage: QRubberBandH; FDragImageList: QWidgetH; @@ -186,7 +186,7 @@ type // application global actions (mainform mainmenu mnemonics Alt+XX) procedure ClearGlobalActions; procedure AddGlobalAction(AnAction: QActionH); - function ShortcutInGlobalActions(const AMnemonicText: UnicodeString; + function ShortcutInGlobalActions(const AMnemonicText: WideString; out AGlobalActionIndex: Integer): Boolean; procedure TriggerGlobalAction(const ActionIndex: Integer); @@ -211,7 +211,7 @@ type function GetWinKeyState(AKeyState: LongInt): SHORT; {$ENDIF} function CreateDefaultFont: HFONT; virtual; - function GetDefaultAppFontName: UnicodeString; + function GetDefaultAppFontName: WideString; function GetQtDefaultDC: HDC; virtual; procedure DeleteDefaultDC; virtual; procedure SetQtDefaultDC(Handle: HDC); virtual; diff --git a/lcl/interfaces/qt/qtobject.inc b/lcl/interfaces/qt/qtobject.inc index 28c40dee3f..4e602759c8 100644 --- a/lcl/interfaces/qt/qtobject.inc +++ b/lcl/interfaces/qt/qtobject.inc @@ -497,7 +497,7 @@ end; procedure TQtWidgetSet.AppSetTitle(const ATitle: string); var - W: UnicodeString; + W: WideString; begin W := {%H-}ATitle; QCoreApplication_setApplicationName(@W); @@ -625,7 +625,7 @@ var W: TQtMainWindow; LCLEvent: QLCLMessageEventH; ASequence: QKeySequenceH; - AKey: UnicodeString; + AKey: WideString; AParent: QWidgetH; R: TRect; AQtPoint: TQtPoint; @@ -639,7 +639,7 @@ var function IsSystemTrayWidget: boolean; var - AName: UnicodeString; + AName: WideString; AWidget: QWidgetH; RGeom: TRect; AFlags: QtWindowFlags; @@ -1565,13 +1565,13 @@ begin FGlobalActions.Add(AnAction); end; -function TQtWidgetSet.ShortcutInGlobalActions(const AMnemonicText: UnicodeString; +function TQtWidgetSet.ShortcutInGlobalActions(const AMnemonicText: WideString; out AGlobalActionIndex: Integer): Boolean; var NewKey: QKeySequenceH; - NewStr: UnicodeString; + NewStr: WideString; CurrentKey: QKeySequenceH; - CurrentStr: UnicodeString; + CurrentStr: WideString; Action: QActionH; i: Integer; begin @@ -1762,7 +1762,7 @@ begin Result := HFONT(QtFont); end; -function TQtWidgetSet.GetDefaultAppFontName: UnicodeString; +function TQtWidgetSet.GetDefaultAppFontName: WideString; begin Result := FDefaultAppFontName; end; @@ -1895,7 +1895,7 @@ function TQtWidgetSet.GetMenuHeight: Integer; var AMenuBar: QMenuBarH; DummyWindow: QMainWindowH; - DummyStr: UnicodeString; + DummyStr: WideString; Size: TSize; begin {$IFDEF DARWIN} @@ -2085,7 +2085,7 @@ end; function TQtWidgetSet.GetStyleName: String; var - WStr: UnicodeString; + WStr: WideString; begin QObject_objectName(QApplication_style, @WStr); Result := {%H-}WStr; diff --git a/lcl/interfaces/qt/qtobjects.pas b/lcl/interfaces/qt/qtobjects.pas index 8a4e21535b..983b47b626 100644 --- a/lcl/interfaces/qt/qtobjects.pas +++ b/lcl/interfaces/qt/qtobjects.pas @@ -95,8 +95,8 @@ type constructor Create(const AParent: QObjectH = nil); destructor Destroy; override; function addAction(action: QActionH): QActionH; overload; - function addAction(text: UnicodeString): QActionH; overload; - function addAction(icon: QIconH; text: UnicodeString): QActionH; overload; + function addAction(text: WideString): QActionH; overload; + function addAction(icon: QIconH; text: WideString): QActionH; overload; procedure removeAction(action: QActionH); function actions: TQActions; function checkedAction: QActionH; @@ -186,7 +186,7 @@ type function getBold: Boolean; function getUnderline: Boolean; function getStrikeOut: Boolean; - function getFamily: UnicodeString; + function getFamily: WideString; function getStyleStategy: QFontStyleStrategy; procedure setPointSize(p1: Integer); @@ -224,11 +224,11 @@ type function leading: Integer; function maxWidth: Integer; procedure boundingRect(retval: PRect; r: PRect; flags: Integer; text: PWideString; tabstops: Integer = 0; tabarray: PInteger = nil); - function charWidth(str: UnicodeString; pos: Integer): Integer; + function charWidth(str: WideString; pos: Integer): Integer; function averageCharWidth: Integer; - function elidedText(const AText: UnicodeString; + function elidedText(const AText: WideString; const AMode: QtTextElideMode; const AWidth: Integer; - const AFlags: Integer = 0): UnicodeString; + const AFlags: Integer = 0): WideString; end; { TQtFontInfo } @@ -237,7 +237,7 @@ type private function GetBold: Boolean; function GetExactMatch: Boolean; - function GetFamily: UnicodeString; + function GetFamily: WideString; function GetFixedPitch: Boolean; function GetFontStyle: QFontStyle; function GetFontStyleHint: QFontStyleHint; @@ -258,7 +258,7 @@ type property Bold: Boolean read GetBold; property Italic: Boolean read GetItalic; property ExactMatch: Boolean read GetExactMatch; - property Family: UnicodeString read GetFamily; + property Family: WideString read GetFamily; property FixedPitch: Boolean read GetFixedPitch; property Overline: Boolean read GetOverLine; property PointSize: Integer read GetPointSize; @@ -606,37 +606,37 @@ type function getPrinterContext: TQtDeviceContext; function getCollateCopies: Boolean; function getColorMode: QPrinterColorMode; - function getCreator: UnicodeString; + function getCreator: WideString; function getDevType: Integer; - function getDocName: UnicodeString; + function getDocName: WideString; function getDoubleSidedPrinting: Boolean; function getFontEmbedding: Boolean; function getFullPage: Boolean; function getOutputFormat: QPrinterOutputFormat; function getPaperSource: QPrinterPaperSource; - function getPrintProgram: UnicodeString; + function getPrintProgram: WideString; function getPrintRange: QPrinterPrintRange; procedure setCollateCopies(const AValue: Boolean); procedure setColorMode(const AValue: QPrinterColorMode); - procedure setCreator(const AValue: UnicodeString); - procedure setDocName(const AValue: UnicodeString); + procedure setCreator(const AValue: WideString); + procedure setDocName(const AValue: WideString); procedure setDoubleSidedPrinting(const AValue: Boolean); procedure SetDuplexMode(AValue: QPrinterDuplexMode); procedure setFontEmbedding(const AValue: Boolean); procedure setFullPage(const AValue: Boolean); procedure setOutputFormat(const AValue: QPrinterOutputFormat); procedure setPaperSource(const AValue: QPrinterPaperSource); - procedure setPrinterName(const AValue: UnicodeString); - function getPrinterName: UnicodeString; - procedure setOutputFileName(const AValue: UnicodeString); - function getOutputFileName: UnicodeString; + procedure setPrinterName(const AValue: WideString); + function getPrinterName: WideString; + procedure setOutputFileName(const AValue: WideString); + function getOutputFileName: WideString; procedure setOrientation(const AValue: QPrinterOrientation); function getOrientation: QPrinterOrientation; procedure setPageSize(const AValue: QPrinterPageSize); function getPageSize: QPrinterPageSize; procedure setPageOrder(const AValue: QPrinterPageOrder); function getPageOrder: QPrinterPageOrder; - procedure setPrintProgram(const AValue: UnicodeString); + procedure setPrintProgram(const AValue: WideString); procedure setPrintRange(const AValue: QPrinterPrintRange); procedure setResolution(const AValue: Integer); function getResolution: Integer; @@ -648,7 +648,7 @@ type constructor Create(AMode: QPrinterPrinterMode); virtual; overload; destructor Destroy; override; - function DefaultPrinter: UnicodeString; + function DefaultPrinter: WideString; function GetAvailablePrinters(Lst: TStrings): Boolean; procedure beginDoc; @@ -671,9 +671,9 @@ type property Collate: Boolean read getCollateCopies write setCollateCopies; property ColorMode: QPrinterColorMode read getColorMode write setColorMode; - property Creator: UnicodeString read getCreator write setCreator; + property Creator: WideString read getCreator write setCreator; property DeviceType: Integer read getDevType; - property DocName: UnicodeString read getDocName write setDocName; + property DocName: WideString read getDocName write setDocName; property DoubleSidedPrinting: Boolean read getDoubleSidedPrinting write setDoubleSidedPrinting; property Duplex: QPrinterDuplexMode read GetDuplexMode write SetDuplexMode; property FontEmbedding: Boolean read getFontEmbedding write setFontEmbedding; @@ -682,16 +682,16 @@ type property NumCopies: Integer read getNumCopies write setNumCopies; property Orientation: QPrinterOrientation read getOrientation write setOrientation; property OutputFormat: QPrinterOutputFormat read getOutputFormat write setOutputFormat; - property OutputFileName: UnicodeString read getOutputFileName write setOutputFileName; + property OutputFileName: WideString read getOutputFileName write setOutputFileName; property PageOrder: QPrinterPageOrder read getPageOrder write setPageOrder; property PageSize: QPrinterPageSize read getPageSize write setPageSize; property PaperSource: QPrinterPaperSource read getPaperSource write setPaperSource; property PrinterContext: TQtDeviceContext read getPrinterContext; - property PrinterName: UnicodeString read getPrinterName write setPrinterName; + property PrinterName: WideString read getPrinterName write setPrinterName; property PrinterActive: Boolean read FPrinterActive; property PrintRange: QPrinterPrintRange read getPrintRange write setPrintRange; property PrinterState: QPrinterPrinterState read getPrinterState; - property PrintProgram: UnicodeString read getPrintProgram write setPrintProgram; + property PrintProgram: WideString read getPrintProgram write setPrintProgram; property Resolution: Integer read getResolution write setResolution; end; @@ -789,10 +789,10 @@ type constructor Create(AnObject: QObjectH); destructor Destroy; override; procedure DumpObject; - function findWidgetByName(const AName: UnicodeString): QWidgetH; + function findWidgetByName(const AName: WideString): QWidgetH; function IsWidget(AnObject: QObjectH): Boolean; - function GetObjectName(AnObject: QObjectH): UnicodeString; - function InheritsQtClass(AnObject: QObjectH; AQtClass: UnicodeString): Boolean; + function GetObjectName(AnObject: QObjectH): WideString; + function InheritsQtClass(AnObject: QObjectH; AQtClass: WideString): Boolean; property List: TStrings read FList; property ObjList: TFPList read FObjList; end; @@ -932,7 +932,7 @@ end; procedure AssignQtFont(FromFont: QFontH; ToFont: QFontH); var - FntFam: UnicodeString; + FntFam: WideString; begin QFont_family(FromFont, @FntFam); QFont_setFamily(ToFont, @FntFam); @@ -983,9 +983,9 @@ begin Result := QFontInfo_exactMatch(FHandle); end; -function TQtFontInfo.GetFamily: UnicodeString; +function TQtFontInfo.GetFamily: WideString; var - WStr: UnicodeString; + WStr: WideString; begin QFontInfo_family(FHandle, @WStr); Result := WStr; @@ -1632,7 +1632,7 @@ begin Result := QFont_strikeOut(FHandle); end; -function TQtFont.getFamily: UnicodeString; +function TQtFont.getFamily: WideString; begin if FHandle = nil then QFont_family(getDefaultFont, @Result) @@ -1675,7 +1675,7 @@ end; procedure TQtFont.setRawName(p1: string); var - Str: UnicodeString; + Str: WideString; begin Str := {%H-}p1; QFont_setRawName(FHandle, @Str); @@ -1683,7 +1683,7 @@ end; procedure TQtFont.setFamily(p1: string); var - Str: UnicodeString; + Str: WideString; begin Str := {%H-}p1; QFont_setFamily(FHandle, @Str); @@ -1765,7 +1765,7 @@ begin QFontMetrics_boundingRect(FHandle, retval, r, flags, text, tabstops, tabarray); end; -function TQtFontMetrics.charWidth(str: UnicodeString; pos: Integer): Integer; +function TQtFontMetrics.charWidth(str: WideString; pos: Integer): Integer; begin Result := QFontMetrics_charWidth(FHandle, @str, pos); end; @@ -1775,9 +1775,9 @@ begin Result := QFontMetrics_averageCharWidth(FHandle); end; -function TQtFontMetrics.elidedText(const AText: UnicodeString; +function TQtFontMetrics.elidedText(const AText: WideString; const AMode: QtTextElideMode; const AWidth: Integer; - const AFlags: Integer = 0): UnicodeString; + const AFlags: Integer = 0): WideString; begin QFontMetrics_elidedText(FHandle, @Result, @AText, AMode, AWidth, AFlags); end; @@ -3844,7 +3844,7 @@ end; procedure TQtClipboard.signalSelectionChanged; cdecl; var TempMimeData: QMimeDataH; - WStr: UnicodeString; + WStr: WideString; Clip: TClipBoard; begin {$IFDEF VERBOSE_QT_CLIPBOARD} @@ -3898,7 +3898,7 @@ end; function TQtClipboard.IsClipboardChanged: Boolean; var TempMimeData: QMimeDataH; - Str, Str2: UnicodeString; + Str, Str2: WideString; begin Result := not FLockClip; if FLockClip then @@ -3931,7 +3931,7 @@ var procedure PutSelectionOnClipBoard; var - MimeType: UnicodeString; + MimeType: WideString; MimeData: QMimeDataH; Data: QByteArrayH; DataStream: TMemoryStream; @@ -4049,7 +4049,7 @@ function TQtClipboard.GetData(ClipboardType: TClipboardType; FormatID: TClipboardFormat; Stream: TStream): boolean; var QtMimeData: QMimeDataH; - MimeType: UnicodeString; + MimeType: WideString; Data: QByteArrayH; p: PAnsiChar; s: Integer; @@ -4073,7 +4073,7 @@ var QtMimeData: QMimeDataH; QtList: QStringListH; i: Integer; - Str: UnicodeString; + Str: WideString; begin Result := False; Count := 0; @@ -4107,7 +4107,7 @@ function TQtClipboard.GetOwnerShip(ClipboardType: TClipboardType; procedure PutOnClipBoard; var - MimeType: UnicodeString; + MimeType: WideString; MimeData: QMimeDataH; Data: QByteArrayH; DataStream: TMemoryStream; @@ -4207,7 +4207,7 @@ begin end; {returns default system printer} -function TQtPrinter.DefaultPrinter: UnicodeString; +function TQtPrinter.DefaultPrinter: WideString; var PrnInfo: QPrinterInfoH; begin @@ -4224,7 +4224,7 @@ end; Default sys printer is always 1st in the list.} function TQtPrinter.GetAvailablePrinters(Lst: TStrings): Boolean; var - Str, PrnName: UnicodeString; + Str, PrnName: WideString; i: Integer; PrnInfo: QPrinterInfoH; Prntr: QPrinterInfoH; @@ -4299,9 +4299,9 @@ begin Result := QPrinter_colorMode(FHandle); end; -function TQtPrinter.getCreator: UnicodeString; +function TQtPrinter.getCreator: WideString; var - Str: UnicodeString; + Str: WideString; begin QPrinter_creator(FHandle, @Str); Result := Str; @@ -4312,9 +4312,9 @@ begin Result := QPrinter_devType(FHandle); end; -function TQtPrinter.getDocName: UnicodeString; +function TQtPrinter.getDocName: WideString; var - Str: UnicodeString; + Str: WideString; begin QPrinter_docName(FHandle, @Str); Result := Str; @@ -4355,9 +4355,9 @@ begin Result := QPrinter_paperSource(FHandle); end; -function TQtPrinter.getPrintProgram: UnicodeString; +function TQtPrinter.getPrintProgram: WideString; var - Str: UnicodeString; + Str: WideString; begin QPrinter_printProgram(FHandle, @Str); Result := Str; @@ -4378,17 +4378,17 @@ begin QPrinter_setColorMode(FHandle, AValue); end; -procedure TQtPrinter.setCreator(const AValue: UnicodeString); +procedure TQtPrinter.setCreator(const AValue: WideString); var - Str: UnicodeString; + Str: WideString; begin Str := AValue; QPrinter_setCreator(FHandle, @Str); end; -procedure TQtPrinter.setDocName(const AValue: UnicodeString); +procedure TQtPrinter.setDocName(const AValue: WideString); var - Str: UnicodeString; + Str: WideString; begin Str := AValue; QPrinter_setDocName(FHandle, @Str); @@ -4414,33 +4414,33 @@ begin QPrinter_setFullPage(FHandle, AValue); end; -procedure TQtPrinter.setPrinterName(const AValue: UnicodeString); +procedure TQtPrinter.setPrinterName(const AValue: WideString); var - Str: UnicodeString; + Str: WideString; begin Str := AValue; QPrinter_setPrinterName(FHandle, @Str); end; -function TQtPrinter.getPrinterName: UnicodeString; +function TQtPrinter.getPrinterName: WideString; var - Str: UnicodeString; + Str: WideString; begin QPrinter_printerName(FHandle, @Str); Result := Str; end; -procedure TQtPrinter.setOutputFileName(const AValue: UnicodeString); +procedure TQtPrinter.setOutputFileName(const AValue: WideString); var - Str: UnicodeString; + Str: WideString; begin Str := AValue; QPrinter_setOutputFileName(FHandle, @Str); end; -function TQtPrinter.getOutputFileName: UnicodeString; +function TQtPrinter.getOutputFileName: WideString; var - Str: UnicodeString; + Str: WideString; begin QPrinter_outputFileName(FHandle, @Str); Result := Str; @@ -4476,9 +4476,9 @@ begin Result := QPrinter_pageOrder(FHandle); end; -procedure TQtPrinter.setPrintProgram(const AValue: UnicodeString); +procedure TQtPrinter.setPrintProgram(const AValue: WideString); var - Str: UnicodeString; + Str: WideString; begin Str := AValue; QPrinter_setPrintProgram(FHandle, @Str); @@ -4729,7 +4729,7 @@ end; function TQtStringList.Get(Index: Integer): string; var - W: Unicodestring; + W: Widestring; begin QStringList_at(FHandle, @W, Index); Result := {%H-}W; @@ -4771,7 +4771,7 @@ end; procedure TQtStringList.Insert(Index: Integer; const S: string); var - W: UnicodeString; + W: WideString; begin W := {%H-}S; QStringList_insert(FHandle, Index, @W); @@ -4964,17 +4964,17 @@ begin Result := QActionGroup_addAction(FHandle, action); end; -function TQtActionGroup.addAction(text: UnicodeString): QActionH; +function TQtActionGroup.addAction(text: WideString): QActionH; var - WStr: UnicodeString; + WStr: WideString; begin WStr := text; Result := QActionGroup_addAction(FHandle, @WStr); end; -function TQtActionGroup.addAction(icon: QIconH; text: UnicodeString): QActionH; +function TQtActionGroup.addAction(icon: QIconH; text: WideString): QActionH; var - WStr: UnicodeString; + WStr: WideString; begin WStr := text; Result := QActionGroup_addAction(FHandle, icon, @WStr); @@ -5022,7 +5022,7 @@ end; procedure TQtObjectDump.AddToList(AnObject: QObjectH); // var -// ObjName: UnicodeString; +// ObjName: WideString; begin if AnObject <> nil then begin @@ -5043,10 +5043,10 @@ begin Iterator(FRoot); end; -function TQtObjectDump.findWidgetByName(const AName: UnicodeString): QWidgetH; +function TQtObjectDump.findWidgetByName(const AName: WideString): QWidgetH; var j: Integer; - WS: UnicodeString; + WS: WideString; begin Result := nil; if AName = '' then @@ -5070,7 +5070,7 @@ begin Result := False; end; -function TQtObjectDump.GetObjectName(AnObject: QObjectH): UnicodeString; +function TQtObjectDump.GetObjectName(AnObject: QObjectH): WideString; begin Result := ''; if AnObject = nil then @@ -5078,8 +5078,7 @@ begin QObject_objectName(AnObject, @Result); end; -function TQtObjectDump.InheritsQtClass(AnObject: QObjectH; - AQtClass: UnicodeString): Boolean; +function TQtObjectDump.InheritsQtClass(AnObject: QObjectH; AQtClass: WideString): Boolean; begin if (AnObject = nil) or (AQtClass = '') then Result := False diff --git a/lcl/interfaces/qt/qtpagecontrol.inc b/lcl/interfaces/qt/qtpagecontrol.inc index f6b8a00a9f..e45f971647 100644 --- a/lcl/interfaces/qt/qtpagecontrol.inc +++ b/lcl/interfaces/qt/qtpagecontrol.inc @@ -495,7 +495,7 @@ const FmtS = 'QTabBar::tab { height: %dpx; width: %dpx; }'; var ASize, ANewSize: TSize; - WS: UnicodeString; + WS: WideString; begin if not WSCheckHandleAllocated(ATabControl, 'SetTabSize') then Exit; diff --git a/lcl/interfaces/qt/qtprivate.pp b/lcl/interfaces/qt/qtprivate.pp index 48599e34d0..b2f95f27ce 100644 --- a/lcl/interfaces/qt/qtprivate.pp +++ b/lcl/interfaces/qt/qtprivate.pp @@ -98,7 +98,7 @@ type FHasTrailingLineBreak: Boolean; // Indicates whether lines have trailing line break FOwner: TWinControl; // Lazarus Control Owning MemoStrings procedure InternalUpdate; - procedure ExternalUpdate(var AStr: UnicodeString; + procedure ExternalUpdate(var AStr: WideString; AClear, ABlockSignals: Boolean); function GetInternalText: string; procedure SetInternalText(const Value: string); @@ -135,7 +135,7 @@ implementation ------------------------------------------------------------------------------} procedure TQtMemoStrings.InternalUpdate; var - W: UnicodeString; + W: WideString; TextEdit: TQtTextEdit; begin W := ''; @@ -160,10 +160,10 @@ end; Updates Qt Widget from text - If DelphiOnChange, generates OnChange Event ------------------------------------------------------------------------------} -procedure TQtMemoStrings.ExternalUpdate(var AStr: UnicodeString; +procedure TQtMemoStrings.ExternalUpdate(var AStr: WideString; AClear, ABlockSignals: Boolean); var - W: UnicodeString; + W: WideString; TextEdit: TQtTextEdit; begin if not FOwner.HandleAllocated then @@ -283,7 +283,7 @@ end; procedure TQtMemoStrings.SetTextStr(const Value: string); var - W: UnicodeString; + W: WideString; begin {$ifdef VerboseQtMemoStrings} WriteLn('TQtMemoStrings.SetTextStr Value=',Value); @@ -336,7 +336,7 @@ end; ------------------------------------------------------------------------------} procedure TQtMemoStrings.Assign(Source: TPersistent); var - W: UnicodeString; + W: WideString; begin if (Source=Self) or (Source=nil) then exit; @@ -414,7 +414,7 @@ end; ------------------------------------------------------------------------------} procedure TQtMemoStrings.Insert(Index: integer; const S: string); var - W: UnicodeString; + W: WideString; begin if FTextChanged then InternalUpdate; if Index < 0 then Index := 0; @@ -471,7 +471,7 @@ end; procedure TQtComboStrings.InsertItem(Index: Integer; const S: string); var FSavedIndex: Integer; - FSavedText: UnicodeString; + FSavedText: WideString; begin inherited InsertItem(Index, S); FOwner.BeginUpdate; @@ -490,7 +490,7 @@ end; procedure TQtComboStrings.InsertItem(Index: Integer; const S: string; O: TObject); var FSavedIndex: Integer; - FSavedText: UnicodeString; + FSavedText: WideString; begin inherited InsertItem(Index, S, O); FOwner.BeginUpdate; diff --git a/lcl/interfaces/qt/qtsystemtrayicon.pas b/lcl/interfaces/qt/qtsystemtrayicon.pas index 4aa6ee2e2e..b7fa5f64d6 100644 --- a/lcl/interfaces/qt/qtsystemtrayicon.pas +++ b/lcl/interfaces/qt/qtsystemtrayicon.pas @@ -54,7 +54,7 @@ type function EventFilter(Sender: QObjectH; Event: QEventH): Boolean; cdecl; override; procedure setContextMenu(menu: QMenuH); procedure setIcon(icon: QIconH); - procedure setToolTip(tip: UnicodeString); + procedure setToolTip(tip: WideString); procedure signalActivated(AReason: QSystemTrayIconActivationReason); cdecl; procedure showBaloonHint(const ATitle, AHint: String; const AFlag: QSystemTrayIconMessageIcon; const ATimeOut: Integer); @@ -73,7 +73,7 @@ implementation constructor TQtSystemTrayIcon.Create(vIcon: QIconH); var - AName: UnicodeString; {just to debug} + AName: WideString; {just to debug} begin inherited Create; FSysTrayWidget := nil; @@ -169,13 +169,12 @@ begin APaintData.Context := nil; end; -function TQtSystemTrayIcon.EventFilter(Sender: QObjectH; Event: QEventH - ): Boolean; cdecl; +function TQtSystemTrayIcon.EventFilter(Sender: QObjectH; Event: QEventH): Boolean; cdecl; var X, Y: Integer; R: TRect; P: TQtPoint; - AHint: UnicodeString; + AHint: WideString; {$IFDEF HASX11} PaintData: TSysTrayIconPaintData; {$ENDIF} @@ -253,7 +252,7 @@ begin QSystemTrayIcon_setIcon(QSystemTrayIconH(TheObject), icon); end; -procedure TQtSystemTrayIcon.setToolTip(tip: UnicodeString); +procedure TQtSystemTrayIcon.setToolTip(tip: WideString); begin QSystemTrayIcon_setToolTip(QSystemTrayIconH(TheObject), @tip) end; @@ -312,7 +311,7 @@ end; procedure TQtSystemTrayIcon.showBaloonHint(const ATitle, AHint: String; const AFlag: QSystemTrayIconMessageIcon; const ATimeOut: Integer); var - WHint, WTitle: UnicodeString; + WHint, WTitle: WideString; begin WHint := {%H-}AHint; WTitle := {%H-}ATitle; diff --git a/lcl/interfaces/qt/qtthemes.pas b/lcl/interfaces/qt/qtthemes.pas index 93b55f0d94..04e83e564f 100644 --- a/lcl/interfaces/qt/qtthemes.pas +++ b/lcl/interfaces/qt/qtthemes.pas @@ -46,7 +46,7 @@ type private FStyle: QStyleH; function GetStyle: QStyleH; - function GetStyleName: UnicodeString; + function GetStyleName: WideString; protected function InitThemes: Boolean; override; function UseThemes: Boolean; override; @@ -56,7 +56,7 @@ type function GetControlState(Details: TThemedElementDetails): QStyleState; function GetDrawElement(Details: TThemedElementDetails): TQtDrawElement; property Style: QStyleH read GetStyle; - property StyleName: UnicodeString read GetStyleName; + property StyleName: WideString read GetStyleName; public procedure DrawElement(DC: HDC; Details: TThemedElementDetails; const R: TRect; ClipRect: PRect); override; procedure DrawEdge(DC: HDC; Details: TThemedElementDetails; const R: TRect; Edge, Flags: Cardinal; AContentRect: PRect); override; @@ -81,7 +81,7 @@ begin Result := FStyle; end; -function TQtThemeServices.GetStyleName: UnicodeString; +function TQtThemeServices.GetStyleName: WideString; begin QObject_objectName(Style, @Result); end; @@ -557,7 +557,7 @@ var Palette: QPaletteH; Context: TQtDeviceContext; Widget: QWidgetH; - W: UnicodeString; + W: WideString; TextRect: TRect; AOldMode: Integer; ATextPalette: Cardinal; diff --git a/lcl/interfaces/qt/qtwidgets.pas b/lcl/interfaces/qt/qtwidgets.pas index dd4170e874..6b6c806c28 100644 --- a/lcl/interfaces/qt/qtwidgets.pas +++ b/lcl/interfaces/qt/qtwidgets.pas @@ -119,7 +119,7 @@ type FParams: TCreateParams; FDefaultCursor: QCursorH; FKeysToEat: TByteSet; - FText: UnicodeString; + FText: WideString; FHasCaret: Boolean; FLastCaretPos: TQtPoint; FHasPaint: Boolean; @@ -136,18 +136,18 @@ type function GetPalette: TQtWidgetPalette; function GetProps(const AnIndex: String): pointer; function getScrolledOffset: TPoint; - function GetStyleSheet: UnicodeString; + function GetStyleSheet: WideString; function GetWidget: QWidgetH; function LCLKeyToQtKey(AKey: Word): Integer; function QtButtonsToLCLButtons(AButtons: QtMouseButton): PtrInt; function QtKeyModifiersToKeyState(AModifiers: QtKeyboardModifiers; const AIsKeyEvent: Boolean; AEvent: QKeyEventH = nil): PtrInt; - function QtKeyToLCLKey(AKey: Integer; AText: UnicodeString; + function QtKeyToLCLKey(AKey: Integer; AText: WideString; AEvent: QKeyEventH): Word; procedure SetLastCaretPos(const AValue: TQtPoint); procedure SetProps(const AnIndex: String; const AValue: pointer); - procedure SetStyleSheet(const AValue: UnicodeString); + procedure SetStyleSheet(const AValue: WideString); procedure SetWidget(const AValue: QWidgetH); function ShiftStateToQtModifiers(Shift: TShiftState): QtModifier; protected @@ -188,7 +188,7 @@ type function EventFilter(Sender: QObjectH; Event: QEventH): Boolean; cdecl; override; function getAcceptDropFiles: Boolean; virtual; {precise measure of text with widget''s current font when canvas.handle isn''t available} - function measureText(AText: UnicodeString; AFlags: cardinal): TRect; + function measureText(AText: WideString; AFlags: cardinal): TRect; procedure SetNoMousePropagation(Sender: QWidgetH; const ANoMousePropagation: Boolean); virtual; procedure SetLCLFont(AFont: TQtFont); procedure SlotShow(vShow: Boolean); cdecl; @@ -243,7 +243,7 @@ type function getPos: TQtPoint; function getFrameSize: TSize; virtual; function getSize: TSize; - function getText: UnicodeString; virtual; + function getText: WideString; virtual; function getTextStatic: Boolean; virtual; function getHeight: Integer; function getUpdatesEnabled: Boolean; @@ -291,7 +291,7 @@ type procedure setMask(AMask: QRegionH); overload; procedure setMinimumSize(AWidth, AHeight: Integer); procedure setParent(parent: QWidgetH); virtual; - procedure setText(const W: UnicodeString); virtual; + procedure setText(const W: WideString); virtual; procedure setTextColor(const Value: PQColor); virtual; procedure setVisible(AVisible: Boolean); virtual; procedure setWindowFlags(_type: QtWindowFlags); @@ -317,7 +317,7 @@ type property KeysToEat: TByteSet read FKeysToEat write FKeysToEat; property LastCaretPos: TQtPoint read FLastCaretPos write SetLastCaretPos; property ScrolledOffset: TPoint read getScrolledOffset; - property StyleSheet: UnicodeString read GetStyleSheet write SetStyleSheet; + property StyleSheet: WideString read GetStyleSheet write SetStyleSheet; property PaintData: TPaintData read FPaintData write FPaintData; property Palette: TQtWidgetPalette read GetPalette; property Props[AnIndex:String]:pointer read GetProps write SetProps; @@ -516,11 +516,11 @@ type public function CanPaintBackground: Boolean; override; function getIconSize: TSize; virtual; - function getText: UnicodeString; override; + function getText: WideString; override; procedure setIcon(AIcon: QIconH); virtual; procedure setIconSize(Size: PSize); virtual; procedure setShortcut(AShortCutK1, AShortCutK2: TShortcut); - procedure setText(const W: UnicodeString); override; + procedure setText(const W: WideString); override; procedure Toggle; function isChecked: Boolean; function isDown: Boolean; @@ -567,10 +567,10 @@ type procedure preferredSize(var PreferredWidth, PreferredHeight: integer; {%H-}WithThemeSpace: Boolean); override; function getIconSize: TSize; override; - function getText: UnicodeString; override; + function getText: WideString; override; procedure setIcon(AIcon: QIconH); override; procedure setIconSize(Size: PSize); override; - procedure setText(const W: UnicodeString); override; + procedure setText(const W: WideString); override; property GlyphLayout: Integer read FGlyphLayout write FGlyphLayout; end; @@ -668,7 +668,7 @@ type function getFrameSize: TSize; override; function getFrameGeometry: TRect; override; - function getText: UnicodeString; override; + function getText: WideString; override; function getTextStatic: Boolean; override; function MapToGlobal(APt: TPoint; const AWithScrollOffset: Boolean = False): TPoint; override; @@ -678,7 +678,7 @@ type procedure Repaint(ARect: PRect = nil); override; procedure Resize(ANewWidth, ANewHeight: Integer); override; - procedure setText(const W: UnicodeString); override; + procedure setText(const W: WideString); override; procedure setMenuBar(AMenuBar: QMenuBarH); function EventFilter(Sender: QObjectH; Event: QEventH): Boolean; cdecl; override; procedure MDIChildWindowStateChanged(AOldState: QtWindowStates; ANewState: QtWindowStates); cdecl; @@ -729,8 +729,8 @@ type function CreateWidget(const AParams: TCreateParams):QWidgetH; override; public function CanPaintBackground: Boolean; override; - function getText: UnicodeString; override; - procedure setText(const W: UnicodeString); override; + function getText: WideString; override; + procedure setText(const W: WideString); override; procedure setAlignment(const AAlignment: QtAlignment); property WordWrap: Boolean read GetWordWrap write SetWordWrap; end; @@ -786,10 +786,10 @@ type function EventFilter(Sender: QObjectH; Event: QEventH): Boolean; cdecl; override; function getClientBounds: TRect; override; function getClientOffset: TPoint; override; - function getText: UnicodeString; override; + function getText: WideString; override; procedure preferredSize(var PreferredWidth, PreferredHeight: integer; {%H-}WithThemeSpace: Boolean); override; - procedure setText(const W: UnicodeString); override; + procedure setText(const W: WideString); override; procedure setFocusPolicy(const APolicy: QtFocusPolicy); override; procedure Update(ARect: PRect = nil); override; procedure UpdateRegion(ARgn: QRegionH); override; @@ -850,10 +850,10 @@ type function getAlignment: QtAlignment; function getCursorPosition: TPoint; function getMaxLength: Integer; - function getSelectedText: UnicodeString; + function getSelectedText: WideString; function getSelectionStart: Integer; function getSelectionLength: Integer; - function getText: UnicodeString; override; + function getText: WideString; override; function getTextStatic: Boolean; override; function isUndoAvailable: Boolean; function hasSelectedText: Boolean; @@ -863,11 +863,11 @@ type procedure setCursorPosition(const ACursorPosition: Integer); procedure setDefaultColorRoles; override; procedure setEchoMode(const AMode: QLineEditEchoMode); - procedure setInputMask(const AMask: UnicodeString); + procedure setInputMask(const AMask: WideString); procedure setMaxLength(const ALength: Integer); procedure setReadOnly(const AReadOnly: Boolean); procedure setSelection(const AStart, ALength: Integer); - procedure setText(const AText: UnicodeString); override; + procedure setText(const AText: WideString); override; procedure Cut; procedure Copy; procedure Paste; @@ -900,19 +900,19 @@ type function CreateWidget(const AParams: TCreateParams):QWidgetH; override; public FList: TStrings; - procedure Append(const AStr: UnicodeString); + procedure Append(const AStr: WideString); procedure ClearText; function getAlignment: QtAlignment; function getBlockCount: Integer; function getCursorPosition: TPoint; function getMaxLength: Integer; - function getText: UnicodeString; override; + function getText: WideString; override; function getTextStatic: Boolean; override; function getSelectionStart: Integer; function getSelectionEnd: Integer; function getSelectionLength: Integer; - procedure appendLine(AText: UnicodeString); - procedure insertLine(const AIndex: integer; AText: UnicodeString); + procedure appendLine(AText: WideString); + procedure insertLine(const AIndex: integer; AText: WideString); function isUndoAvailable: Boolean; procedure removeLine(const AIndex: integer); procedure setAlignment(const AAlignment: QtAlignment); @@ -922,8 +922,8 @@ type procedure setEchoMode(const AMode: QLineEditEchoMode); procedure setLineWrapMode(const AMode: QTextEditLineWrapMode); procedure setMaxLength(const ALength: Integer); - procedure setLineText(const AIndex: integer; AText: UnicodeString); - procedure setText(const AText: UnicodeString); override; + procedure setLineText(const AIndex: integer; AText: WideString); + procedure setText(const AText: WideString); override; procedure setReadOnly(const AReadOnly: Boolean); procedure setSelection(const AStart, ALength: Integer); procedure setTabChangesFocus(const AValue: Boolean); @@ -988,8 +988,8 @@ type procedure SignalCloseRequested(Index: Integer); cdecl; public function indexOf(const AWidget: QWidgetH): integer; - function insertTab(index: Integer; page: QWidgetH; p2: UnicodeString): Integer; overload; - function insertTab(index: Integer; page: QWidgetH; icon: QIconH; p2: UnicodeString): Integer; overload; + function insertTab(index: Integer; page: QWidgetH; p2: WideString): Integer; overload; + function insertTab(index: Integer; page: QWidgetH; icon: QIconH; p2: WideString): Integer; overload; function getCount: Integer; function getClientBounds: TRect; override; function getCurrentIndex: Integer; @@ -1000,7 +1000,7 @@ type procedure setCurrentWidget(APage: TQtWidget; const AIsMoved: Boolean); procedure setTabPosition(ATabPosition: QTabWidgetTabPosition); procedure setTabIcon(index: Integer; icon: QIconH); - procedure setTabText(index: Integer; p2: UnicodeString); + procedure setTabText(index: Integer; p2: WideString); procedure setTabsClosable(AValue: Boolean); function tabAt(APoint: TPoint): Integer; @@ -1055,12 +1055,12 @@ type procedure ClearItems; procedure setBorder(const ABorder: Boolean); function currentIndex: Integer; - function findText(AText: UnicodeString): Integer; + function findText(AText: WideString): Integer; function getDroppedDown: Boolean; function getEditable: Boolean; - function getItemText(AIndex: Integer): UnicodeString; + function getItemText(AIndex: Integer): WideString; function getMaxVisibleItems: Integer; - function getText: UnicodeString; override; + function getText: WideString; override; function getTextStatic: Boolean; override; procedure insertItem(AIndex: Integer; AText: String); overload; procedure insertItem(AIndex: Integer; AText: PWideString); overload; @@ -1070,7 +1070,7 @@ type procedure setMaxVisibleItems(ACount: Integer); procedure setEditable(const AValue: Boolean); procedure setItemText(AIndex: Integer; AText: String); - procedure setText(const W: UnicodeString); override; + procedure setText(const W: WideString); override; procedure removeItem(AIndex: Integer); property DropList: TQtListWidget read GetDropList; @@ -1126,7 +1126,7 @@ type public function getValue: Double; virtual; abstract; function getReadOnly: Boolean; - function getText: UnicodeString; override; + function getText: WideString; override; function getTextStatic: Boolean; override; procedure setAlignment(const AAlignment: QtAlignment); procedure setBorder(const ABorder: Boolean); @@ -1137,7 +1137,7 @@ type procedure setSingleStep(const v: Double); virtual; abstract; procedure setReadOnly(const r: Boolean); procedure setValue(const v: Double); virtual; abstract; - procedure setText(const W: UnicodeString); override; + procedure setText(const W: WideString); override; property LineEdit: QLineEditH read GetLineEdit; public @@ -1516,7 +1516,7 @@ type function getVisibleRowCount(const AFirstVisibleOnly: boolean = false): integer; override; procedure setItemVisible(AItem: QTreeWidgetItemH; Const AVisible: Boolean); procedure setItemText(AItem: QTreeWidgetItemH; const AColumn: Integer; - const AText: UnicodeString; const AAlignment: QtAlignment); + const AText: WideString; const AAlignment: QtAlignment); procedure setItemData(AItem: QTreeWidgetItemH; const AColumn: Integer; Data: Pointer; const ARole: Integer = Ord(QtUserRole)); function selCount: Integer; @@ -1617,7 +1617,7 @@ type function addMenu(AMenu: QMenuH): QActionH; function insertMenu(AIndex: Integer; AMenu: QMenuH; AItem: TMenuItem): QActionH; function getHasSubMenu: boolean; - function getText: UnicodeString; override; + function getText: WideString; override; function getVisible: Boolean; override; function MenuItemEnabled: boolean; procedure PopUp(pos: PQtPoint; at: QActionH = nil); @@ -1630,7 +1630,7 @@ type procedure setImage(AImage: TQtImage); procedure setSeparator(AValue: Boolean); procedure setShortcut(AShortCutK1, AShortCutK2: TShortcut); - procedure setText(const W: UnicodeString); override; + procedure setText(const W: WideString); override; procedure setVisible(AVisible: Boolean); override; property trackButton: QtMouseButton read FTrackButton write FTrackButton; end; @@ -1767,17 +1767,17 @@ type procedure DirectoryEnteredEvent(directory: PWideString); cdecl; public procedure getFilters(const retval: QStringListH); - function selectFile: UnicodeString; + function selectFile: WideString; procedure selectedFiles(retval: QStringListH); procedure setAcceptMode(const AMode: QFileDialogAcceptMode); procedure setConfirmOverwrite(const AValue: Boolean); - procedure setDirectory(const ADirectory: UnicodeString); + procedure setDirectory(const ADirectory: WideString); procedure setHistory(AList: TStrings); procedure setFileMode(const AMode: QFileDialogFileMode); - procedure setFilter(const AFilter: UnicodeString); - procedure setLabelText(const ALabel: QFileDialogDialogLabel; const AText: UnicodeString); + procedure setFilter(const AFilter: WideString); + procedure setLabelText(const ALabel: QFileDialogDialogLabel; const AText: WideString); procedure setReadOnly(const AReadOnly: Boolean); - procedure setSelectedFilter(const ASelFilter: UnicodeString); + procedure setSelectedFilter(const ASelFilter: WideString); procedure setViewMode(const AMode: QFileDialogViewMode); {$ifndef QT_NATIVE_DIALOGS} procedure setShortcuts(const AIsOpenDialog: Boolean); @@ -1808,14 +1808,14 @@ type TQtMessageBox = class(TQtWidget) private FMBEventHook: QObject_hookH; - FTitle: UnicodeString; - function getDetailText: UnicodeString; - function getMessageStr: UnicodeString; + FTitle: WideString; + function getDetailText: WideString; + function getMessageStr: WideString; function getMsgBoxType: QMessageBoxIcon; - procedure setDetailText(const AValue: UnicodeString); - procedure setMessageStr(const AValue: UnicodeString); + procedure setDetailText(const AValue: WideString); + procedure setMessageStr(const AValue: WideString); procedure setMsgBoxType(const AValue: QMessageBoxIcon); - procedure setTitle(const AValue: UnicodeString); + procedure setTitle(const AValue: WideString); protected function CreateWidget(AParent: QWidgetH):QWidgetH; overload; public @@ -1824,17 +1824,17 @@ type procedure DetachEvents; override; function EventFilter(Sender: QObjectH; Event: QEventH): Boolean; cdecl; override; public - function AddButton(ACaption: UnicodeString; ABtnType: QMessageBoxStandardButton; AResult: Int64; + function AddButton(ACaption: WideString; ABtnType: QMessageBoxStandardButton; AResult: Int64; const ADefaultBtn: Boolean; const AEscapeBtn: Boolean = False): QPushButtonH; overload; - function AddButton(ACaption: UnicodeString; AResult: Int64; + function AddButton(ACaption: WideString; AResult: Int64; const ADefaultBtn: Boolean; const AEscapeBtn: Boolean = False): QPushButtonH; procedure SetButtonProps(ABtn: QPushButtonH; AResult: Int64; const ADefaultBtn: Boolean; const AEscapeBtn: Boolean); function exec: Int64; - property DetailText: UnicodeString read getDetailText write setDetailText; - property MessageStr: UnicodeString read getMessageStr write setMessageStr; + property DetailText: WideString read getDetailText write setDetailText; + property MessageStr: WideString read getMessageStr write setMessageStr; property MsgBoxType:QMessageBoxIcon read getMsgBoxType write setMsgBoxType; - property Title: UnicodeString read FTitle write setTitle; + property Title: WideString read FTitle write setTitle; end; { TQtCalendar } @@ -1889,7 +1889,7 @@ type function getIndex(const ATextChanging: Boolean = False): Integer; function getTabWidget: QTabWidgetH; procedure setIcon(const AIcon: QIconH); - procedure setText(const W: UnicodeString); override; + procedure setText(const W: WideString); override; end; { TQtRubberBand } @@ -2765,7 +2765,7 @@ begin Result := TQtMainWindow(Form.Handle).getAcceptDropFiles; end; -function TQtWidget.measureText(AText: UnicodeString; AFlags: cardinal): TRect; +function TQtWidget.measureText(AText: WideString; AFlags: cardinal): TRect; var AMetrics: QFontMetricsH; AFont: QFontH; @@ -2885,7 +2885,7 @@ var QStrList: QStringListH; ByteArr: QByteArrayH; i: Integer; - WStr: UnicodeString; + WStr: WideString; GotFiles: Boolean; FilesList: TStrings; Files: Array of String; @@ -3012,7 +3012,7 @@ var CharMsg: TLMChar; Modifiers: QtKeyboardModifiers; IsSysKey: Boolean; - Text: UnicodeString; + Text: WideString; UTF8Text: String; // use to prevent 3 time convertion from WideString to utf8 string UTF8Char: TUTF8Char; ACharCode: Word; @@ -3488,7 +3488,7 @@ end; function TQtWidget.SlotInputMethod(Sender: QObjectH; Event: QEventH): Boolean; cdecl; var InputEvent: QInputMethodEventH; - WStr: UnicodeString; + WStr: WideString; UnicodeChar: Cardinal; UnicodeOutLen: integer; KeyEvent: QKeyEventH; @@ -4729,7 +4729,7 @@ begin QWidget_size(Widget, @Result); end; -function TQtWidget.getText: UnicodeString; +function TQtWidget.getText: WideString; begin Result := FText; end; @@ -5149,7 +5149,7 @@ begin QWidget_setParent(Widget, parent); end; -procedure TQtWidget.setText(const W: UnicodeString); +procedure TQtWidget.setText(const W: WideString); begin FText := W; end; @@ -5219,7 +5219,7 @@ end; Params: None Returns: Nothing ------------------------------------------------------------------------------} -function TQtWidget.QtKeyToLCLKey(AKey: Integer; AText: UnicodeString; +function TQtWidget.QtKeyToLCLKey(AKey: Integer; AText: WideString; AEvent: QKeyEventH): Word; begin // The big problem here with unicode keys @@ -5682,9 +5682,9 @@ begin Result := Point(-FScrollX, -FScrollY); end; -function TQtWidget.GetStyleSheet: UnicodeString; +function TQtWidget.GetStyleSheet: WideString; var - WStr: UnicodeString; + WStr: WideString; begin QWidget_styleSheet(Widget, @WStr); Result := WStr; @@ -5763,9 +5763,9 @@ begin Fprops.Objects[i] := TObject(AValue); end; -procedure TQtWidget.SetStyleSheet(const AValue: UnicodeString); +procedure TQtWidget.SetStyleSheet(const AValue: WideString); var - WStr: UnicodeString; + WStr: WideString; begin WStr := AValue; QWidget_setStyleSheet(Widget, @WStr); @@ -5839,7 +5839,7 @@ end; Params: None Returns: Nothing ------------------------------------------------------------------------------} -procedure TQtAbstractButton.SetText(const W: UnicodeString); +procedure TQtAbstractButton.SetText(const W: WideString); begin QAbstractButton_setText(QAbstractButtonH(Widget), @W); end; @@ -5866,7 +5866,7 @@ end; Params: None Returns: Nothing ------------------------------------------------------------------------------} -function TQtAbstractButton.getText: UnicodeString; +function TQtAbstractButton.getText: WideString; begin QAbstractButton_text(QAbstractButtonH(Widget), @Result); end; @@ -5994,7 +5994,7 @@ var function AutoSizeButtonFromStyle(const ASize: TSize): TSize; var AOpt: QStyleOptionButtonH; - AText: UnicodeString; + AText: WideString; AMetrics: QFontMetricsH; BtnWidth: Integer; BtnHeight: Integer; @@ -6159,7 +6159,7 @@ function TQtBitBtn.EventFilter(Sender: QObjectH; Event: QEventH): Boolean; IconAlign: QtAlignment; CenterOffset, W {, H}: Integer; AFontMetrics: QFontMetricsH; - AText: UnicodeString; + AText: WideString; DTFLAGS: DWord; ContentSize: TSize; IconDistance: Integer; @@ -6334,7 +6334,7 @@ const IconDistance = 4; // hardcoded in qt libs var AOpt: QStyleOptionButtonH; - AText: UnicodeString; + AText: WideString; AMetrics: QFontMetricsH; TextSize: TSize; {style pixel metrics} @@ -6394,7 +6394,7 @@ begin Result := FIconSize; end; -function TQtBitBtn.getText: UnicodeString; +function TQtBitBtn.getText: WideString; begin Result := FText; end; @@ -6421,7 +6421,7 @@ begin Update(nil); end; -procedure TQtBitBtn.setText(const W: UnicodeString); +procedure TQtBitBtn.setText(const W: WideString); begin FText := W; if getVisible then @@ -7333,7 +7333,7 @@ begin {$ENDIF} end; -function TQtMainWindow.getText: UnicodeString; +function TQtMainWindow.getText: WideString; begin WindowTitle(@Result); end; @@ -7433,7 +7433,7 @@ begin inherited Resize(ANewWidth, ANewHeight); end; -procedure TQtMainWindow.setText(const W: UnicodeString); +procedure TQtMainWindow.setText(const W: WideString); begin setWindowTitle(@W); end; @@ -8223,10 +8223,10 @@ end; Params: None Returns: Nothing ------------------------------------------------------------------------------} -procedure TQtStaticText.SetText(const W: UnicodeString); +procedure TQtStaticText.SetText(const W: WideString); var AmpersandPos: Integer; - LocalW: UnicodeString; + LocalW: WideString; begin LocalW := W; if TCustomStaticText(LCLObject).ShowAccelChar then @@ -8254,7 +8254,7 @@ end; Params: None Returns: Nothing ------------------------------------------------------------------------------} -function TQtStaticText.getText: UnicodeString; +function TQtStaticText.getText: WideString; begin QLabel_text(QLabelH(Widget), @Result); end; @@ -8711,7 +8711,7 @@ begin {$ENDIF} end; -function TQtGroupBox.getText: UnicodeString; +function TQtGroupBox.getText: WideString; begin QGroupBox_title(QGroupBoxH(Widget), @Result); end; @@ -8733,7 +8733,7 @@ begin {$ENDIF} end; -procedure TQtGroupBox.setText(const W: UnicodeString); +procedure TQtGroupBox.setText(const W: WideString); begin QGroupBox_setTitle(QGroupBoxH(Widget), @W); setLayoutThemeMargins(QWidget_Layout(Widget), Widget); @@ -9634,7 +9634,7 @@ begin Result := QLineEdit_maxLength(QLineEditH(Widget)); end; -function TQtLineEdit.getSelectedText: UnicodeString; +function TQtLineEdit.getSelectedText: WideString; begin Result := ''; QLineEdit_selectedText(QLineEditH(Widget), @Result); @@ -9655,7 +9655,7 @@ end; function TQtLineEdit.getSelectionLength: Integer; var - W: UnicodeString; + W: WideString; begin if hasSelectedText then begin @@ -9670,7 +9670,7 @@ begin end; end; -function TQtLineEdit.getText: UnicodeString; +function TQtLineEdit.getText: WideString; begin Result := ''; QLineEdit_text(QLineEditH(Widget), @Result); @@ -9813,7 +9813,7 @@ begin QLineEdit_setEchoMode(QLineEditH(Widget), AMode); end; -procedure TQtLineEdit.setInputMask(const AMask: UnicodeString); +procedure TQtLineEdit.setInputMask(const AMask: WideString); begin QLineEdit_setInputMask(QLineEditH(Widget), @AMask); end; @@ -9839,7 +9839,7 @@ begin end; end; -procedure TQtLineEdit.setText(const AText: UnicodeString); +procedure TQtLineEdit.setText(const AText: WideString); begin QLineEdit_setText(QLineEditH(Widget), @AText); end; @@ -9927,7 +9927,7 @@ begin QWidget_setAcceptDrops(Result, False); end; -procedure TQtTextEdit.Append(const AStr: UnicodeString); +procedure TQtTextEdit.Append(const AStr: WideString); begin QTextEdit_append(QTextEditH(Widget), @AStr); end; @@ -9969,7 +9969,7 @@ begin Result := 0; end; -function TQtTextEdit.getText: UnicodeString; +function TQtTextEdit.getText: WideString; begin Result := ''; QTextEdit_toPlainText(QTextEditH(Widget), @Result); @@ -10025,7 +10025,7 @@ begin {$note implement TQtTextEdit.setMaxLength} end; -procedure TQtTextEdit.appendLine(AText: UnicodeString); +procedure TQtTextEdit.appendLine(AText: WideString); var QtCursor: QTextCursorH; WrapMode: QTextEditLineWrapMode; @@ -10048,7 +10048,7 @@ begin end; end; -procedure TQtTextEdit.insertLine(const AIndex: integer; AText: UnicodeString); +procedure TQtTextEdit.insertLine(const AIndex: integer; AText: WideString); var QtCursor: QTextCursorH; WrapMode: QTextEditLineWrapMode; @@ -10157,7 +10157,7 @@ begin end; end; -procedure TQtTextEdit.setLineText(const AIndex: integer; AText: UnicodeString); +procedure TQtTextEdit.setLineText(const AIndex: integer; AText: WideString); var QtCursor: QTextCursorH; WrapMode: QTextEditLineWrapMode; @@ -10187,7 +10187,7 @@ begin end; end; -procedure TQtTextEdit.setText(const AText: UnicodeString); +procedure TQtTextEdit.setText(const AText: WideString); begin QTextEdit_setPlainText(QTextEditH(Widget), @AText); end; @@ -10658,7 +10658,7 @@ var List: TPtrIntArray; Obj: QObjectH; i: Integer; - WStr: UnicodeString; + WStr: WideString; begin if FStackWidget = nil then begin @@ -10872,7 +10872,7 @@ end; Params: index: Integer; page: QWidgetH; p2: PWideString Returns: Nothing ------------------------------------------------------------------------------} -function TQtTabWidget.insertTab(index: Integer; page: QWidgetH; p2: UnicodeString): Integer; overload; +function TQtTabWidget.insertTab(index: Integer; page: QWidgetH; p2: WideString): Integer; overload; begin Result := insertTab(index, page, nil, p2); end; @@ -10882,7 +10882,7 @@ end; Params: index: Integer; page: QWidgetH; icon: QIconH; p2: PWideString Returns: Nothing ------------------------------------------------------------------------------} -function TQtTabWidget.insertTab(index: Integer; page: QWidgetH; icon: QIconH; p2: UnicodeString): Integer; overload; +function TQtTabWidget.insertTab(index: Integer; page: QWidgetH; icon: QIconH; p2: WideString): Integer; overload; var UseAdd: Boolean; begin @@ -11011,7 +11011,7 @@ begin Result := QTabWidget_indexOf(QTabWidgetH(Widget), AWidget); end; -procedure TQtTabWidget.setTabText(index: Integer; p2: UnicodeString); +procedure TQtTabWidget.setTabText(index: Integer; p2: WideString); begin QTabWidget_setTabText(QTabWidgetH(Widget), index, @p2); end; @@ -11257,7 +11257,7 @@ begin Result := QComboBox_currentIndex(QComboBoxH(Widget)); end; -function TQtComboBox.findText(AText: UnicodeString): Integer; +function TQtComboBox.findText(AText: WideString): Integer; begin Result := QComboBox_findText(QComboBoxH(Widget), @AText); end; @@ -11272,7 +11272,7 @@ begin Result := QComboBox_isEditable(QComboBoxH(Widget)); end; -function TQtComboBox.getItemText(AIndex: Integer): UnicodeString; +function TQtComboBox.getItemText(AIndex: Integer): WideString; begin Result := ''; QComboBox_itemText(QComboBoxH(Widget), @Result, AIndex); @@ -11283,7 +11283,7 @@ begin Result := QComboBox_maxVisibleItems(QComboboxH(Widget)); end; -function TQtComboBox.getText: UnicodeString; +function TQtComboBox.getText: WideString; begin Result := ''; QComboBox_currentText(QComboBoxH(Widget), @Result); @@ -11298,7 +11298,7 @@ end; procedure TQtComboBox.insertItem(AIndex: Integer; AText: String); var - Str: UnicodeString; + Str: WideString; begin Str := {%H-}AText; insertItem(AIndex, @Str); @@ -11360,7 +11360,7 @@ end; procedure TQtComboBox.setItemText(AIndex: Integer; AText: String); var - Str: UnicodeString; + Str: WideString; item: QListWidgetItemH; R: TRect; begin @@ -11384,7 +11384,7 @@ begin insertItem(AIndex, AText); end; -procedure TQtComboBox.setText(const W: UnicodeString); +procedure TQtComboBox.setText(const W: WideString); begin if FLineEdit = nil then FText := W @@ -11878,7 +11878,7 @@ end; function TQtAbstractSpinBox.getSelectionLength: Integer; var - W: UnicodeString; + W: WideString; begin if (LineEdit <> nil) and QLineEdit_hasSelectedText(LineEdit) then begin @@ -11976,7 +11976,7 @@ begin Result := QAbstractSpinBox_isReadOnly(QAbstractSpinBoxH(Widget)); end; -function TQtAbstractSpinBox.getText: UnicodeString; +function TQtAbstractSpinBox.getText: WideString; begin if LineEdit <> nil then QLineEdit_text(LineEdit, @Result) @@ -12008,7 +12008,7 @@ begin QAbstractSpinBox_setReadOnly(QAbstractSpinBoxH(Widget), r); end; -procedure TQtAbstractSpinBox.setText(const W: UnicodeString); +procedure TQtAbstractSpinBox.setText(const W: WideString); begin {$ifdef VerboseQt} WriteLn('TQtAbstractSpinBox.SetText W=',w); @@ -12392,7 +12392,7 @@ procedure TQtListWidget.setItemCount(const AValue: Integer); var i: Integer; AList: QStringListH; - WStr: UnicodeString; + WStr: WideString; begin if AValue = ItemCount then exit; @@ -12511,7 +12511,7 @@ var RowHeight: Integer; item: QListWidgetItemH; v, v2, v3: QVariantH; - WStr, DataStr: UnicodeString; + WStr, DataStr: WideString; ImgList: TCustomImageList; AImageIndex: TImageIndex; Bmp: TBitmap; @@ -13496,7 +13496,7 @@ end; procedure TQtListWidget.insertItem(AIndex: Integer; AText: String); var - Str: UnicodeString; + Str: WideString; begin Str := {%H-}AText; insertItem(AIndex, @Str); @@ -13648,7 +13648,7 @@ end; procedure TQtListWidget.setItemText(AIndex: Integer; AText: String); var Item: QListWidgetItemH; - Str: UnicodeString; + Str: WideString; R: TRect; begin Str := {%H-}AText; @@ -13670,7 +13670,7 @@ procedure TQtListWidget.setItemText(AIndex: Integer; AText: String; AAlignment: Integer); var Item: QListWidgetItemH; - Str: UnicodeString; + Str: WideString; R: TRect; begin Str := {%H-}AText; @@ -14643,7 +14643,7 @@ var item: QTreeWidgetItemH; itemChild: QTreeWidgetItemH; v,v2,v3: QVariantH; - WStr, TempStr: UnicodeString; + WStr, TempStr: WideString; ASelected: Boolean; ImgList: TCustomImageList; AImageIndex: TImageIndex; @@ -14851,7 +14851,7 @@ var function IsItemEmpty: boolean; var - AText: UnicodeString; + AText: WideString; AIcon: QIconH; begin QTreeWidgetItem_text(topLevelItem(ItemIndex), @AText, SubItemIndex); @@ -15293,7 +15293,7 @@ begin end; procedure TQtTreeWidget.setItemText(AItem: QTreeWidgetItemH; - const AColumn: Integer; const AText: UnicodeString; const AAlignment: QtAlignment); + const AColumn: Integer; const AText: WideString; const AAlignment: QtAlignment); begin QTreeWidgetItem_setText(AItem, AColumn, @AText); QTreeWidgetItem_setTextAlignment(AItem, AColumn, AAlignment); @@ -16203,12 +16203,12 @@ begin Result := QAction_isVisible(ActionHandle); end; -function TQtMenu.getText: UnicodeString; +function TQtMenu.getText: WideString; begin QAction_text(ActionHandle, @Result); end; -procedure TQtMenu.setText(const W: UnicodeString); +procedure TQtMenu.setText(const W: WideString); begin QAction_setText(ActionHandle, @W); end; @@ -16561,7 +16561,7 @@ var Action: QActionH; i: Integer; seq: QKeySequenceH; - WStr: UnicodeString; + WStr: WideString; begin if not FVisible then begin @@ -18432,7 +18432,7 @@ begin end; end; -procedure TQtPage.setText(const W: UnicodeString); +procedure TQtPage.setText(const W: WideString); var AParent: QTabWidgetH; Index: integer; @@ -19095,7 +19095,7 @@ begin end; {$endif} -function TQtFileDialog.selectFile: UnicodeString; +function TQtFileDialog.selectFile: WideString; begin QFileDialog_selectFile(QFileDialogH(Widget), @Result); end; @@ -19115,7 +19115,7 @@ begin QFileDialog_setConfirmOverwrite(QFileDialogH(Widget), AValue); end; -procedure TQtFileDialog.setDirectory(const ADirectory: UnicodeString); +procedure TQtFileDialog.setDirectory(const ADirectory: WideString); begin QFileDialog_setDirectory(QFileDialogH(Widget), @ADirectory); end; @@ -19124,7 +19124,7 @@ procedure TQtFileDialog.setHistory(AList: TStrings); var List: QStringListH; i: Integer; - WStr: UnicodeString; + WStr: WideString; begin List := QStringList_create(); try @@ -19144,13 +19144,13 @@ begin QFileDialog_setFileMode(QFileDialogH(Widget), AMode); end; -procedure TQtFileDialog.setFilter(const AFilter: UnicodeString); +procedure TQtFileDialog.setFilter(const AFilter: WideString); begin QFileDialog_setNameFilter(QFileDialogH(Widget), @AFilter); end; procedure TQtFileDialog.setLabelText(const ALabel: QFileDialogDialogLabel; - const AText: UnicodeString); + const AText: WideString); begin QFileDialog_setLabelText(QFileDialogH(Widget), ALabel, @AText); end; @@ -19160,7 +19160,7 @@ begin QFileDialog_setReadOnly(QFileDialogH(Widget), AReadOnly); end; -procedure TQtFileDialog.setSelectedFilter(const ASelFilter: UnicodeString); +procedure TQtFileDialog.setSelectedFilter(const ASelFilter: WideString); begin QFileDialog_selectNameFilter(QFileDialogH(Widget), @ASelFilter); end; @@ -19183,7 +19183,7 @@ var AnIter: TQtObjectDump; i: Integer; Obj: QObjectH; - WStr, ToolTip: UnicodeString; + WStr, ToolTip: WideString; begin // if there's auto recognition enabled then don''t set shortcuts // cause we are maybe native dialog and then boomer. @@ -19349,7 +19349,7 @@ end; procedure TQtFilePreviewDialog.initializePreview(const APreviewControl: TWinControl); var ALayout: QGridLayoutH; - ATitle: UnicodeString; + ATitle: WideString; W, H: Integer; begin ALayout := QGridLayoutH(QWidget_layout(Widget)); @@ -19397,7 +19397,7 @@ end; procedure TQtFilePreviewDialog.CurrentChangedEvent(path: PWideString); cdecl; var APixmap: QPixmapH; - ATitle: UnicodeString; + ATitle: WideString; ASize: TSize; ANewPixmap: QPixmapH; begin @@ -19743,33 +19743,33 @@ begin Result := QMessageBox_icon(QMessageBoxH(Widget)); end; -procedure TQtMessageBox.setDetailText(const AValue: UnicodeString); +procedure TQtMessageBox.setDetailText(const AValue: WideString); var - Str: UnicodeString; + Str: WideString; begin Str := AValue; QMessageBox_setDetailedText(QMessageBoxH(Widget), @Str); end; -function TQtMessageBox.getMessageStr: UnicodeString; +function TQtMessageBox.getMessageStr: WideString; var - Str: UnicodeString; + Str: WideString; begin QMessageBox_text(QMessageBoxH(Widget), @Str); Result := Str; end; -function TQtMessageBox.getDetailText: UnicodeString; +function TQtMessageBox.getDetailText: WideString; var - Str: UnicodeString; + Str: WideString; begin QMessageBox_detailedText(QMessageBoxH(Widget), @Str); Result := Str; end; -procedure TQtMessageBox.setMessageStr(const AValue: UnicodeString); +procedure TQtMessageBox.setMessageStr(const AValue: WideString); var - Str: UnicodeString; + Str: WideString; begin Str := AValue; QMessageBox_setText(QMessageBoxH(Widget), @Str); @@ -19780,7 +19780,7 @@ begin QMessageBox_setIcon(QMessageBoxH(Widget), AValue); end; -procedure TQtMessageBox.setTitle(const AValue: UnicodeString); +procedure TQtMessageBox.setTitle(const AValue: WideString); begin if AValue <> FTitle then begin @@ -19880,10 +19880,10 @@ begin end; end; -function TQtMessageBox.AddButton(ACaption: UnicodeString; ABtnType: QMessageBoxStandardButton; +function TQtMessageBox.AddButton(ACaption: WideString; ABtnType: QMessageBoxStandardButton; AResult: Int64; const ADefaultBtn: Boolean; const AEscapeBtn: Boolean): QPushButtonH; var - Str: UnicodeString; + Str: WideString; begin Result := QMessageBox_addButton(QMessageBoxH(Widget), ABtnType); Str := ACaption; @@ -19891,10 +19891,10 @@ begin SetButtonProps(Result, AResult, ADefaultBtn, AEscapeBtn); end; -function TQtMessageBox.AddButton(ACaption: UnicodeString; AResult: Int64; const ADefaultBtn: Boolean; +function TQtMessageBox.AddButton(ACaption: WideString; AResult: Int64; const ADefaultBtn: Boolean; const AEscapeBtn: Boolean): QPushButtonH; var - Str: UnicodeString; + Str: WideString; begin Str := ACaption; Result := QMessageBox_addButton(QMessageBoxH(Widget), @Str, QMessageBoxActionRole); diff --git a/lcl/interfaces/qt/qtwinapi.inc b/lcl/interfaces/qt/qtwinapi.inc index 3e59ef30b6..7fd0c28b33 100644 --- a/lcl/interfaces/qt/qtwinapi.inc +++ b/lcl/interfaces/qt/qtwinapi.inc @@ -1311,7 +1311,7 @@ end; function TQtWidgetSet.DrawText(DC: HDC; Str: PChar; Count: Integer; var ARect: TRect; Flags: Cardinal): Integer; var - WStr: UnicodeString; + WStr: WideString; R: TRect; QtDC: TQtDeviceContext; F: Integer; @@ -1754,7 +1754,7 @@ var const AWritingSystem: QFontDatabaseWritingSystem = QFontDatabaseAny):integer; var StrLst: QStringlistH; - WStr: UnicodeString; + WStr: WideString; j: integer; begin Result := -1; @@ -1779,7 +1779,7 @@ var var StrLst: QStringlistH; NewList: QStringListH; - WStr: UnicodeString; + WStr: WideString; j: integer; begin Result := -1; @@ -1832,7 +1832,7 @@ var function GetStyleAt(AIndex: Integer): String; var - WStr: UnicodeString; + WStr: WideString; begin Result := ''; if (AIndex >= 0) and (AIndex < QStringList_size(StylesList)) then @@ -1845,7 +1845,7 @@ var function GetWritingSystems(AFontName: String; AList: QStringListH; ACharsetList: TFPList): Boolean; var - WStr: UnicodeString; + WStr: WideString; Arr: TPtrIntArray; j: Integer; begin @@ -1870,7 +1870,7 @@ var out AStyle: String): Integer; var Font: QFontH; - WStr: UnicodeString; + WStr: WideString; begin WStr := {%H-}AFontName; Font := QFont_create(@WStr); @@ -2195,7 +2195,7 @@ end; function TQtWidgetSet.ExtTextOut(DC: HDC; X, Y: Integer; Options: Longint; Rect: PRect; Str: PChar; Count: Longint; Dx: PInteger): Boolean; var - WStr: UnicodeString; + WStr: WideString; QtDC: TQtDeviceContext absolute DC; R, R1: TRect; Pt: TPoint; @@ -2208,7 +2208,7 @@ var CurCount: LongInt; CurDx: PInteger; CurStr: PChar; - W: UnicodeString; + W: WideString; begin CurDx := Dx; CurStr := Str; @@ -4256,7 +4256,7 @@ function TQtWidgetSet.GetTextExtentExPoint(DC: HDC; Str: PChar; Count, var i: Integer; w: Integer; - AStr: UnicodeString; + AStr: WideString; Accu: Integer; begin Result := False; @@ -4333,7 +4333,7 @@ end; ------------------------------------------------------------------------------} function TQtWidgetSet.GetTextExtentPoint(DC: HDC; Str: PChar; Count: Integer; var Size: TSize): Boolean; var - WStr: UnicodeString; + WStr: WideString; QtDC: TQtDeviceContext absolute DC; begin {$ifdef VerboseQtWinAPI} @@ -4365,7 +4365,7 @@ end; function TQtWidgetSet.GetTextMetrics(DC: HDC; var TM: TTextMetric): Boolean; var QtFontMetrics: TQtFontMetrics; - FontFamily: UnicodeString; + FontFamily: WideString; QtDC: TQtDeviceContext absolute DC; FontWeight: Integer; begin @@ -4847,7 +4847,7 @@ var Font: TFont absolute AFont; AMenu: QMenuH; QtFont: QFontH; - AName: UnicodeString; + AName: WideString; begin Result := False; if AStockFont = sfMenu then @@ -5233,9 +5233,9 @@ const end; end; var - Str: UnicodeString; - TitleStr: UnicodeString; - //OkStr: UnicodeString; + Str: WideString; + TitleStr: WideString; + //OkStr: WideString; AParent: QWidgetH; DialogType, DefButton, DefIcon : Cardinal; begin @@ -7014,7 +7014,7 @@ end; function TQtWidgetSet.TextOut(DC: HDC; X, Y: Integer; Str: Pchar; Count: Integer ): Boolean; var - WStr: UnicodeString; + WStr: WideString; begin {$ifdef VerboseQtWinAPI} WriteLn('[WinAPI TextOut]'); diff --git a/lcl/interfaces/qt/qtwscomctrls.pp b/lcl/interfaces/qt/qtwscomctrls.pp index 29c36bf994..3095cdb508 100644 --- a/lcl/interfaces/qt/qtwscomctrls.pp +++ b/lcl/interfaces/qt/qtwscomctrls.pp @@ -555,7 +555,7 @@ end; class procedure TQtWSStatusBar.RecreatePanels(const AStatusBar: TStatusBar; const Widget: TQtStatusBar); var - Str: UnicodeString; + Str: WideString; i: Integer; begin // issues #18683 and #28307 @@ -619,7 +619,7 @@ end; class procedure TQtWSStatusBar.PanelUpdate(const AStatusBar: TStatusBar; PanelIndex: integer); var QtStatusBar: TQtStatusBar; - Str: Unicodestring; + Str: Widestring; begin QtStatusBar := TQtStatusBar(AStatusBar.Handle); if AStatusBar.SimplePanel then @@ -650,7 +650,7 @@ end; class procedure TQtWSStatusBar.SetPanelText(const AStatusBar: TStatusBar; PanelIndex: integer); var QtStatusBar: TQtStatusBar; - Str: Unicodestring; + Str: Widestring; begin QtStatusBar := TQtStatusBar(AStatusBar.Handle); if AStatusBar.SimplePanel then @@ -783,7 +783,7 @@ var QtTreeWidget: TQtTreeWidget; TWI: QTreeWidgetItemH; TWIChild: QTreeWidgetItemH; - Str: UnicodeString; + Str: WideString; begin if not WSCheckHandleAllocated(ALV, 'ColumnInsert') then Exit; @@ -932,7 +932,7 @@ end; class procedure TQtWSCustomListView.ColumnSetCaption(const ALV: TCustomListView; const AIndex: Integer; const AColumn: TListColumn; const ACaption: String); var - Str: UnicodeString; + Str: WideString; QtTreeWidget: TQtTreeWidget; TWI: QTreeWidgetItemH; begin @@ -1420,7 +1420,7 @@ var QtListWidget: TQtListWidget; QtTreeWidget: TQtTreeWidget; TWI: QTreeWidgetItemH; - Str: UnicodeString; + Str: WideString; i: Integer; AAlignment: QtAlignment; //AIconWidth: Integer; @@ -1490,7 +1490,7 @@ var QtListWidget: TQtListWidget; QtTreeWidget: TQtTreeWidget; TWI: QTreeWidgetItemH; - Str: UnicodeString; + Str: WideString; AAlignment: QtAlignment; begin if not WSCheckHandleAllocated(ALV, 'ItemSetText') then @@ -1871,7 +1871,7 @@ var QtTreeWidget: TQtTreeWidget; i, j: Integer; AItem: TListItem; - Str: UnicodeString; + Str: WideString; Item: QTreeWidgetItemH; AAlignment: QtAlignment; ImgList: TImageList; diff --git a/lcl/interfaces/qt/qtwsdialogs.pp b/lcl/interfaces/qt/qtwsdialogs.pp index 378c70112d..1f4da390b7 100644 --- a/lcl/interfaces/qt/qtwsdialogs.pp +++ b/lcl/interfaces/qt/qtwsdialogs.pp @@ -51,7 +51,7 @@ type private protected class function GetQtFilterString(const AFileDialog: TFileDialog; - var ASelectedFilter: UnicodeString): UnicodeString; + var ASelectedFilter: WideString): WideString; class procedure UpdateProperties(const AFileDialog: TFileDialog; QtFileDialog: TQtFileDialog); published class function CreateHandle(const ACommonDialog: TCommonDialog): THandle; override; @@ -190,7 +190,7 @@ end; { TQtWSFileDialog } class function TQtWSFileDialog.GetQtFilterString(const AFileDialog: TFileDialog; - var ASelectedFilter: UnicodeString): UnicodeString; + var ASelectedFilter: WideString): WideString; function GetExtensionString(ASource: String; AStart, ALength: Integer): String; inline; begin @@ -310,9 +310,9 @@ end; class procedure TQtWSFileDialog.UpdateProperties( const AFileDialog: TFileDialog; QtFileDialog: TQtFileDialog); var - ATitle: UnicodeString; + ATitle: WideString; {$ifndef QT_NATIVE_DIALOGS} - AInitDir: UnicodeString; + AInitDir: WideString; {$ENDIF} S: String; begin @@ -406,14 +406,14 @@ end; ------------------------------------------------------------------------------} class procedure TQtWSFileDialog.ShowModal(const ACommonDialog: TCommonDialog); var - ReturnText: UnicodeString; + ReturnText: WideString; s: string; FileDialog: TFileDialog; ReturnList: QStringListH; i: integer; QtFileDialog: TQtFileDialog; {$ifdef QT_NATIVE_DIALOGS} - selectedFilter, saveFileName, saveFilter, saveTitle: UnicodeString; + selectedFilter, saveFileName, saveFilter, saveTitle: WideString; sDir: String; Flags: Cardinal; {$endif} @@ -681,9 +681,9 @@ end; class procedure TQtWSSelectDirectoryDialog.UpdateProperties( const AFileDialog: TSelectDirectoryDialog; QtFileDialog: TQtFileDialog); var - ATitle: UnicodeString; + ATitle: WideString; {$ifndef QT_NATIVE_DIALOGS} - AInitDir: UnicodeString; + AInitDir: WideString; {$endif} S: String; begin @@ -751,10 +751,10 @@ end; ------------------------------------------------------------------------------} class procedure TQtWSSelectDirectoryDialog.ShowModal(const ACommonDialog: TCommonDialog); var - ReturnText: UnicodeString; + ReturnText: WideString; {$ifdef QT_NATIVE_DIALOGS} - saveFileName: UnicodeString; - saveTitle: UnicodeString; + saveFileName: WideString; + saveTitle: WideString; {$endif} FileDialog: TSelectDirectoryDialog; QtFileDialog: TQtFileDialog; @@ -941,7 +941,7 @@ class procedure TQtWSFontDialog.ShowModal(const ACommonDialog: TCommonDialog); var ReturnFont, CurrentFont: QFontH; ReturnBool: Boolean; - Str: UnicodeString; + Str: WideString; {$IFDEF HASX11} AWND: HWND; {$ENDIF} diff --git a/lcl/interfaces/qt/qtwsextctrls.pp b/lcl/interfaces/qt/qtwsextctrls.pp index 9522dfc556..e33dc69be4 100644 --- a/lcl/interfaces/qt/qtwsextctrls.pp +++ b/lcl/interfaces/qt/qtwsextctrls.pp @@ -205,7 +205,7 @@ class function TQtWSCustomRadioGroup.CreateHandle(const AWinControl: TWinControl const AParams: TCreateParams): TLCLIntfHandle; var QtGroupBox: TQtGroupBox; - Str: UnicodeString; + Str: WideString; begin QtGroupBox := TQtGroupBox.Create(AWinControl, AParams); QtGroupBox.GroupBoxType := tgbtRadioGroup; @@ -231,7 +231,7 @@ class function TQtWSCustomCheckGroup.CreateHandle(const AWinControl: TWinControl const AParams: TCreateParams): TLCLIntfHandle; var QtGroupBox: TQtGroupBox; - Str: UnicodeString; + Str: WideString; begin QtGroupBox := TQtGroupBox.Create(AWinControl, AParams); QtGroupBox.GroupBoxType := tgbtCheckGroup; @@ -265,7 +265,7 @@ end; class function TQtWSCustomTrayIcon.Show(const ATrayIcon: TCustomTrayIcon): Boolean; var - Text: UnicodeString; + Text: WideString; SystemTrayIcon: TQtSystemTrayIcon; IconH: QIconH; begin @@ -303,7 +303,7 @@ class procedure TQtWSCustomTrayIcon.InternalUpdate(const ATrayIcon: TCustomTrayI var SystemTrayIcon: TQtSystemTrayIcon; AIcon: QIconH; - AHint: UnicodeString; + AHint: WideString; begin if (ATrayIcon.Handle = 0) then Exit; diff --git a/lcl/interfaces/qt/qtwsforms.pp b/lcl/interfaces/qt/qtwsforms.pp index e920511ba0..2f1d730b93 100644 --- a/lcl/interfaces/qt/qtwsforms.pp +++ b/lcl/interfaces/qt/qtwsforms.pp @@ -184,7 +184,7 @@ class function TQtWSCustomForm.CreateHandle(const AWinControl: TWinControl; const AParams: TCreateParams): TLCLIntfHandle; var QtMainWindow: TQtMainWindow; - Str: UnicodeString; + Str: WideString; APopupParent: TCustomForm; AForm: TCustomForm; begin diff --git a/lcl/interfaces/qt/qtwsstdctrls.pp b/lcl/interfaces/qt/qtwsstdctrls.pp index 4849e8082a..82627ba90b 100644 --- a/lcl/interfaces/qt/qtwsstdctrls.pp +++ b/lcl/interfaces/qt/qtwsstdctrls.pp @@ -767,7 +767,7 @@ end; ------------------------------------------------------------------------------} class procedure TQtWSCustomMemo.AppendText(const ACustomMemo: TCustomMemo; const AText: string); var - AStr: UnicodeString; + AStr: WideString; begin if not WSCheckHandleAllocated(ACustomMemo, 'AppendText') or (Length(AText) = 0) then Exit; @@ -1444,7 +1444,7 @@ class function TQtWSCustomComboBox.GetItemIndex( const ACustomComboBox: TCustomComboBox): integer; var QtComboBox: TQtComboBox; - WStr, WStr2: UnicodeString; + WStr, WStr2: WideString; i: Integer; begin Result := -1; @@ -1679,7 +1679,7 @@ class function TQtWSCustomComboBox.GetItemHeight( const ACustomComboBox: TCustomComboBox): Integer; var ComboBox: TQtComboBox; - AText: UnicodeString; + AText: WideString; ACombo: QComboBoxH; AItems: QStringListH; begin