instantobjects-cvscommit

[Carlo B. <car...@us...>]

Update of /cvsroot/instantobjects/Demos/PrimerCross
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4987/Demos/PrimerCross

Modified Files:
	CompanyBrowse.pas CompanyEdit.pas ContactBrowse.pas 
	ContactEdit.pas ContactFilterEdit.pas ContactSort.pas 
	ContactView.pas CountryBrowse.pas DemoData.pas Main.pas 
	MainData.pas PerformanceView.pas PersonBrowse.pas 
	PersonEdit.pas Primer.cfg Primer.dof Primer.dpr 
	PrimerExternal.cfg PrimerExternal.dpr PrimerExternal.mdr 
	Welcome.dfm Welcome.pas 
Removed Files:
	Model.pas ModelExternal.pas 
Log Message:
PrimerCross Demo with internal and external storage of Part and Parts: internal Model.pas is now located in Model forlder; external Model.pas is now located in ExternalModel forlder

Index: PerformanceView.pas
===================================================================
RCS file: /cvsroot/instantobjects/Demos/PrimerCross/PerformanceView.pas,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PerformanceView.pas	6 Dec 2004 08:49:15 -0000	1.4
--- PerformanceView.pas	7 Dec 2004 08:45:33 -0000	1.5
***************
*** 171,176 ****
  
  uses
! {$IFDEF EXTERNALSTORAGE}ModelExternal,{$ELSE}Model,{$ENDIF}
!   DemoData, IniFiles, Utility;
  
  { TTestResult }
--- 171,175 ----
  
  uses
!   Model, DemoData, IniFiles, Utility;
  
  { TTestResult }

Index: ContactBrowse.pas
===================================================================
RCS file: /cvsroot/instantobjects/Demos/PrimerCross/ContactBrowse.pas,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ContactBrowse.pas	6 Dec 2004 08:49:15 -0000	1.2
--- ContactBrowse.pas	7 Dec 2004 08:45:33 -0000	1.3
***************
*** 10,18 ****
  {$ENDIF}
  {$IFDEF LINUX}
!   QGraphics, QControls, QForms, QDialogs, QStdCtrls,
!   QMenus, QImgList, QActnList, QGrids, QDBGrids, QExtCtrls, QComCtrls, QTypes,
  {$ENDIF}
! {$IFDEF EXTERNALSTORAGE}ModelExternal,{$ELSE}Model,{$ENDIF}
!   BasicBrowse, DB, InstantPresentation;
    
  type
--- 10,17 ----
  {$ENDIF}
  {$IFDEF LINUX}
!   QGraphics, QControls, QForms, QDialogs, QStdCtrls, QTypes,
!   QMenus, QImgList, QActnList, QGrids, QDBGrids, QExtCtrls, QComCtrls,
  {$ENDIF}
!   BasicBrowse, DB, InstantPresentation, Model;
    
  type

Index: CompanyEdit.pas
===================================================================
RCS file: /cvsroot/instantobjects/Demos/PrimerCross/CompanyEdit.pas,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CompanyEdit.pas	6 Dec 2004 08:49:15 -0000	1.4
--- CompanyEdit.pas	7 Dec 2004 08:45:33 -0000	1.5
***************
*** 14,19 ****
    QMask, QDBCtrls, QComCtrls, QMenus, QImgList, QActnList, QButtons,
  {$ENDIF}
! {$IFDEF EXTERNALSTORAGE}ModelExternal,{$ELSE}Model,{$ENDIF}
!   ContactEdit, DB, InstantPresentation;
  
  type
--- 14,18 ----
    QMask, QDBCtrls, QComCtrls, QMenus, QImgList, QActnList, QButtons,
  {$ENDIF}
!   ContactEdit, DB, InstantPresentation, Model;
  
  type

Index: Primer.dof
===================================================================
RCS file: /cvsroot/instantobjects/Demos/PrimerCross/Primer.dof,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Primer.dof	17 Nov 2004 20:59:47 -0000	1.3
--- Primer.dof	7 Dec 2004 08:45:33 -0000	1.4
***************
*** 95,100 ****
  PackageDLLOutputDir=
  PackageDCPOutputDir=
