ResponseCode + #38 + #41 + RawByteStream → Interfaces

Mercury13 · Mercury13 · commit 9c811b1d749a · 2017-11-02T23:55:06.000+02:00
diff --git a/Examples/Easy_Http/AplusB_Get/AplusB_Get.dpr b/Examples/Easy_Http/AplusB_Get/AplusB_Get.dpr
@@ -3,7 +3,6 @@ program AplusB_Get;
 uses
   Vcl.Forms,
   Curl.Lib in '..\..\..\Src\Curl.Lib.pas',
-  Curl.RawByteStream in '..\..\..\Src\Curl.RawByteStream.pas',
   Curl.Easy in '..\..\..\Src\Curl.Easy.pas',
   f_Main in 'f_Main.pas' {fmMain},
   Curl.Interfaces in '..\..\..\Src\Curl.Interfaces.pas',
diff --git a/Examples/Easy_Http/AplusB_Get/AplusB_Get.dproj b/Examples/Easy_Http/AplusB_Get/AplusB_Get.dproj
@@ -90,7 +90,6 @@
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
         <DCCReference Include="..\..\..\Src\Curl.Lib.pas"/>
-        <DCCReference Include="..\..\..\Src\Curl.RawByteStream.pas"/>
         <DCCReference Include="..\..\..\Src\Curl.Easy.pas"/>
         <DCCReference Include="f_Main.pas">
             <Form>fmMain</Form>
diff --git a/Examples/Easy_Http/AplusB_Get/f_Main.pas b/Examples/Easy_Http/AplusB_Get/f_Main.pas
@@ -29,7 +29,7 @@   TfmMain = class(TForm)
 implementation
 
 uses
-  Curl.Interfaces, Curl.Easy, Curl.Lib, Curl.RawByteStream, Curl.Encoders;
+  Curl.Interfaces, Curl.Easy, Curl.Lib, Curl.Encoders;
 
 {$R *.dfm}
 
diff --git a/Examples/Easy_Http/AplusB_Post/AplusB_Post.dpr b/Examples/Easy_Http/AplusB_Post/AplusB_Post.dpr
@@ -3,7 +3,6 @@ program AplusB_Post;
 uses
   Vcl.Forms,
   Curl.Lib in '..\..\..\Src\Curl.Lib.pas',
-  Curl.RawByteStream in '..\..\..\Src\Curl.RawByteStream.pas',
   Curl.Easy in '..\..\..\Src\Curl.Easy.pas',
   Curl.Form in '..\..\..\Src\Curl.Form.pas',
   f_Main in 'f_Main.pas' {fmMain},
diff --git a/Examples/Easy_Http/AplusB_Post/AplusB_Post.dproj b/Examples/Easy_Http/AplusB_Post/AplusB_Post.dproj
@@ -90,7 +90,6 @@
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
         <DCCReference Include="..\..\..\Src\Curl.Lib.pas"/>
-        <DCCReference Include="..\..\..\Src\Curl.RawByteStream.pas"/>
         <DCCReference Include="..\..\..\Src\Curl.Easy.pas"/>
         <DCCReference Include="..\..\..\Src\Curl.Form.pas"/>
         <DCCReference Include="f_Main.pas">
diff --git a/Examples/Easy_Http/AplusB_Post/f_Main.pas b/Examples/Easy_Http/AplusB_Post/f_Main.pas
@@ -29,7 +29,7 @@   TfmMain = class(TForm)
 implementation
 
 uses
-  Curl.Interfaces, Curl.Easy, Curl.Form, Curl.Lib, Curl.RawByteStream,
+  Curl.Interfaces, Curl.Easy, Curl.Form, Curl.Lib,
   Curl.Slist;
 
 {$R *.dfm}
diff --git a/Examples/Easy_Http/Https/Https.dpr b/Examples/Easy_Http/Https/Https.dpr
@@ -25,7 +25,7 @@ begin
 
     // Check for errors
     Writeln;
-    Writeln(Format('HTTP response code: %d', [ curl.GetResponseCode ] ));
+    Writeln(Format('HTTP response code: %d', [ curl.ResponseCode ] ));
   except
     on e : Exception do
       writeln('cURL failed: ', e.Message);
