paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-05-03 22:03:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

laz_xmlstreaming: replaced if declared unicodestring with FPC_HAS_UNICODESTRING

Browse Source 
git-svn-id: trunk@17621 -
This commit is contained in:
mattias 2008-11-28 08:33:11 +00:00
parent 1394f53c75
commit a0a54b0d4a
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
components/codetools/laz_xmlstreaming.pas
View File

@ -82,9 +82,9 @@ type
procedure WriteSet(Value: LongInt; SetType: Pointer); override;
procedure WriteString(const Value: String); override;
procedure WriteWideString(const Value: WideString); override;
{$IF DECLARED(UnicodeString)}
{$IFDEF FPC_HAS_UNICODESTRING}
procedure WriteUnicodeString(const Value: UnicodeString); override;
{$IFEND}
{$ENDIF}
{$IFDEF HasReadWriteBuf}
procedure Write(const Buffer; Count: Longint); override;
{$ENDIF}
@ -131,9 +131,9 @@ type
function ReadStr: String; override;
function ReadString(StringType: TValueType): String; override;
function ReadWideString: WideString; override;
{$IF DECLARED(UnicodeString)}
{$IFDEF FPC_HAS_UNICODESTRING}
function ReadUnicodeString: UnicodeString; override;
{$IFEND}
{$ENDIF}
procedure SkipComponent(SkipComponentInfos: Boolean); override;
procedure SkipValue; override;
{$IFDEF HasReadWriteBuf}
@ -458,13 +458,13 @@ begin
GetPropertyElement('widestring')['value'] := System.UTF8Encode(Value);
end;
{$IF DECLARED(UnicodeString)}
{$IFDEF FPC_HAS_UNICODESTRING}
procedure TXMLObjectWriter.WriteUnicodeString(const Value: UnicodeString);
// save unicodestrings as utf8
begin
GetPropertyElement('unicodestring')['value'] := System.UTF8Encode(Value);
end;
{$IFEND}
{$ENDIF}
{$IFDEF HasReadWriteBuf}
procedure TXMLObjectWriter.Write(const Buffer; Count: Longint);
@ -673,10 +673,10 @@ begin
Result:=vaExtended
else if FElement.NodeName='widestring' then
Result:=vaWString
{$IF DECLARED(UnicodeString)}
{$IFDEF FPC_HAS_UNICODESTRING}
else if FElement.NodeName='unicodestring' then
Result:=vaUString
{$IFEND}
{$ENDIF}
else if FElement.NodeName='collectionproperty' then
Result:=vaCollection
else
@ -1059,7 +1059,7 @@ begin
//writeln('TXMLObjectReader.ReadWideString "',ValueAsUTF8,'"');
end;
{$IF DECLARED(UnicodeString)}
{$IFDEF FPC_HAS_UNICODESTRING}
function TXMLObjectReader.ReadUnicodeString: UnicodeString;
var
ValueAsUTF8: String;
@ -1068,7 +1068,7 @@ begin
Result:=System.UTF8Decode(ValueAsUTF8);
ReadValue;
end;
{$IFEND}
{$ENDIF}
procedure TXMLObjectReader.SkipComponent(SkipComponentInfos: Boolean);
var