! SearchPath=$(DELPHI)\Lib\Debug;..\..\Source\Brokers\DBX;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML
! Packages=VCL50;VCLX50;VCLSMP50;VCLDB50;ibevnt50;VCLBDE50;VCLDBX50;QRPT50;TEEUI50;TEEDB50;TEE50;DSS50;TEEQR50;VCLIB50;VCLMID50;VCLIE50;INETDB50;INET50;NMFAST50;WEBMID50;dclocx50;dclaxserver50;RBTDBC51;RBRCL45;RBCIDE45;RBIDE45;RBBDE45;RBUSER45;RBDB45;dclRBA45;VCLADO50;RBDAD45;dclRBI45;RBDBDE45;RBDIDE45;TSDG5201;TSG5201;vcl;vcldb;bdertl;iobde60
  Conditionals=
  DebugSourceDirs=
--- 95,100 ----
  PackageDLLOutputDir=
  PackageDCPOutputDir=
! SearchPath=$(DELPHI)\Lib\Debug;..\..\Source\Brokers\DBX;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Brokers\UIB
! Packages=
  Conditionals=
  DebugSourceDirs=

Index: Primer.cfg
===================================================================
RCS file: /cvsroot/instantobjects/Demos/PrimerCross/Primer.cfg,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Primer.cfg	29 Jul 2004 20:43:09 -0000	1.2
--- Primer.cfg	7 Dec 2004 08:45:33 -0000	1.3
***************
*** 34,41 ****
  -LE"c:\programmi\borland\delphi7\Projects\Bpl"
  -LN"c:\programmi\borland\delphi7\Projects\Bpl"
! -U"c:\programmi\borland\delphi7\Lib\Debug;..\..\Source\Brokers\DBX;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML"
! -O"c:\programmi\borland\delphi7\Lib\Debug;..\..\Source\Brokers\DBX;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML"
! -I"c:\programmi\borland\delphi7\Lib\Debug;..\..\Source\Brokers\DBX;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML"
! -R"c:\programmi\borland\delphi7\Lib\Debug;..\..\Source\Brokers\DBX;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML"
  -w-UNIT_PLATFORM
  -w-UNSAFE_TYPE
--- 34,41 ----
  -LE"c:\programmi\borland\delphi7\Projects\Bpl"
  -LN"c:\programmi\borland\delphi7\Projects\Bpl"
! -U"c:\programmi\borland\delphi7\Lib\Debug;..\..\Source\Brokers\DBX;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Brokers\UIB"
! -O"c:\programmi\borland\delphi7\Lib\Debug;..\..\Source\Brokers\DBX;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Brokers\UIB"
! -I"c:\programmi\borland\delphi7\Lib\Debug;..\..\Source\Brokers\DBX;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Brokers\UIB"
! -R"c:\programmi\borland\delphi7\Lib\Debug;..\..\Source\Brokers\DBX;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Brokers\UIB"
  -w-UNIT_PLATFORM
  -w-UNSAFE_TYPE

Index: PersonEdit.pas
===================================================================
RCS file: /cvsroot/instantobjects/Demos/PrimerCross/PersonEdit.pas,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PersonEdit.pas	6 Dec 2004 08:49:16 -0000	1.5
--- PersonEdit.pas	7 Dec 2004 08:45:33 -0000	1.6
***************
*** 13,18 ****
    QGrids, QDBGrids, QMask, QDBCtrls, QComCtrls, QButtons, QImgList,
  {$ENDIF}
! {$IFDEF EXTERNALSTORAGE}ModelExternal,{$ELSE}Model,{$ENDIF}
!   ContactEdit, DB, InstantPresentation;
  
  type
--- 13,17 ----
    QGrids, QDBGrids, QMask, QDBCtrls, QComCtrls, QButtons, QImgList,
  {$ENDIF}
!   ContactEdit, DB, InstantPresentation, Model;
  
  type

Index: MainData.pas
===================================================================
RCS file: /cvsroot/instantobjects/Demos/PrimerCross/MainData.pas,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MainData.pas	6 Dec 2004 08:49:15 -0000	1.2
--- MainData.pas	7 Dec 2004 08:45:33 -0000	1.3
***************
*** 34,38 ****
  
  uses