diff --git a/Examples/Easy_Http/PhotoInfo/PhotoInfo.dpr b/Examples/Easy_Http/PhotoInfo/PhotoInfo.dpr
@@ -3,7 +3,6 @@ program PhotoInfo;
 uses
   Vcl.Forms,
   Curl.Lib in '..\..\..\Src\Curl.Lib.pas',
-  Curl.RawByteStream in '..\..\..\Src\Curl.RawByteStream.pas',
   Curl.Easy in '..\..\..\Src\Curl.Easy.pas',
   Curl.Form in '..\..\..\Src\Curl.Form.pas',
   f_Main in 'f_Main.pas' {fmMain},
diff --git a/Examples/Easy_Http/PhotoInfo/PhotoInfo.dproj b/Examples/Easy_Http/PhotoInfo/PhotoInfo.dproj
@@ -90,7 +90,6 @@
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
         <DCCReference Include="..\..\..\Src\Curl.Lib.pas"/>
-        <DCCReference Include="..\..\..\Src\Curl.RawByteStream.pas"/>
         <DCCReference Include="..\..\..\Src\Curl.Easy.pas"/>
         <DCCReference Include="..\..\..\Src\Curl.Form.pas"/>
         <DCCReference Include="f_Main.pas">
diff --git a/Examples/Easy_Http/PhotoInfo/f_Main.pas b/Examples/Easy_Http/PhotoInfo/f_Main.pas
@@ -4,7 +4,7 @@ interface
 
 uses
   Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics,
-  Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.StdCtrls, Curl.RawByteStream;
+  Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.StdCtrls, Curl.Interfaces;
 
 type
   TfmMain = class(TForm)
@@ -46,7 +46,7 @@   TfmMain = class(TForm)
 implementation
 
 uses
-  Curl.Interfaces, Curl.Easy, Curl.Form, Curl.Lib,
+  Curl.Easy, Curl.Form, Curl.Lib,
   Curl.Slist, Vcl.Imaging.PngImage;
 
 {$R *.dfm}
