浏览代码

* Reversed default. Using UTF8 is now the default, old behaviour can be restored

git-svn-id: trunk@21838 -
michael 13 年之前
父节点
当前提交
8d6557ec35
共有 2 个文件被更改,包括 8 次插入8 次删除
  1. 4 4
      packages/fcl-json/src/jsonparser.pp
  2. 4 4
      packages/fcl-json/src/jsonscanner.pp

+ 4 - 4
packages/fcl-json/src/jsonparser.pp

@@ -45,8 +45,8 @@ Type
     Property Scanner : TJSONScanner read FScanner;
     Property Scanner : TJSONScanner read FScanner;
   Public
   Public
     function Parse: TJSONData;
     function Parse: TJSONData;
-    Constructor Create(Source : TStream; AUseUTF8 : Boolean = False); overload;
-    Constructor Create(Source : TJSONStringType; AUseUTF8 : Boolean = False); overload;
+    Constructor Create(Source : TStream; AUseUTF8 : Boolean = True); overload;
+    Constructor Create(Source : TJSONStringType; AUseUTF8 : Boolean = True); overload;
     destructor Destroy();override;
     destructor Destroy();override;
     // Use strict JSON: " for strings, object members are strings, not identifiers
     // Use strict JSON: " for strings, object members are strings, not identifiers
     Property Strict : Boolean Read FStrict Write SetStrict;
     Property Strict : Boolean Read FStrict Write SetStrict;
@@ -272,14 +272,14 @@ begin
   Raise EJSONParser.Create(S);
   Raise EJSONParser.Create(S);
 end;
 end;
 
 
-constructor TJSONParser.Create(Source: TStream; AUseUTF8 : Boolean = False);
+constructor TJSONParser.Create(Source: TStream; AUseUTF8 : Boolean = True);
 begin
 begin
   Inherited Create;
   Inherited Create;
   FScanner:=TJSONScanner.Create(Source);
   FScanner:=TJSONScanner.Create(Source);
   UseUTF8:=AUseUTF8;
   UseUTF8:=AUseUTF8;
 end;
 end;
 
 
-constructor TJSONParser.Create(Source: TJSONStringType; AUseUTF8 : Boolean = False);
+constructor TJSONParser.Create(Source: TJSONStringType; AUseUTF8 : Boolean = True);
 begin
 begin
   Inherited Create;
   Inherited Create;
   FScanner:=TJSONScanner.Create(Source);
   FScanner:=TJSONScanner.Create(Source);

+ 4 - 4
packages/fcl-json/src/jsonscanner.pp

@@ -67,8 +67,8 @@ type
     procedure Error(const Msg: string; Args: array of Const);overload;
     procedure Error(const Msg: string; Args: array of Const);overload;
     function DoFetchToken: TJSONToken;
     function DoFetchToken: TJSONToken;
   public
   public
-    constructor Create(Source : TStream; AUseUTF8 : Boolean = False); overload;
-    constructor Create(const Source : String; AUseUTF8 : Boolean = False); overload;
+    constructor Create(Source : TStream; AUseUTF8 : Boolean = True); overload;
+    constructor Create(const Source : String; AUseUTF8 : Boolean = True); overload;
     destructor Destroy; override;
     destructor Destroy; override;
     function FetchToken: TJSONToken;
     function FetchToken: TJSONToken;
 
 
@@ -107,7 +107,7 @@ const
 
 
 implementation
 implementation
 
 
-constructor TJSONScanner.Create(Source : TStream; AUseUTF8 : Boolean = False);
+constructor TJSONScanner.Create(Source : TStream; AUseUTF8 : Boolean = True);
 
 
 begin
 begin
   FSource:=TStringList.Create;
   FSource:=TStringList.Create;
@@ -115,7 +115,7 @@ begin
   FUseUTF8:=AUseUTF8;
   FUseUTF8:=AUseUTF8;
 end;
 end;
 
 
-constructor TJSONScanner.Create(const Source : String; AUseUTF8 : Boolean = False);
+constructor TJSONScanner.Create(const Source : String; AUseUTF8 : Boolean = True);
 begin
 begin
   FSource:=TStringList.Create;
   FSource:=TStringList.Create;
   FSource.Text:=Source;
   FSource.Text:=Source;