! {$IFDEF EXTERNALSTORAGE}ModelExternal;{$ELSE}Model;{$ENDIF}
  
  {$R *.dfm}
--- 34,38 ----
  
  uses
!   Model;
  
  {$R *.dfm}

Index: PrimerExternal.dpr
===================================================================
RCS file: /cvsroot/instantobjects/Demos/PrimerCross/PrimerExternal.dpr,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PrimerExternal.dpr	6 Dec 2004 08:49:16 -0000	1.1
--- PrimerExternal.dpr	7 Dec 2004 08:45:33 -0000	1.2
***************
*** 2,6 ****
   *   InstantObjects
   *   Primer Demo - with "external storage" of Part and Parts
!  *
   *)
  
--- 2,6 ----
   *   InstantObjects
   *   Primer Demo - with "external storage" of Part and Parts
!  *   Model.pas unit is located in ModelExternal folder
   *)
  
***************
*** 38,42 ****
    Forms,
    Main in 'Main.pas' {MainForm},
!   ModelExternal in 'ModelExternal.pas',
    ContactView in 'ContactView.pas' {ContactViewForm: TFrame},
    BasicView in 'BasicView.pas' {BasicViewForm: TFrame},
--- 38,42 ----
    Forms,
    Main in 'Main.pas' {MainForm},
!   Model in 'ModelExternal\Model.pas',
    ContactView in 'ContactView.pas' {ContactViewForm: TFrame},
    BasicView in 'BasicView.pas' {BasicViewForm: TFrame},
***************
*** 65,73 ****
  
  {$R *.res}
! {$R *.mdr} {ModelExternal}
  
  begin
    Application.Initialize;
!   Application.Title := 'InstantObjects Primer (Delphi/Kylix cross platform version)';
    Application.CreateForm(TMainForm, MainForm);
    Application.CreateForm(TMainDataModule, MainDataModule);
--- 65,73 ----
  
  {$R *.res}
! {$R *.mdr} {Model}
  
  begin
    Application.Initialize;
!   Application.Title := 'InstantObjects Primer Demo with "external storage" of Part and Parts';
    Application.CreateForm(TMainForm, MainForm);
    Application.CreateForm(TMainDataModule, MainDataModule);

Index: PrimerExternal.cfg
===================================================================
RCS file: /cvsroot/instantobjects/Demos/PrimerCross/PrimerExternal.cfg,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PrimerExternal.cfg	6 Dec 2004 08:49:16 -0000	1.1
--- PrimerExternal.cfg	7 Dec 2004 08:45:33 -0000	1.2
***************
*** 34,42 ****
  -LE"c:\programmi\borland\delphi7\Projects\Bpl"
  -LN"c:\programmi\borland\delphi7\Projects\Bpl"
! -U"c:\programmi\borland\delphi7\Lib\Debug;..\..\Source\Brokers\DBX;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML"
! -O"c:\programmi\borland\delphi7\Lib\Debug;..\..\Source\Brokers\DBX;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML"
! -I"c:\programmi\borland\delphi7\Lib\Debug;..\..\Source\Brokers\DBX;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML"
! -R"c:\programmi\borland\delphi7\Lib\Debug;..\..\Source\Brokers\DBX;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML"
! -DEXTERNALSTORAGE
  -w-UNIT_PLATFORM
  -w-UNSAFE_TYPE
--- 34,41 ----
  -LE"c:\programmi\borland\delphi7\Projects\Bpl"
  -LN"c:\programmi\borland\delphi7\Projects\Bpl"
! -U"c:\programmi\borland\delphi7\Lib\Debug;..\..\Source\Brokers\DBX;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Brokers\UIB"
! -O"c:\programmi\borland\delphi7\Lib\Debug;..\..\Source\Brokers\DBX;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Brokers\UIB"
! -I"c:\programmi\borland\delphi7\Lib\Debug;..\..\Source\Brokers\DBX;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Brokers\UIB"
! -R"c:\programmi\borland\delphi7\Lib\Debug;..\..\Source\Brokers\DBX;..\..\Source\Brokers\ADO;..\..\Source\Brokers\BDE;..\..\Source\Brokers\IBX;..\..\Source\Brokers\XML;..\..\Source\Brokers\UIB"
  -w-UNIT_PLATFORM
  -w-UNSAFE_TYPE