diff --git a/Examples/Easy_Http/Readme/Readme.dpr b/Examples/Easy_Http/Readme/Readme.dpr
@@ -0,0 +1,30 @@
+program Readme;
+
+{$APPTYPE CONSOLE}
+
+{$R *.res}
+
+uses
+  System.SysUtils,
+  Curl.Easy in '..\..\..\Src\Curl.Easy.pas',
+  Curl.Lib in '..\..\..\Src\Curl.Lib.pas',
+  Curl.Interfaces in '..\..\..\Src\Curl.Interfaces.pas';
+
+var
+  curl : ICurl;
+begin
+  try
+    curl := CurlGet;
+    curl.SetUrl('http://example.com')
+        .SetProxyFromIe
+        .SetUserAgent(ChromeUserAgent)
+        .SwitchRecvToString
+        .Perform;
+    //curl.Perform;   // Uncomment to test that the stream properly rewinds
+    Writeln(curl.ResponseBody);
+  except
+    on E: Exception do
+      Writeln(E.ClassName, ': ', E.Message);
+  end;
+  Readln;
+end.
diff --git a/Examples/Easy_Http/Readme/Readme.dproj b/Examples/Easy_Http/Readme/Readme.dproj
@@ -0,0 +1,187 @@
+﻿<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <PropertyGroup>
+        <ProjectGuid>{A8F10EDB-006F-43A2-9FA9-ABBD4C5B57B2}</ProjectGuid>
+        <ProjectVersion>14.6</ProjectVersion>
+        <FrameworkType>None</FrameworkType>
+        <MainSource>Readme.dpr</MainSource>
+        <Base>True</Base>
+        <Config Condition="'$(Config)'==''">Debug</Config>
+        <Platform Condition="'$(Platform)'==''">Win32</Platform>
+        <TargetedPlatforms>1</TargetedPlatforms>
+        <AppType>Console</AppType>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
+        <Base>true</Base>
+    </PropertyGroup>
+    <PropertyGroup Condition="('$(Platform)'=='iOSDevice' and '$(Base)'=='true') or '$(Base_iOSDevice)'!=''">
+        <Base_iOSDevice>true</Base_iOSDevice>
+        <CfgParent>Base</CfgParent>
+        <Base>true</Base>
+    </PropertyGroup>
+    <PropertyGroup Condition="('$(Platform)'=='iOSSimulator' and '$(Base)'=='true') or '$(Base_iOSSimulator)'!=''">
+        <Base_iOSSimulator>true</Base_iOSSimulator>
+        <CfgParent>Base</CfgParent>
+        <Base>true</Base>
+    </PropertyGroup>
+    <PropertyGroup Condition="('$(Platform)'=='OSX32' and '$(Base)'=='true') or '$(Base_OSX32)'!=''">
+        <Base_OSX32>true</Base_OSX32>
+        <CfgParent>Base</CfgParent>
+        <Base>true</Base>
+    </PropertyGroup>
+    <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
+        <Base_Win32>true</Base_Win32>
+        <CfgParent>Base</CfgParent>
+        <Base>true</Base>
+    </PropertyGroup>
+    <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''">
+        <Base_Win64>true</Base_Win64>
+        <CfgParent>Base</CfgParent>
+        <Base>true</Base>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_1)'!=''">
+        <Cfg_1>true</Cfg_1>
+        <CfgParent>Base</CfgParent>
+        <Base>true</Base>
+    </PropertyGroup>
+    <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win32)'!=''">
+        <Cfg_1_Win32>true</Cfg_1_Win32>
+        <CfgParent>Cfg_1</CfgParent>
+        <Cfg_1>true</Cfg_1>
+        <Base>true</Base>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_2)'!=''">
+        <Cfg_2>true</Cfg_2>
+        <CfgParent>Base</CfgParent>
+        <Base>true</Base>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Base)'!=''">
+        <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace)</DCC_Namespace>
+        <DCC_DcuOutput>.\$(Platform)\$(Config)</DCC_DcuOutput>
+        <DCC_ExeOutput>.\$(Platform)\$(Config)</DCC_ExeOutput>
+        <DCC_E>false</DCC_E>
+        <DCC_N>false</DCC_N>
+        <DCC_S>false</DCC_S>
+        <DCC_F>false</DCC_F>
+        <DCC_K>false</DCC_K>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Base_iOSDevice)'!=''">
+        <DCC_UsePackage>bindcompfmx;DBXSqliteDriver;fmx;rtl;dbrtl;DbxClientDriver;IndySystem;bindcomp;DBXInterBaseDriver;DataSnapClient;DataSnapCommon;DataSnapProviderClient;xmlrtl;DbxCommonDriver;ibxpress;IndyProtocols;dbxcds;bindengine;soaprtl;bindcompdbx;CustomIPTransport;dsnap;fmxase;IndyCore;IndyIPCommon;CloudService;inet;dbexpress;IndyIPClient;$(DCC_UsePackage)</DCC_UsePackage>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Base_iOSSimulator)'!=''">
+        <DCC_UsePackage>bindcompfmx;DBXSqliteDriver;fmx;rtl;dbrtl;DbxClientDriver;IndySystem;bindcomp;DBXInterBaseDriver;DataSnapClient;DataSnapCommon;DataSnapProviderClient;xmlrtl;DbxCommonDriver;ibxpress;IndyProtocols;dbxcds;bindengine;soaprtl;bindcompdbx;CustomIPTransport;dsnap;fmxase;IndyCore;IndyIPCommon;CloudService;inet;dbexpress;IndyIPClient;$(DCC_UsePackage)</DCC_UsePackage>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Base_OSX32)'!=''">
+        <DCC_UsePackage>bindcompfmx;DBXSqliteDriver;fmx;rtl;dbrtl;DbxClientDriver;IndySystem;bindcomp;inetdb;DBXInterBaseDriver;DataSnapClient;DataSnapCommon;DataSnapServer;DataSnapProviderClient;xmlrtl;DbxCommonDriver;ibxpress;IndyProtocols;dbxcds;DBXMySQLDriver;bindengine;soaprtl;bindcompdbx;DBXOracleDriver;CustomIPTransport;dsnap;IndyIPServer;DBXInformixDriver;fmxase;IndyCore;IndyIPCommon;CloudService;DBXFirebirdDriver;inet;fmxobj;inetdbxpress;DBXSybaseASADriver;fmxdae;dbexpress;DataSnapIndy10ServerTransport;IndyIPClient;$(DCC_UsePackage)</DCC_UsePackage>
+        <DCC_ConsoleTarget>true</DCC_ConsoleTarget>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Base_Win32)'!=''">
+        <DCC_ConsoleTarget>true</DCC_ConsoleTarget>
+        <DCC_UsePackage>FMXTeeDB918;Tee918;bindcompfmx;DBXSqliteDriver;vcldbx;TeeGL918;FmxTeeUI918;fmx;FMXTree18;rtl;dbrtl;DbxClientDriver;IndySystem;bindcomp;inetdb;User_DelphiRun;inetdbbde;vclib;DBXInterBaseDriver;DataSnapClient;DataSnapCommon;DBXOdbcDriver;DataSnapServer;TeeDB918;DataSnapProviderClient;xmlrtl;svnui;DBXSybaseASEDriver;DbxCommonDriver;ibxpress;vclimg;IndyProtocols;dbxcds;DBXMySQLDriver;DatasnapConnectorsFreePascal;MetropolisUILiveTile;vclactnband;bindengine;vcldb;soaprtl;bindcompdbx;vcldsnap;bindcompvcl;TeeLanguage918;FMXTeePro918;vclie;TeePro918;vcltouch;DBXDb2Driver;FMXTeeLanguage918;TeeTree2D18Tee9;User_Delphi;DBXOracleDriver;CustomIPTransport;vclribbon;VclSmp;dsnap;IndyIPServer;DBXInformixDriver;TeeWorld918;fmxase;vcl;IndyCore;DataSnapConnectors;TeeImport918;IndyIPCommon;CloudService;DBXMSSQLDriver;dsnapcon;DBXFirebirdDriver;FMXTeeImport918;inet;TeeUI918;fmxobj;FMXTee918;vclx;inetdbxpress;webdsnap;svn;DBXSybaseASADriver;fmxdae;bdertl;TeeImage918;dbexpress;adortl;DataSnapIndy10ServerTransport;IndyIPClient;$(DCC_UsePackage)</DCC_UsePackage>
+        <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
+        <VerInfo_Locale>1033</VerInfo_Locale>
+        <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Base_Win64)'!=''">
+        <DCC_UsePackage>bindcompfmx;DBXSqliteDriver;fmx;rtl;dbrtl;DbxClientDriver;IndySystem;bindcomp;inetdb;vclib;DBXInterBaseDriver;DataSnapClient;DataSnapCommon;DBXOdbcDriver;DataSnapServer;DataSnapProviderClient;xmlrtl;DBXSybaseASEDriver;DbxCommonDriver;ibxpress;vclimg;IndyProtocols;dbxcds;DBXMySQLDriver;DatasnapConnectorsFreePascal;MetropolisUILiveTile;vclactnband;bindengine;vcldb;soaprtl;bindcompdbx;vcldsnap;bindcompvcl;vclie;vcltouch;DBXDb2Driver;DBXOracleDriver;CustomIPTransport;vclribbon;VclSmp;dsnap;IndyIPServer;DBXInformixDriver;fmxase;vcl;IndyCore;DataSnapConnectors;IndyIPCommon;CloudService;DBXMSSQLDriver;dsnapcon;DBXFirebirdDriver;inet;fmxobj;vclx;inetdbxpress;webdsnap;DBXSybaseASADriver;fmxdae;dbexpress;adortl;DataSnapIndy10ServerTransport;IndyIPClient;$(DCC_UsePackage)</DCC_UsePackage>
+        <DCC_ConsoleTarget>true</DCC_ConsoleTarget>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Cfg_1)'!=''">
+        <DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
+        <DCC_DebugDCUs>true</DCC_DebugDCUs>
+        <DCC_Optimize>false</DCC_Optimize>
+        <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
+        <DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
+        <DCC_RemoteDebug>true</DCC_RemoteDebug>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
+        <DCC_RemoteDebug>false</DCC_RemoteDebug>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Cfg_2)'!=''">
+        <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
+        <DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
+        <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
+        <DCC_DebugInformation>false</DCC_DebugInformation>
+    </PropertyGroup>
+    <ItemGroup>
+        <DelphiCompile Include="$(MainSource)">
+            <MainSource>MainSource</MainSource>
+        </DelphiCompile>
+        <DCCReference Include="..\..\..\Src\Curl.Easy.pas"/>
+        <DCCReference Include="..\..\..\Src\Curl.Lib.pas"/>
+        <DCCReference Include="..\..\..\Src\Curl.Interfaces.pas"/>
+        <BuildConfiguration Include="Release">
+            <Key>Cfg_2</Key>
+            <CfgParent>Base</CfgParent>
+        </BuildConfiguration>
+        <BuildConfiguration Include="Base">
+            <Key>Base</Key>
+        </BuildConfiguration>
+        <BuildConfiguration Include="Debug">
+            <Key>Cfg_1</Key>
+            <CfgParent>Base</CfgParent>
+        </BuildConfiguration>
+    </ItemGroup>
+    <ProjectExtensions>
+        <Borland.Personality>Delphi.Personality.12</Borland.Personality>
+        <Borland.ProjectType/>
+        <BorlandProject>
+            <Delphi.Personality>
+                <Source>
+                    <Source Name="MainSource">Readme.dpr</Source>
+                </Source>
+                <VersionInfo>
+                    <VersionInfo Name="IncludeVerInfo">False</VersionInfo>
+                    <VersionInfo Name="AutoIncBuild">False</VersionInfo>
+                    <VersionInfo Name="MajorVer">1</VersionInfo>
+                    <VersionInfo Name="MinorVer">0</VersionInfo>
+                    <VersionInfo Name="Release">0</VersionInfo>
+                    <VersionInfo Name="Build">0</VersionInfo>
+                    <VersionInfo Name="Debug">False</VersionInfo>
+                    <VersionInfo Name="PreRelease">False</VersionInfo>
+                    <VersionInfo Name="Special">False</VersionInfo>
+                    <VersionInfo Name="Private">False</VersionInfo>
+                    <VersionInfo Name="DLL">False</VersionInfo>
+                    <VersionInfo Name="Locale">3072</VersionInfo>
+                    <VersionInfo Name="CodePage">1251</VersionInfo>
+                </VersionInfo>
+                <VersionInfoKeys>
+                    <VersionInfoKeys Name="CompanyName"/>
+                    <VersionInfoKeys Name="FileDescription"/>
+                    <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
+                    <VersionInfoKeys Name="InternalName"/>
+                    <VersionInfoKeys Name="LegalCopyright"/>
+                    <VersionInfoKeys Name="LegalTrademarks"/>
+                    <VersionInfoKeys Name="OriginalFilename"/>
+                    <VersionInfoKeys Name="ProductName"/>
+                    <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
+                    <VersionInfoKeys Name="Comments"/>
+                    <VersionInfoKeys Name="CFBundleName"/>
+                    <VersionInfoKeys Name="CFBundleDisplayName"/>
+                    <VersionInfoKeys Name="UIDeviceFamily"/>
+                    <VersionInfoKeys Name="CFBundleIdentifier"/>
+                    <VersionInfoKeys Name="CFBundleVersion"/>
+                    <VersionInfoKeys Name="CFBundlePackageType"/>
+                    <VersionInfoKeys Name="CFBundleSignature"/>
+                    <VersionInfoKeys Name="CFBundleAllowMixedLocalizations"/>
+                    <VersionInfoKeys Name="UISupportedInterfaceOrientations"/>
+                    <VersionInfoKeys Name="CFBundleExecutable"/>
+                    <VersionInfoKeys Name="CFBundleResourceSpecification"/>
+                    <VersionInfoKeys Name="LSRequiresIPhoneOS"/>
+                    <VersionInfoKeys Name="CFBundleInfoDictionaryVersion"/>
+                    <VersionInfoKeys Name="CFBundleDevelopmentRegion"/>
+                </VersionInfoKeys>
+            </Delphi.Personality>
+            <Deployment/>
+            <Platforms>
+                <Platform value="iOSDevice">False</Platform>
+                <Platform value="iOSSimulator">False</Platform>
+                <Platform value="OSX32">False</Platform>
+                <Platform value="Win32">True</Platform>
+                <Platform value="Win64">False</Platform>
+            </Platforms>
+        </BorlandProject>
+        <ProjectFileVersion>12</ProjectFileVersion>
+    </ProjectExtensions>
+    <Import Project="$(BDS)\Bin\CodeGear.Delphi.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')"/>
+    <Import Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj" Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')"/>
+</Project>
diff --git a/Examples/Easy_Http/Readme/Readme.res b/Examples/Easy_Http/Readme/Readme.res
diff --git a/Examples/Easy_Http/Simple/Simple.dpr b/Examples/Easy_Http/Simple/Simple.dpr
@@ -29,7 +29,7 @@ begin
         .Perform;
 
     // Check for some info
