delphi XE7 compatibility fixes

Quick.HttpClient.pas

@@ -42,8 +42,11 @@ uses
   System.NetConsts,
   System.JSON;
   {$ELSE}
-  IdHTTP,
-  IdException,
+    {$IFDEF DELPHIXE7_UP}
+    System.JSON,
+    {$ENDIF}
+    IdHTTP,
+    IdException,
     {$IFDEF FPC}
     fpjson;
     {$ELSE}
@@ -150,7 +153,7 @@ begin
       {$IFDEF DELPHIXE8_UP}
       resp := fHTTPClient.Get(aURL,responsecontent,nil);
       {$ELSE}
-        {$IFDEF FPC}
+        {$If Defined(FPC) OR Not Defined(DELPHIXE8_UP)}
         fHTTPClient.Get(aURL,responsecontent);
         {$ELSE}
         fHTTPClient.Get(aURL,responsecontent,nil);
@@ -369,17 +372,24 @@ constructor THttpRequestResponse.Create(aResponse : TIdHTTPResponse; const aCont
 begin
   fStatusCode := aResponse.ResponseCode;
   fStatusText := aResponse.ResponseText;
+  {$If Defined(FPC) OR Defined(DELPHIXE8_UP)}
   if (aContent.Contains('{')) and (aContent.Contains('}')) then fResponse := GetJSON(aContent) as TJsonObject;
+  {$ELSE}
+  if (aContent.Contains('{')) and (aContent.Contains('}')) then fResponse:= TJsonObject.ParseJSONValue(aContent) as TJsonObject;
+  {$ENDIF}
   //if response is not json, get as json result
   if fResponse = nil then
   begin
     fResponse := TJSONObject.Create;
+    {$IFDEF DELPHIXE7_UP}
+    fResponse.AddPair('Result',aContent);
+    {$ELSE}
     fResponse.Add('Result',aContent);
+    {$ENDIF}
   end;
 end;
 {$ENDIF}
 
-
 destructor THttpRequestResponse.Destroy;
 begin
   if Assigned(fResponse) then fResponse.Free;

Quick.Json.Serializer.pas

@@ -1213,7 +1213,12 @@ begin
         begin
           if (aValue.TypeInfo = System.TypeInfo(Boolean)) then
           begin
+            {$IFDEF DELPHIRX10_UP}
             Result.JsonValue := TJSONBool.Create(aValue.AsBoolean);
+            {$ELSE}
+            if aValue.AsBoolean then Result.JsonValue := TJsonTrue.Create
+              else Result.JsonValue := TJsonFalse.Create;
+            {$ENDIF}
           end
           else
           begin
@@ -1515,7 +1520,11 @@ function TJsonSerializer.JsonToObject(aType: TClass; const aJson: string): TObje
 var
   json: TJSONObject;
 begin
+  {$If Defined(FPC) OR Defined(DELPHIRX10_UP)}
   json := TJSONObject.ParseJSONValue(aJson,True) as TJSONObject;
+  {$ELSE}
+  json := TJsonObject.ParseJSONValue(TEncoding.UTF8.GetBytes(aJson),0,True) as TJSONObject;
+  {$ENDIF}
   try
     Result := fRTTIJson.DeserializeClass(aType,json);
   finally
@@ -1532,8 +1541,12 @@ end;
 function TJsonSerializer.JsonToObject(aObject: TObject; const aJson: string): TObject;
 var
   json: TJSONObject;
-begin
-  json := TJsonObject(TJSONObject.ParseJSONValue(aJson,True));
+begin;
+  {$If Defined(FPC) OR Defined(DELPHIRX10_UP)}
+  json := TJSONObject.ParseJSONValue(aJson,True) as TJSONObject;
+  {$ELSE}
+  json := TJsonObject.ParseJSONValue(TEncoding.UTF8.GetBytes(aJson),0,True) as TJSONObject;
+  {$ENDIF}
   try
     Result := fRTTIJson.DeserializeObject(aObject,json);
   finally

Quick.Threads.pas

@@ -1150,7 +1150,11 @@ begin
       begin
         fTaskStatus := TWorkTaskStatus.wtsException;
         {$IFNDEF FPC}
-        fFaultControl.FailedExecution(AcquireExceptionObject as Exception);
+          {$IF DELPHIRX10_UP}
+          fFaultControl.FailedExecution(AcquireExceptionObject as Exception);
+          {$ELSE}
+          fFaultControl.FailedExecution(Exception(AcquireExceptionObject));
+          {$ENDIF}
         {$ELSE}
         fFaultControl.FailedExecution(Exception(AcquireExceptionObject));
         {$ENDIF}
@@ -2167,7 +2171,11 @@ begin
     on E : Exception do
     begin
       {$IFNDEF FPC}
-      if Assigned(fExceptionProc) then fExceptionProc(AcquireExceptionObject as Exception)
+        {$IF DELPHIRX10_UP}
+        if Assigned(fExceptionProc) then fExceptionProc(AcquireExceptionObject as Exception)
+        {$ELSE}
+        if Assigned(fExceptionProc) then fExceptionProc(Exception(AcquireExceptionObject))
+        {$ENDIF}
       {$ELSE}
       if Assigned(fExceptionProc) then fExceptionProc(Exception(AcquireExceptionObject))
       {$ENDIF}