Index: Welcome.pas
===================================================================
RCS file: /cvsroot/instantobjects/Demos/PrimerCross/Welcome.pas,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Welcome.pas	20 Jul 2004 11:05:15 -0000	1.1
--- Welcome.pas	7 Dec 2004 08:45:34 -0000	1.2
***************
*** 50,53 ****
--- 50,54 ----
  procedure TWelcomeForm.FormCreate(Sender: TObject);
  begin
+   TitleLabel.Caption := Application.Title;
  {$IFDEF MSWINDOWS}
    BorderStyle := bsNone;

Index: Primer.dpr
===================================================================
RCS file: /cvsroot/instantobjects/Demos/PrimerCross/Primer.dpr,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Primer.dpr	6 Dec 2004 08:49:16 -0000	1.3
--- Primer.dpr	7 Dec 2004 08:45:33 -0000	1.4
***************
*** 2,5 ****
--- 2,6 ----
   *   InstantObjects
   *   Primer Demo - with "internal storage" of Part and Parts
+  *   Model.pas unit is located in Model folder
   *
   *)
***************
*** 38,42 ****
    Forms,
    Main in 'Main.pas' {MainForm},
!   Model in 'Model.pas',
    ContactView in 'ContactView.pas' {ContactViewForm: TFrame},
    BasicView in 'BasicView.pas' {BasicViewForm: TFrame},
--- 39,43 ----
    Forms,
    Main in 'Main.pas' {MainForm},
!   Model in 'Model\Model.pas',
    ContactView in 'ContactView.pas' {ContactViewForm: TFrame},
    BasicView in 'BasicView.pas' {BasicViewForm: TFrame},
***************
*** 69,73 ****
  begin
    Application.Initialize;
!   Application.Title := 'InstantObjects Primer (Delphi/Kylix cross platform version)';
    Application.CreateForm(TMainForm, MainForm);
    Application.CreateForm(TMainDataModule, MainDataModule);
--- 70,74 ----
  begin
    Application.Initialize;
!   Application.Title := 'InstantObjects Primer Demo (Delphi/Kylix cross platform version)';
    Application.CreateForm(TMainForm, MainForm);
    Application.CreateForm(TMainDataModule, MainDataModule);

Index: Welcome.dfm
===================================================================
RCS file: /cvsroot/instantobjects/Demos/PrimerCross/Welcome.dfm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Welcome.dfm	20 Jul 2004 11:05:15 -0000	1.1
--- Welcome.dfm	7 Dec 2004 08:45:34 -0000	1.2
***************
*** 40,46 ****
          Alignment = taCenter
          AutoSize = False
!         Caption = 
!           'Welcome to InstantObjects Primer (Delphi/Kylix cross-platform ve' +
!           'rsion)'
          Color = clBtnFace
          Font.Charset = DEFAULT_CHARSET
--- 40,44 ----
          Alignment = taCenter
          AutoSize = False
!         Caption = 'Application title'
          Color = clBtnFace
          Font.Charset = DEFAULT_CHARSET

Index: PrimerExternal.mdr
===================================================================
RCS file: /cvsroot/instantobjects/Demos/PrimerCross/PrimerExternal.mdr,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsnvRsXk and /tmp/cvsnS7PCH differ

Index: ContactFilterEdit.pas
===================================================================
RCS file: /cvsroot/instantobjects/Demos/PrimerCross/ContactFilterEdit.pas,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ContactFilterEdit.pas	6 Dec 2004 08:49:15 -0000	1.2
--- ContactFilterEdit.pas	7 Dec 2004 08:45:33 -0000	1.3
***************
*** 13,18 ****
    QStdCtrls, QGrids, QDBGrids, QMask, QDBCtrls, QExtCtrls, QComCtrls,
  {$ENDIF}
! {$IFDEF EXTERNALSTORAGE}ModelExternal,{$ELSE}Model,{$ENDIF}
!   ContactEdit, DB, InstantPresentation;
  
  type
--- 13,17 ----
    QStdCtrls, QGrids, QDBGrids, QMask, QDBCtrls, QExtCtrls, QComCtrls,
  {$ENDIF}
