From 8feb95edb494bfd6233078b499e25560f6e8b619 Mon Sep 17 00:00:00 2001
From: Mark van Renswoude <mark@x2software.net>
Date: Tue, 9 Dec 2014 14:26:11 +0000
Subject: [PATCH] TEncoding parameter for Load...FromString helper function

---
 Units/DelphiXMLDataBindingGenerator.pas | 1 -
 Units/DelphiXMLDataBindingResources.pas | 7 ++++---
 Units/XMLDataBindingGenerator.pas       | 1 -
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Units/DelphiXMLDataBindingGenerator.pas b/Units/DelphiXMLDataBindingGenerator.pas
index 00adf6d..14ddbbb 100644
--- a/Units/DelphiXMLDataBindingGenerator.pas
+++ b/Units/DelphiXMLDataBindingGenerator.pas
@@ -609,7 +609,6 @@ begin
   { In ye olde days this is where we checked if XMLDataBindingUtils was required. With the
     introduction of the IXSDValidate, this is practically always the case. }
   AWriter.WriteLine('uses');
-  AWriter.WriteLine('  SysUtils,');
   AWriter.WriteLine('  Variants;');
   AWriter.WriteLine;
 end;
diff --git a/Units/DelphiXMLDataBindingResources.pas b/Units/DelphiXMLDataBindingResources.pas
index ddc7ed2..c3e8b97 100644
--- a/Units/DelphiXMLDataBindingResources.pas
+++ b/Units/DelphiXMLDataBindingResources.pas
@@ -27,6 +27,7 @@ const
                         'uses'                                                  + CrLf +
                         '%<UsesClause>:s'                                       +
                         '  Classes,'                                            + CrLf +
+                        '  SysUtils,'                                           + CrLf +
                         '  XMLDoc,'                                             + CrLf +
                         '  XMLIntf,'                                            + CrLf +
                         '  XMLDataBindingUtils;'                                + CrLf +
@@ -45,7 +46,7 @@ const
   DocumentFunctionsInterface      = '  function Get%<Name>:s(ADocument: XMLIntf.IXMLDocument): IXML%<Name>:s;'  + CrLf +
                                     '  function Load%<Name>:s(const AFileName: String): IXML%<Name>:s;'         + CrLf +
                                     '  function Load%<Name>:sFromStream(AStream: TStream): IXML%<Name>:s;'      + CrLf +
-                                    '  function Load%<Name>:sFromString(const AString: String): IXML%<Name>:s;' + CrLf +
+                                    '  function Load%<Name>:sFromString(const AString: String{$IF CompilerVersion >= 20}; AEncoding: TEncoding = nil; AOwnsEncoding: Boolean = True{$IFEND}): IXML%<Name>:s;' + CrLf +
                                     '  function New%<Name>:s: IXML%<Name>:s;'                                   + CrLf;
 
   DocumentFunctionsImplementation = 'function Get%<Name>:s(ADocument: XMLIntf.IXMLDocument): IXML%<Name>:s;'  + CrLf +
@@ -68,12 +69,12 @@ const
                                     '  Result  := Get%<Name>:s(doc);'                                         + CrLf +
                                     'end;'                                                                    + CrLf +
                                     ''                                                                        + CrLf +
-                                    'function Load%<Name>:sFromString(const AString: String): IXML%<Name>:s;' + CrLf +
+                                    'function Load%<Name>:sFromString(const AString: String{$IF CompilerVersion >= 20}; AEncoding: TEncoding; AOwnsEncoding: Boolean{$IFEND}): IXML%<Name>:s;' + CrLf +
                                     'var'                                                                     + CrLf +
                                     '  stream: TStringStream;'                                                + CrLf +
                                     ''                                                                        + CrLf +
                                     'begin'                                                                   + CrLf +
-                                    '  stream := TStringStream.Create(AString);'                              + CrLf +
+                                    '  stream := TStringStream.Create(AString{$IF CompilerVersion >= 20}, AEncoding, AOwnsEncoding{$IFEND});' + CrLf +
                                     '  try'                                                                   + CrLf +
                                     '    Result  := Load%<Name>:sFromStream(stream);'                         + CrLf +
                                     '  finally'                                                               + CrLf +
diff --git a/Units/XMLDataBindingGenerator.pas b/Units/XMLDataBindingGenerator.pas
index 9031a16..5b17019 100644
--- a/Units/XMLDataBindingGenerator.pas
+++ b/Units/XMLDataBindingGenerator.pas
@@ -704,7 +704,6 @@ var
   schemaDef:            IXMLSchemaDef;
   attributeIndex:       Integer;
   attribute:            IXMLAttributeDef;
-  item:                 TXMLDataBindingItem;
 
 begin
   schemaDef := ASchema.SchemaDef;