Menu
▾
▴
[JVCL-Checkins] SF.net SVN: jvcl:[13371] trunk/jvcl
|
From: <jfu...@us...> - 2012-06-23 15:47:05
|
Revision: 13371
http://jvcl.svn.sourceforge.net/jvcl/?rev=13371&view=rev
Author: jfudickar
Date: 2012-06-23 15:46:57 +0000 (Sat, 23 Jun 2012)
Log Message:
-----------
DEFINE USE_3RDPARTY_CORELAB_ODAC renamed to USE_3RDPARTY_DEVART_ODAC
Modified Paths:
--------------
trunk/jvcl/common/jvclbase.inc
trunk/jvcl/common/jvclc6.inc
trunk/jvcl/common/jvcld10.inc
trunk/jvcl/common/jvcld11.inc
trunk/jvcl/common/jvcld12.inc
trunk/jvcl/common/jvcld14.inc
trunk/jvcl/common/jvcld15.inc
trunk/jvcl/common/jvcld16.inc
trunk/jvcl/common/jvcld16_x64.inc
trunk/jvcl/common/jvcld6.inc
trunk/jvcl/common/jvcld7.inc
trunk/jvcl/common/jvcld9.inc
trunk/jvcl/packages/xml/JvDB-R.xml
trunk/jvcl/run/JvDBActionsEngineDatasetOdac.pas
trunk/jvcl/run/JvDBLogonDialogOdac.pas
trunk/jvcl/run/JvDBPasswordDialogOdac.pas
trunk/jvcl/run/JvOdacSmartQuery.pas
Modified: trunk/jvcl/common/jvclbase.inc
===================================================================
--- trunk/jvcl/common/jvclbase.inc 2012-06-23 15:40:43 UTC (rev 13370)
+++ trunk/jvcl/common/jvclbase.inc 2012-06-23 15:46:57 UTC (rev 13371)
@@ -154,9 +154,9 @@
For further informations have a look at http://www.allroundautomations.com }
{.$DEFINE USE_3RDPARTY_DOA}
-{ Activates Support for the CoreLabs VCL Oracle Data Access Components
-For further informations have a look at http://www.crlab.com }
-{.$DEFINE USE_3RDPARTY_CORELAB_ODAC}
+{ Activates Support for the DevArt VCL Oracle Data Access Components
+For further informations have a look at http://www.devart.com }
+{.$DEFINE USE_3RDPARTY_DEVART_ODAC}
{ Activates Support for the DevArt VCL Universal Data Access Components
For further informations have a look at http://www.devart.com }
Modified: trunk/jvcl/common/jvclc6.inc
===================================================================
--- trunk/jvcl/common/jvclc6.inc 2012-06-23 15:40:43 UTC (rev 13370)
+++ trunk/jvcl/common/jvclc6.inc 2012-06-23 15:46:57 UTC (rev 13371)
@@ -154,9 +154,9 @@
For further informations have a look at http://www.allroundautomations.com }
{.$DEFINE USE_3RDPARTY_DOA}
-{ Activates Support for the CoreLabs VCL Oracle Data Access Components
-For further informations have a look at http://www.crlab.com }
-{.$DEFINE USE_3RDPARTY_CORELAB_ODAC}
+{ Activates Support for the DevArt VCL Oracle Data Access Components
+For further informations have a look at http://www.devart.com }
+{.$DEFINE USE_3RDPARTY_DEVART_ODAC}
{ Activates Support for the DevArt VCL Universal Data Access Components
For further informations have a look at http://www.devart.com }
Modified: trunk/jvcl/common/jvcld10.inc
===================================================================
--- trunk/jvcl/common/jvcld10.inc 2012-06-23 15:40:43 UTC (rev 13370)
+++ trunk/jvcl/common/jvcld10.inc 2012-06-23 15:46:57 UTC (rev 13371)
@@ -154,9 +154,9 @@
For further informations have a look at http://www.allroundautomations.com }
{.$DEFINE USE_3RDPARTY_DOA}
-{ Activates Support for the CoreLabs VCL Oracle Data Access Components
-For further informations have a look at http://www.crlab.com }
-{.$DEFINE USE_3RDPARTY_CORELAB_ODAC}
+{ Activates Support for the DevArt VCL Oracle Data Access Components
+For further informations have a look at http://www.devart.com }
+{.$DEFINE USE_3RDPARTY_DEVART_ODAC}
{ Activates Support for the DevArt VCL Universal Data Access Components
For further informations have a look at http://www.devart.com }
Modified: trunk/jvcl/common/jvcld11.inc
===================================================================
--- trunk/jvcl/common/jvcld11.inc 2012-06-23 15:40:43 UTC (rev 13370)
+++ trunk/jvcl/common/jvcld11.inc 2012-06-23 15:46:57 UTC (rev 13371)
@@ -154,9 +154,9 @@
For further informations have a look at http://www.allroundautomations.com }
{.$DEFINE USE_3RDPARTY_DOA}
-{ Activates Support for the CoreLabs VCL Oracle Data Access Components
-For further informations have a look at http://www.crlab.com }
-{.$DEFINE USE_3RDPARTY_CORELAB_ODAC}
+{ Activates Support for the DevArt VCL Oracle Data Access Components
+For further informations have a look at http://www.devart.com }
+{.$DEFINE USE_3RDPARTY_DEVART_ODAC}
{ Activates Support for the DevArt VCL Universal Data Access Components
For further informations have a look at http://www.devart.com }
Modified: trunk/jvcl/common/jvcld12.inc
===================================================================
--- trunk/jvcl/common/jvcld12.inc 2012-06-23 15:40:43 UTC (rev 13370)
+++ trunk/jvcl/common/jvcld12.inc 2012-06-23 15:46:57 UTC (rev 13371)
@@ -154,9 +154,9 @@
For further informations have a look at http://www.allroundautomations.com }
{.$DEFINE USE_3RDPARTY_DOA}
-{ Activates Support for the CoreLabs VCL Oracle Data Access Components
-For further informations have a look at http://www.crlab.com }
-{.$DEFINE USE_3RDPARTY_CORELAB_ODAC}
+{ Activates Support for the DevArt VCL Oracle Data Access Components
+For further informations have a look at http://www.devart.com }
+{.$DEFINE USE_3RDPARTY_DEVART_ODAC}
{ Activates Support for the DevArt VCL Universal Data Access Components
For further informations have a look at http://www.devart.com }
Modified: trunk/jvcl/common/jvcld14.inc
===================================================================
--- trunk/jvcl/common/jvcld14.inc 2012-06-23 15:40:43 UTC (rev 13370)
+++ trunk/jvcl/common/jvcld14.inc 2012-06-23 15:46:57 UTC (rev 13371)
@@ -154,9 +154,9 @@
For further informations have a look at http://www.allroundautomations.com }
{.$DEFINE USE_3RDPARTY_DOA}
-{ Activates Support for the CoreLabs VCL Oracle Data Access Components
-For further informations have a look at http://www.crlab.com }
-{.$DEFINE USE_3RDPARTY_CORELAB_ODAC}
+{ Activates Support for the DevArt VCL Oracle Data Access Components
+For further informations have a look at http://www.devart.com }
+{.$DEFINE USE_3RDPARTY_DEVART_ODAC}
{ Activates Support for the DevArt VCL Universal Data Access Components
For further informations have a look at http://www.devart.com }
Modified: trunk/jvcl/common/jvcld15.inc
===================================================================
--- trunk/jvcl/common/jvcld15.inc 2012-06-23 15:40:43 UTC (rev 13370)
+++ trunk/jvcl/common/jvcld15.inc 2012-06-23 15:46:57 UTC (rev 13371)
@@ -154,9 +154,9 @@
For further informations have a look at http://www.allroundautomations.com }
{.$DEFINE USE_3RDPARTY_DOA}
-{ Activates Support for the CoreLabs VCL Oracle Data Access Components
-For further informations have a look at http://www.crlab.com }
-{.$DEFINE USE_3RDPARTY_CORELAB_ODAC}
+{ Activates Support for the DevArt VCL Oracle Data Access Components
+For further informations have a look at http://www.devart.com }
+{.$DEFINE USE_3RDPARTY_DEVART_ODAC}
{ Activates Support for the DevArt VCL Universal Data Access Components
For further informations have a look at http://www.devart.com }
Modified: trunk/jvcl/common/jvcld16.inc
===================================================================
--- trunk/jvcl/common/jvcld16.inc 2012-06-23 15:40:43 UTC (rev 13370)
+++ trunk/jvcl/common/jvcld16.inc 2012-06-23 15:46:57 UTC (rev 13371)
@@ -154,9 +154,9 @@
For further informations have a look at http://www.allroundautomations.com }
{.$DEFINE USE_3RDPARTY_DOA}
-{ Activates Support for the CoreLabs VCL Oracle Data Access Components
-For further informations have a look at http://www.crlab.com }
-{.$DEFINE USE_3RDPARTY_CORELAB_ODAC}
+{ Activates Support for the DevArt VCL Oracle Data Access Components
+For further informations have a look at http://www.devart.com }
+{.$DEFINE USE_3RDPARTY_DEVART_ODAC}
{ Activates Support for the DevArt VCL Universal Data Access Components
For further informations have a look at http://www.devart.com }
Modified: trunk/jvcl/common/jvcld16_x64.inc
===================================================================
--- trunk/jvcl/common/jvcld16_x64.inc 2012-06-23 15:40:43 UTC (rev 13370)
+++ trunk/jvcl/common/jvcld16_x64.inc 2012-06-23 15:46:57 UTC (rev 13371)
@@ -154,9 +154,9 @@
For further informations have a look at http://www.allroundautomations.com }
{.$DEFINE USE_3RDPARTY_DOA}
-{ Activates Support for the CoreLabs VCL Oracle Data Access Components
-For further informations have a look at http://www.crlab.com }
-{.$DEFINE USE_3RDPARTY_CORELAB_ODAC}
+{ Activates Support for the DevArt VCL Oracle Data Access Components
+For further informations have a look at http://www.devart.com }
+{.$DEFINE USE_3RDPARTY_DEVART_ODAC}
{ Activates Support for the DevArt VCL Universal Data Access Components
For further informations have a look at http://www.devart.com }
Modified: trunk/jvcl/common/jvcld6.inc
===================================================================
--- trunk/jvcl/common/jvcld6.inc 2012-06-23 15:40:43 UTC (rev 13370)
+++ trunk/jvcl/common/jvcld6.inc 2012-06-23 15:46:57 UTC (rev 13371)
@@ -154,9 +154,9 @@
For further informations have a look at http://www.allroundautomations.com }
{.$DEFINE USE_3RDPARTY_DOA}
-{ Activates Support for the CoreLabs VCL Oracle Data Access Components
-For further informations have a look at http://www.crlab.com }
-{.$DEFINE USE_3RDPARTY_CORELAB_ODAC}
+{ Activates Support for the DevArt VCL Oracle Data Access Components
+For further informations have a look at http://www.devart.com }
+{.$DEFINE USE_3RDPARTY_DEVART_ODAC}
{ Activates Support for the DevArt VCL Universal Data Access Components
For further informations have a look at http://www.devart.com }
Modified: trunk/jvcl/common/jvcld7.inc
===================================================================
--- trunk/jvcl/common/jvcld7.inc 2012-06-23 15:40:43 UTC (rev 13370)
+++ trunk/jvcl/common/jvcld7.inc 2012-06-23 15:46:57 UTC (rev 13371)
@@ -154,9 +154,9 @@
For further informations have a look at http://www.allroundautomations.com }
{.$DEFINE USE_3RDPARTY_DOA}
-{ Activates Support for the CoreLabs VCL Oracle Data Access Components
-For further informations have a look at http://www.crlab.com }
-{.$DEFINE USE_3RDPARTY_CORELAB_ODAC}
+{ Activates Support for the DevArt VCL Oracle Data Access Components
+For further informations have a look at http://www.devart.com }
+{.$DEFINE USE_3RDPARTY_DEVART_ODAC}
{ Activates Support for the DevArt VCL Universal Data Access Components
For further informations have a look at http://www.devart.com }
Modified: trunk/jvcl/common/jvcld9.inc
===================================================================
--- trunk/jvcl/common/jvcld9.inc 2012-06-23 15:40:43 UTC (rev 13370)
+++ trunk/jvcl/common/jvcld9.inc 2012-06-23 15:46:57 UTC (rev 13371)
@@ -154,9 +154,9 @@
For further informations have a look at http://www.allroundautomations.com }
{.$DEFINE USE_3RDPARTY_DOA}
-{ Activates Support for the CoreLabs VCL Oracle Data Access Components
-For further informations have a look at http://www.crlab.com }
-{.$DEFINE USE_3RDPARTY_CORELAB_ODAC}
+{ Activates Support for the DevArt VCL Oracle Data Access Components
+For further informations have a look at http://www.devart.com }
+{.$DEFINE USE_3RDPARTY_DEVART_ODAC}
{ Activates Support for the DevArt VCL Universal Data Access Components
For further informations have a look at http://www.devart.com }
Modified: trunk/jvcl/packages/xml/JvDB-R.xml
===================================================================
--- trunk/jvcl/packages/xml/JvDB-R.xml 2012-06-23 15:40:43 UTC (rev 13370)
+++ trunk/jvcl/packages/xml/JvDB-R.xml 2012-06-23 15:46:57 UTC (rev 13371)
@@ -49,15 +49,15 @@
<Package Name="DOA41D2006" Targets="d11" Condition="USE_3RDPARTY_DOA"/>
<Package Name="DOA41D2009" Targets="d12" Condition="USE_3RDPARTY_DOA"/>
<Package Name="DOA41D2010" Targets="d14" Condition="USE_3RDPARTY_DOA"/>
- <Package Name="ODAC60" Targets="d6,c6" Condition="USE_3RDPARTY_CORELAB_ODAC"/>
- <Package Name="ODAC70" Targets="d7" Condition="USE_3RDPARTY_CORELAB_ODAC"/>
- <Package Name="ODAC90" Targets="d9" Condition="USE_3RDPARTY_CORELAB_ODAC"/>
- <Package Name="ODAC100" Targets="d10" Condition="USE_3RDPARTY_CORELAB_ODAC"/>
- <Package Name="ODAC105" Targets="d11" Condition="USE_3RDPARTY_CORELAB_ODAC"/>
- <Package Name="ODAC120" Targets="d12" Condition="USE_3RDPARTY_CORELAB_ODAC"/>
- <Package Name="ODAC140" Targets="d14" Condition="USE_3RDPARTY_CORELAB_ODAC"/>
- <Package Name="ODAC150" Targets="d15" Condition="USE_3RDPARTY_CORELAB_ODAC"/>
- <Package Name="ODAC160" Targets="d16" Condition="USE_3RDPARTY_CORELAB_ODAC"/>
+ <Package Name="ODAC60" Targets="d6,c6" Condition="USE_3RDPARTY_DEVART_ODAC"/>
+ <Package Name="ODAC70" Targets="d7" Condition="USE_3RDPARTY_DEVART_ODAC"/>
+ <Package Name="ODAC90" Targets="d9" Condition="USE_3RDPARTY_DEVART_ODAC"/>
+ <Package Name="ODAC100" Targets="d10" Condition="USE_3RDPARTY_DEVART_ODAC"/>
+ <Package Name="ODAC105" Targets="d11" Condition="USE_3RDPARTY_DEVART_ODAC"/>
+ <Package Name="ODAC120" Targets="d12" Condition="USE_3RDPARTY_DEVART_ODAC"/>
+ <Package Name="ODAC140" Targets="d14" Condition="USE_3RDPARTY_DEVART_ODAC"/>
+ <Package Name="ODAC150" Targets="d15" Condition="USE_3RDPARTY_DEVART_ODAC"/>
+ <Package Name="ODAC160" Targets="d16" Condition="USE_3RDPARTY_DEVART_ODAC"/>
<Package Name="UNIDAC70" Targets="d7" Condition="USE_3RDPARTY_DEVART_UNIDAC"/>
<Package Name="UNIDAC90" Targets="d9" Condition="USE_3RDPARTY_DEVART_UNIDAC"/>
<Package Name="UNIDAC100" Targets="d10" Condition="USE_3RDPARTY_DEVART_UNIDAC"/>
@@ -166,7 +166,7 @@
<File Name="..\..\run\JvDBActionsEngine.pas" Targets="DB,help" Formname="" Condition=""/>
<File Name="..\..\run\JvDBActionsEngineDatasetCSVDataset.pas" Targets="DB,help" Formname="" Condition=""/>
<File Name="..\..\run\JvDBActionsEngineDatasetDoa.pas" Targets="DB,help" Formname="" Condition="USE_3RDPARTY_DOA || HELP"/>
- <File Name="..\..\run\JvDBActionsEngineDatasetOdac.pas" Targets="DB,help" Formname="" Condition="USE_3RDPARTY_CORELAB_ODAC || HELP"/>
+ <File Name="..\..\run\JvDBActionsEngineDatasetOdac.pas" Targets="DB,help" Formname="" Condition="USE_3RDPARTY_DEVART_ODAC || HELP"/>
<File Name="..\..\run\JvDBCombobox.pas" Targets="DB,help" Formname="" Condition=""/>
<File Name="..\..\run\JvDBControls.pas" Targets="DB,help" Formname="" Condition=""/>
<File Name="..\..\run\JvDBDatePickerEdit.pas" Targets="DB,help" Formname="" Condition=""/>
@@ -178,10 +178,10 @@
<File Name="..\..\run\JvBaseDBPasswordDialog.pas" Targets="DB,help" Formname="" Condition=""/>
<File Name="..\..\run\JvBaseDBLogonDialog.pas" Targets="DB,help" Formname="" Condition=""/>
<File Name="..\..\run\JvDBLogonDialogDoa.pas" Targets="DB,help" Formname="" Condition="USE_3RDPARTY_DOA || HELP"/>
- <File Name="..\..\run\JvDBLogonDialogOdac.pas" Targets="DB,help" Formname="" Condition="USE_3RDPARTY_CORELAB_ODAC || HELP"/>
+ <File Name="..\..\run\JvDBLogonDialogOdac.pas" Targets="DB,help" Formname="" Condition="USE_3RDPARTY_DEVART_ODAC || HELP"/>
<File Name="..\..\run\JvDBLookupTreeView.pas" Targets="DB,help" Formname="" Condition=""/>
<File Name="..\..\run\JvDBPasswordDialogDoa.pas" Targets="DB,help" Formname="" Condition="USE_3RDPARTY_DOA || HELP"/>
- <File Name="..\..\run\JvDBPasswordDialogOdac.pas" Targets="DB,help" Formname="" Condition="USE_3RDPARTY_CORELAB_ODAC || HELP"/>
+ <File Name="..\..\run\JvDBPasswordDialogOdac.pas" Targets="DB,help" Formname="" Condition="USE_3RDPARTY_DEVART_ODAC || HELP"/>
<File Name="..\..\run\JvDBProgressBar.pas" Targets="DB,help" Formname="" Condition=""/>
<File Name="..\..\run\JvDBQueryParamsForm.pas" Targets="DB,help" Formname="JvQueryParamsDialog" Condition=""/>
<File Name="..\..\run\JvDBRadioPanel.pas" Targets="DB,help" Formname="" Condition=""/>
@@ -209,7 +209,7 @@
<File Name="..\..\run\JvDynControlEngineVCLDB.pas" Targets="DB,help" Formname="" Condition=""/>
<File Name="..\..\run\JvDynControlEngineJVCLDB.pas" Targets="DB,help" Formname="" Condition=""/>
<File Name="..\..\run\JvOracleDataset.pas" Targets="DB,help" Formname="" Condition="USE_3RDPARTY_DOA || HELP"/>
- <File Name="..\..\run\JvOdacSmartQuery.pas" Targets="DB,help" Formname="" Condition="USE_3RDPARTY_CORELAB_ODAC || HELP"/>
+ <File Name="..\..\run\JvOdacSmartQuery.pas" Targets="DB,help" Formname="" Condition="USE_3RDPARTY_DEVART_ODAC || HELP"/>
<File Name="..\..\run\JvDBCheckBox.pas" Targets="DB,help" Formname="" Condition=""/>
<File Name="..\..\run\JvDBFilterExpr.pas" Targets="DB,help" Formname="" Condition=""/>
<File Name="..\..\run\JvADOQuery.pas" Targets="DB,help" Formname="" Condition=""/>
Modified: trunk/jvcl/run/JvDBActionsEngineDatasetOdac.pas
===================================================================
--- trunk/jvcl/run/JvDBActionsEngineDatasetOdac.pas 2012-06-23 15:40:43 UTC (rev 13370)
+++ trunk/jvcl/run/JvDBActionsEngineDatasetOdac.pas 2012-06-23 15:46:57 UTC (rev 13371)
@@ -36,7 +36,7 @@
Classes, DB,
JvDBActionsEngine;
-{$IFDEF USE_3RDPARTY_CORELAB_ODAC}
+{$IFDEF USE_3RDPARTY_DEVART_ODAC}
type
TJvDatabaseActionOdacDatasetEngine = class(TJvDatabaseActionBaseDatasetEngine)
public
@@ -47,7 +47,7 @@
function SupportsRefreshRecord(AActionComponent : TComponent): Boolean;
override;
end;
-{$ENDIF USE_3RDPARTY_CORELAB_ODAC}
+{$ENDIF USE_3RDPARTY_DEVART_ODAC}
{$IFDEF UNITVERSIONING}
const
@@ -61,7 +61,7 @@
implementation
-{$IFDEF USE_3RDPARTY_CORELAB_ODAC}
+{$IFDEF USE_3RDPARTY_DEVART_ODAC}
uses
DBAccess, SysUtils, Variants;
@@ -127,13 +127,13 @@
Result := True;
end;
-{$ENDIF USE_3RDPARTY_CORELAB_ODAC}
+{$ENDIF USE_3RDPARTY_DEVART_ODAC}
procedure InitActionEngineList;
begin
- {$IFDEF USE_3RDPARTY_CORELAB_ODAC}
+ {$IFDEF USE_3RDPARTY_DEVART_ODAC}
RegisterDatabaseActionEngine(TJvDatabaseActionOdacDatasetEngine);
- {$ENDIF USE_3RDPARTY_CORELAB_ODAC}
+ {$ENDIF USE_3RDPARTY_DEVART_ODAC}
end;
initialization
Modified: trunk/jvcl/run/JvDBLogonDialogOdac.pas
===================================================================
--- trunk/jvcl/run/JvDBLogonDialogOdac.pas 2012-06-23 15:40:43 UTC (rev 13370)
+++ trunk/jvcl/run/JvDBLogonDialogOdac.pas 2012-06-23 15:46:57 UTC (rev 13371)
@@ -33,14 +33,14 @@
{$IFDEF UNITVERSIONING}
JclUnitVersioning,
{$ENDIF UNITVERSIONING}
- {$IFDEF USE_3RDPARTY_CORELAB_ODAC}
+ {$IFDEF USE_3RDPARTY_DEVART_ODAC}
Classes, Forms, Controls, DBAccess, Ora,
JvAppStorage, JvBaseDBLogonDialog,
JvDynControlEngine, JvBaseDBPasswordDialog,
- {$ENDIF USE_3RDPARTY_CORELAB_ODAC}
+ {$ENDIF USE_3RDPARTY_DEVART_ODAC}
JvDynControlEngineIntf;
-{$IFDEF USE_3RDPARTY_CORELAB_ODAC}
+{$IFDEF USE_3RDPARTY_DEVART_ODAC}
type
TJvOdacOracleConnectionInfo = class(TJvBaseOracleConnectionInfo)
@@ -179,7 +179,7 @@
property OnSessionConnect: TJvLogonDialogBaseSessionEvent read
GetOnSessionConnect write SetOnSessionConnect;
end;
-{$ENDIF USE_3RDPARTY_CORELAB_ODAC}
+{$ENDIF USE_3RDPARTY_DEVART_ODAC}
{$IFDEF UNITVERSIONING}
const
@@ -193,7 +193,7 @@
implementation
-{$IFDEF USE_3RDPARTY_CORELAB_ODAC}
+{$IFDEF USE_3RDPARTY_DEVART_ODAC}
uses
SysUtils, StdCtrls, Dialogs,
OraClasses, OraError, OraCall, OraServices,
@@ -631,7 +631,7 @@
if Net then
Result := Result + ' - '+RsNetOptionConnectionList;
end;
-{$ENDIF USE_3RDPARTY_CORELAB_ODAC}
+{$ENDIF USE_3RDPARTY_DEVART_ODAC}
{$IFDEF UNITVERSIONING}
initialization
Modified: trunk/jvcl/run/JvDBPasswordDialogOdac.pas
===================================================================
--- trunk/jvcl/run/JvDBPasswordDialogOdac.pas 2012-06-23 15:40:43 UTC (rev 13370)
+++ trunk/jvcl/run/JvDBPasswordDialogOdac.pas 2012-06-23 15:46:57 UTC (rev 13371)
@@ -32,13 +32,13 @@
{$IFDEF UNITVERSIONING}
JclUnitVersioning,
{$ENDIF UNITVERSIONING}
- {$IFDEF USE_3RDPARTY_CORELAB_ODAC}
+ {$IFDEF USE_3RDPARTY_DEVART_ODAC}
Classes,
Ora, dbaccess,
- {$ENDIF USE_3RDPARTY_CORELAB_ODAC}
+ {$ENDIF USE_3RDPARTY_DEVART_ODAC}
JvBaseDBPasswordDialog;
-{$IFDEF USE_3RDPARTY_CORELAB_ODAC}
+{$IFDEF USE_3RDPARTY_DEVART_ODAC}
type
{$IFDEF RTL230_UP}
[ComponentPlatformsAttribute(pidWin32 or pidWin64)]
@@ -54,7 +54,7 @@
published
property Session: TCustomDAConnection read GetSession write SetSession;
end;
-{$ENDIF USE_3RDPARTY_CORELAB_ODAC}
+{$ENDIF USE_3RDPARTY_DEVART_ODAC}
{$IFDEF UNITVERSIONING}
const
@@ -68,7 +68,7 @@
implementation
-{$IFDEF USE_3RDPARTY_CORELAB_ODAC}
+{$IFDEF USE_3RDPARTY_DEVART_ODAC}
uses
SysUtils, Types;
@@ -103,7 +103,7 @@
begin
inherited SetSession(Value);
end;
-{$ENDIF USE_3RDPARTY_CORELAB_ODAC}
+{$ENDIF USE_3RDPARTY_DEVART_ODAC}
{$IFDEF UNITVERSIONING}
initialization
Modified: trunk/jvcl/run/JvOdacSmartQuery.pas
===================================================================
--- trunk/jvcl/run/JvOdacSmartQuery.pas 2012-06-23 15:40:43 UTC (rev 13370)
+++ trunk/jvcl/run/JvOdacSmartQuery.pas 2012-06-23 15:46:57 UTC (rev 13371)
@@ -31,7 +31,7 @@
interface
-{$IFDEF USE_3RDPARTY_CORELAB_ODAC}
+{$IFDEF USE_3RDPARTY_DEVART_ODAC}
uses
{$IFDEF UNITVERSIONING}
JclUnitVersioning,
@@ -39,9 +39,9 @@
SysUtils, Classes, Forms, Controls, DB,
OraSmart, Ora, DBaccess,
JvBaseDBThreadedDataset;
-{$ENDIF USE_3RDPARTY_CORELAB_ODAC}
+{$ENDIF USE_3RDPARTY_DEVART_ODAC}
-{$IFDEF USE_3RDPARTY_CORELAB_ODAC}
+{$IFDEF USE_3RDPARTY_DEVART_ODAC}
type
TJvOdacThreadedDatasetAllowedContinueRecordFetchOptions =
class(TJvBaseThreadedDatasetAllowedContinueRecordFetchOptions)
@@ -318,11 +318,11 @@
LogPath: 'JVCL\run'
);
{$ENDIF UNITVERSIONING}
-{$ENDIF USE_3RDPARTY_CORELAB_ODAC}
+{$ENDIF USE_3RDPARTY_DEVART_ODAC}
implementation
-{$IFDEF USE_3RDPARTY_CORELAB_ODAC}
+{$IFDEF USE_3RDPARTY_DEVART_ODAC}
uses Variants, MemData;
//=== { TJvOdacSmartQuery } ==================================================
@@ -1381,6 +1381,6 @@
finalization
UnregisterUnitVersion(HInstance);
{$ENDIF UNITVERSIONING}
-{$ENDIF USE_3RDPARTY_CORELAB_ODAC}
+{$ENDIF USE_3RDPARTY_DEVART_ODAC}
end.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|