!   ContactEdit, DB, InstantPresentation, Model;
  
  type

Index: PersonBrowse.pas
===================================================================
RCS file: /cvsroot/instantobjects/Demos/PrimerCross/PersonBrowse.pas,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PersonBrowse.pas	6 Dec 2004 08:49:16 -0000	1.2
--- PersonBrowse.pas	7 Dec 2004 08:45:33 -0000	1.3
***************
*** 13,18 ****
    QActnList, QGrids, QDBGrids, QExtCtrls, QComCtrls, QStdCtrls,
  {$ENDIF}
! {$IFDEF EXTERNALSTORAGE}ModelExternal,{$ELSE}Model,{$ENDIF}
!   ContactBrowse, Db, InstantPresentation;
  
  type
--- 13,17 ----
    QActnList, QGrids, QDBGrids, QExtCtrls, QComCtrls, QStdCtrls,
  {$ENDIF}
!   ContactBrowse, Db, InstantPresentation, Model;
  
  type

Index: ContactEdit.pas
===================================================================
RCS file: /cvsroot/instantobjects/Demos/PrimerCross/ContactEdit.pas,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ContactEdit.pas	6 Dec 2004 08:49:15 -0000	1.2
--- ContactEdit.pas	7 Dec 2004 08:45:33 -0000	1.3
***************
*** 13,18 ****
    QStdCtrls, QExtCtrls, QMask, QDBCtrls, QGrids, QDBGrids, QComCtrls,
  {$ENDIF}
! {$IFDEF EXTERNALSTORAGE}ModelExternal,{$ELSE}Model,{$ENDIF}
!   BasicEdit, Db, InstantPresentation;
  
  type
--- 13,17 ----
    QStdCtrls, QExtCtrls, QMask, QDBCtrls, QGrids, QDBGrids, QComCtrls,
  {$ENDIF}
!   BasicEdit, Db, InstantPresentation, Model;
  
  type

Index: ContactView.pas
===================================================================
RCS file: /cvsroot/instantobjects/Demos/PrimerCross/ContactView.pas,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ContactView.pas	6 Dec 2004 08:49:15 -0000	1.4
--- ContactView.pas	7 Dec 2004 08:45:33 -0000	1.5
***************
*** 21,26 ****
    QStdCtrls, QActnList, QImgList, QMenus,
  {$ENDIF}
! {$IFDEF EXTERNALSTORAGE}ModelExternal,{$ELSE}Model,{$ENDIF}
!   BasicView, InstantPresentation, InstantExplorer;
  
  type
--- 21,25 ----
    QStdCtrls, QActnList, QImgList, QMenus,
  {$ENDIF}
!   BasicView, Model, InstantPresentation, InstantExplorer;
  
  type

--- Model.pas DELETED ---

Index: Main.pas
===================================================================
RCS file: /cvsroot/instantobjects/Demos/PrimerCross/Main.pas,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Main.pas	6 Dec 2004 08:49:15 -0000	1.5
--- Main.pas	7 Dec 2004 08:45:33 -0000	1.6
***************
*** 122,128 ****
  
  uses
!   Contnrs,
! {$IFDEF EXTERNALSTORAGE}ModelExternal,{$ELSE}Model,{$ENDIF}
!   Welcome, MainData, RandomData, DemoData, Utility, ContactView, PerformanceView,
  {$IFDEF MSWINDOWS}
    HelpView, JPeg,
--- 122,126 ----
  
  uses
!   Contnrs, Model, Welcome, MainData, RandomData, DemoData, Utility, ContactView, PerformanceView,
  {$IFDEF MSWINDOWS}
    HelpView, JPeg,
***************
*** 139,150 ****
    installed all brokers, please remove the missing broker unit(s) from
    the list. }
  {$IFDEF MSWINDOWS}
    {$IFNDEF VER130}
    InstantDBX,
    {$ENDIF}
!   InstantADO, InstantBDE, InstantIBX, InstantUIB,
  {$ENDIF}
  {$IFDEF LINUX}
!   InstantDBX, InstantUIB,
  {$ENDIF}
    InstantXML;