-    code := curl.GetResponseCode;
+    code := curl.ResponseCode;
     ul := curl.GetInfo(CURLINFO_SIZE_UPLOAD_T);
     dl := curl.GetInfo(CURLINFO_SIZE_DOWNLOAD_T);
     effurl := curl.GetInfo(CURLINFO_EFFECTIVE_URL);
diff --git a/Examples/Easy_Http/StreamedDl/StreamedDl.dpr b/Examples/Easy_Http/StreamedDl/StreamedDl.dpr
@@ -9,7 +9,6 @@ uses
   System.SysUtils,
   Curl.Easy in '..\..\..\Src\Curl.Easy.pas',
   Curl.Lib in '..\..\..\Src\Curl.Lib.pas',
-  Curl.RawByteStream in '..\..\..\Src\Curl.RawByteStream.pas',
   Curl.Interfaces in '..\..\..\Src\Curl.Interfaces.pas';
 
 const
@@ -40,7 +39,7 @@ begin
     Writeln(Copy(rbs.Data, 1, 1000));
 
     // Check for some info
-    code := curl.GetResponseCode;
+    code := curl.ResponseCode;
     Writeln(Format('HTTP response code: %d', [ code ] ));
   except
     on e : Exception do
diff --git a/Examples/Easy_Http/StreamedDl/StreamedDl.dproj b/Examples/Easy_Http/StreamedDl/StreamedDl.dproj
@@ -86,7 +86,6 @@
         </DelphiCompile>
         <DCCReference Include="..\..\..\Src\Curl.Easy.pas"/>
         <DCCReference Include="..\..\..\Src\Curl.Lib.pas"/>
