paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-06-08 14:38:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed compile with fpc 3.3.1

Browse Source
This commit is contained in:
mattias 2023-07-25 09:30:38 +01:00
parent f208601bc7
commit cbf9d30ddf
3 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
components/lazutils/laz_xmlstreaming.pas
View File

@ -28,6 +28,12 @@ uses
SysUtils, Classes, TypInfo, Laz2_DOM, Laz2_XMLWrite; SysUtils, Classes, TypInfo, Laz2_DOM, Laz2_XMLWrite;
type type
{$IF FPC_FULLVERSION>30300}
TXMLObjectWriterString = RawByteString;
{$ELSE}
TXMLObjectWriterString = String;
{$ENDIF}
TXMLObjectWriterStackElType = (elUnknown, elPropertyList, elChildrenList); TXMLObjectWriterStackElType = (elUnknown, elPropertyList, elChildrenList);
TXMLObjectWriterStackEl = class TXMLObjectWriterStackEl = class
@ -76,7 +82,7 @@ type
procedure WriteInteger(Value: Int64); override; procedure WriteInteger(Value: Int64); override;
procedure WriteMethodName(const Name: String); override; procedure WriteMethodName(const Name: String); override;
procedure WriteSet(Value: LongInt; SetType: Pointer); override; procedure WriteSet(Value: LongInt; SetType: Pointer); override;
procedure WriteString(const Value: String); override; procedure WriteString(const Value: TXMLObjectWriterString); override;
procedure WriteWideString(const Value: WideString); override; procedure WriteWideString(const Value: WideString); override;
procedure WriteSignature; override; procedure WriteSignature; override;
{$IFDEF USE_NEW_READER_WRITER} {$IFDEF USE_NEW_READER_WRITER}
@ -454,7 +460,7 @@ begin
GetPropertyElement('set')['value'] := s; GetPropertyElement('set')['value'] := s;
end; end;
procedure TXMLObjectWriter.WriteString(const Value: String); procedure TXMLObjectWriter.WriteString(const Value: TXMLObjectWriterString);
begin begin
GetPropertyElement('string')['value'] := Value; GetPropertyElement('string')['value'] := Value;
end; end;

4
designer/designer.pp
View File

@ -1544,9 +1544,9 @@ begin
if tmpFieldN = 'Name' then if tmpFieldN = 'Name' then
begin begin
if IsActUndo then if IsActUndo then
CompN := FUndoList[FUndoCurr].newVal CompN := String(FUndoList[FUndoCurr].newVal)
else else
CompN := FUndoList[FUndoCurr].oldVal; CompN := String(FUndoList[FUndoCurr].oldVal);
end end
else else
CompN := FUndoList[FUndoCurr].compName; CompN := FUndoList[FUndoCurr].compName;

12
lcl/lresources.pp
View File

@ -226,6 +226,12 @@ type
end; end;
PLRSOWStackItem = ^TLRSOWStackItem; PLRSOWStackItem = ^TLRSOWStackItem;
{$IF FPC_FULLVERSION>30300}
TLazObjectWriterString = RawByteString;
{$ELSE}
TLazObjectWriterString = String;
{$ENDIF}
{ TLRSObjectWriter } { TLRSObjectWriter }
TLRSObjectWriter = class(TAbstractObjectWriter) TLRSObjectWriter = class(TAbstractObjectWriter)
@ -291,7 +297,7 @@ type
procedure WriteInteger(Value: Int64); override; procedure WriteInteger(Value: Int64); override;
procedure WriteMethodName(const Name: String); override; procedure WriteMethodName(const Name: String); override;
procedure WriteSet(Value: LongInt; SetType: Pointer); override; procedure WriteSet(Value: LongInt; SetType: Pointer); override;
procedure WriteString(const Value: String); override; procedure WriteString(const Value: TLazObjectWriterString); override;
procedure WriteWideString(const Value: WideString); override; procedure WriteWideString(const Value: WideString); override;
procedure WriteUnicodeString(const Value: UnicodeString); override; procedure WriteUnicodeString(const Value: UnicodeString); override;
procedure WriteVariant(const Value: Variant); override; procedure WriteVariant(const Value: Variant); override;
@ -4955,7 +4961,7 @@ begin
WriteStr(''); WriteStr('');
end; end;
procedure TLRSObjectWriter.WriteString(const Value: String); procedure TLRSObjectWriter.WriteString(const Value: TLazObjectWriterString);
var var
i: Integer; i: Integer;
b: Byte; b: Byte;
@ -5011,7 +5017,7 @@ begin
varcurrency: varcurrency:
WriteCurrency(Value); WriteCurrency(Value);
varolestr, varstring: varolestr, varstring:
WriteString(Value); WriteString(String(Value));
varboolean: varboolean:
WriteBoolean(Value); WriteBoolean(Value);
else else