--- 137,149 ----
    installed all brokers, please remove the missing broker unit(s) from
    the list. }
+ 
  {$IFDEF MSWINDOWS}
    {$IFNDEF VER130}
    InstantDBX,
    {$ENDIF}
!   InstantADO, InstantBDE, InstantIBX,
  {$ENDIF}
  {$IFDEF LINUX}
!   InstantDBX,
  {$ENDIF}
    InstantXML;

Index: CountryBrowse.pas
===================================================================
RCS file: /cvsroot/instantobjects/Demos/PrimerCross/CountryBrowse.pas,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CountryBrowse.pas	6 Dec 2004 08:49:15 -0000	1.2
--- CountryBrowse.pas	7 Dec 2004 08:45:33 -0000	1.3
***************
*** 15,20 ****
    QComCtrls, QStdCtrls,
  {$ENDIF}
! {$IFDEF EXTERNALSTORAGE}ModelExternal,{$ELSE}Model,{$ENDIF}
!   InstantPresentation;
  
  type
--- 15,19 ----
    QComCtrls, QStdCtrls,
  {$ENDIF}
!   InstantPresentation, Model;
  
  type

Index: ContactSort.pas
===================================================================
RCS file: /cvsroot/instantobjects/Demos/PrimerCross/ContactSort.pas,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ContactSort.pas	6 Dec 2004 08:49:15 -0000	1.2
--- ContactSort.pas	7 Dec 2004 08:45:33 -0000	1.3
***************
*** 41,46 ****
  
  uses
! {$IFDEF EXTERNALSTORAGE}ModelExternal,{$ELSE}Model,{$ENDIF}
!   TypInfo, InstantRtti, InstantPresentation;
  
  {$R *.dfm}
--- 41,45 ----
  
  uses
!   Model, TypInfo, InstantRtti, InstantPresentation;
  
  {$R *.dfm}

Index: CompanyBrowse.pas
===================================================================
RCS file: /cvsroot/instantobjects/Demos/PrimerCross/CompanyBrowse.pas,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CompanyBrowse.pas	6 Dec 2004 08:49:15 -0000	1.2
--- CompanyBrowse.pas	7 Dec 2004 08:45:33 -0000	1.3
***************
*** 13,18 ****
    QMenus, QImgList, QActnList, QGrids, QDBGrids, QExtCtrls, QComCtrls,
  {$ENDIF}
! {$IFDEF EXTERNALSTORAGE}ModelExternal,{$ELSE}Model,{$ENDIF}
!   ContactBrowse, DB, InstantPresentation;
  
  type
--- 13,17 ----
    QMenus, QImgList, QActnList, QGrids, QDBGrids, QExtCtrls, QComCtrls,
  {$ENDIF}
!   ContactBrowse, DB, InstantPresentation, Model;
  
  type

Index: DemoData.pas
===================================================================
RCS file: /cvsroot/instantobjects/Demos/PrimerCross/DemoData.pas,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DemoData.pas	6 Dec 2004 08:49:15 -0000	1.3
--- DemoData.pas	7 Dec 2004 08:45:33 -0000	1.4
***************
*** 4,9 ****
  
  uses
! {$IFDEF EXTERNALSTORAGE}ModelExternal,{$ELSE}Model,{$ENDIF}
!   Classes, InstantPersistence, RandomData;
  
  procedure CreateCategories;
--- 4,8 ----
  
  uses
!   Classes, Model, InstantPersistence, RandomData;
  
  procedure CreateCategories;
***************
*** 181,185 ****
      Result.BirthDate := Date - (20 * 365 + Random(365 * 50)); // 20 - 70 years old
      Result.Address := CreateRandomAddress;
!     Result.Salary := 922337203685470;
      CreateRandomPhones(Result, ['Home', 'Mobile']);
      if Assigned(Company) then
--- 180,185 ----
      Result.BirthDate := Date - (20 * 365 + Random(365 * 50)); // 20 - 70 years old
      Result.Address := CreateRandomAddress;
! //    Result.Salary := 922337203685470;
!     Result.Salary := 500 + Random(5000);
      CreateRandomPhones(Result, ['Home', 'Mobile']);
      if Assigned(Company) then

--- ModelExternal.pas DELETED ---