-        <DCCReference Include="..\..\..\Src\Curl.RawByteStream.pas"/>
         <DCCReference Include="..\..\..\Src\Curl.Interfaces.pas"/>
         <BuildConfiguration Include="Release">
             <Key>Cfg_2</Key>
diff --git a/Examples/Raw_Http/AplusB_Post/AplusB_Post.dpr b/Examples/Raw_Http/AplusB_Post/AplusB_Post.dpr
@@ -4,7 +4,6 @@ uses
   Vcl.Forms,
   f_Main in 'f_Main.pas' {fmMain},
   Curl.Lib in '..\..\..\Src\Curl.Lib.pas',
-  Curl.RawByteStream in '..\..\..\Src\Curl.RawByteStream.pas',
   Curl.Slist in '..\..\..\Src\Curl.Slist.pas',
   Curl.Interfaces in '..\..\..\Src\Curl.Interfaces.pas';
 
diff --git a/Examples/Raw_Http/AplusB_Post/AplusB_Post.dproj b/Examples/Raw_Http/AplusB_Post/AplusB_Post.dproj
@@ -94,7 +94,6 @@
             <FormType>dfm</FormType>
         </DCCReference>
         <DCCReference Include="..\..\..\Src\Curl.Lib.pas"/>
-        <DCCReference Include="..\..\..\Src\Curl.RawByteStream.pas"/>
         <DCCReference Include="..\..\..\Src\Curl.Slist.pas"/>
         <DCCReference Include="..\..\..\Src\Curl.Interfaces.pas"/>
         <BuildConfiguration Include="Release">
diff --git a/Examples/Raw_Http/AplusB_Post/f_Main.pas b/Examples/Raw_Http/AplusB_Post/f_Main.pas
@@ -29,7 +29,7 @@   TfmMain = class(TForm)
 implementation
 
 uses
-  Curl.Lib, Curl.RawByteStream;
+  Curl.Lib, Curl.Interfaces;
 
 {$R *.dfm}
 
diff --git a/Src/Curl.Easy.pas b/Src/Curl.Easy.pas
diff --git a/Src/Curl.Interfaces.pas b/Src/Curl.Interfaces.pas
diff --git a/Src/Curl.RawByteStream.pas b/Src/Curl.RawByteStream.pas
diff --git a/readme.md b/readme.md
