From 8d6557ec358ac96314d3b1dd846a7cc7e658d4aa Mon Sep 17 00:00:00 2001
From: michael <michael@freepascal.org>
Date: Tue, 10 Jul 2012 09:09:38 +0000
Subject: [PATCH] * Reversed default. Using UTF8 is now the default, old
 behaviour can be restored

git-svn-id: trunk@21838 -
---
 packages/fcl-json/src/jsonparser.pp  | 8 ++++----
 packages/fcl-json/src/jsonscanner.pp | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/fcl-json/src/jsonparser.pp b/packages/fcl-json/src/jsonparser.pp
index 1b42795777..2f03a92f0c 100644
--- a/packages/fcl-json/src/jsonparser.pp
+++ b/packages/fcl-json/src/jsonparser.pp
@@ -45,8 +45,8 @@ Type
     Property Scanner : TJSONScanner read FScanner;
   Public
     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;
     // Use strict JSON: " for strings, object members are strings, not identifiers
     Property Strict : Boolean Read FStrict Write SetStrict;
@@ -272,14 +272,14 @@ begin
   Raise EJSONParser.Create(S);
 end;
 
-constructor TJSONParser.Create(Source: TStream; AUseUTF8 : Boolean = False);
+constructor TJSONParser.Create(Source: TStream; AUseUTF8 : Boolean = True);
 begin
   Inherited Create;
   FScanner:=TJSONScanner.Create(Source);
   UseUTF8:=AUseUTF8;
 end;
 
-constructor TJSONParser.Create(Source: TJSONStringType; AUseUTF8 : Boolean = False);
+constructor TJSONParser.Create(Source: TJSONStringType; AUseUTF8 : Boolean = True);
 begin
   Inherited Create;
   FScanner:=TJSONScanner.Create(Source);
diff --git a/packages/fcl-json/src/jsonscanner.pp b/packages/fcl-json/src/jsonscanner.pp
index 62ee4dd4a8..e02a5d7437 100644
--- a/packages/fcl-json/src/jsonscanner.pp
+++ b/packages/fcl-json/src/jsonscanner.pp
@@ -67,8 +67,8 @@ type
     procedure Error(const Msg: string; Args: array of Const);overload;
     function DoFetchToken: TJSONToken;
   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;
     function FetchToken: TJSONToken;
 
@@ -107,7 +107,7 @@ const
 
 implementation
 
-constructor TJSONScanner.Create(Source : TStream; AUseUTF8 : Boolean = False);
+constructor TJSONScanner.Create(Source : TStream; AUseUTF8 : Boolean = True);
 
 begin
   FSource:=TStringList.Create;
@@ -115,7 +115,7 @@ begin
   FUseUTF8:=AUseUTF8;
 end;
 
-constructor TJSONScanner.Create(const Source : String; AUseUTF8 : Boolean = False);
+constructor TJSONScanner.Create(const Source : String; AUseUTF8 : Boolean = True);
 begin
   FSource:=TStringList.Create;
   FSource.Text:=Source;