use xml units from fpc, if not compiling with fpc 1.0

git-svn-id: trunk@6603 -
2026-01-06 11:20:37 +01:00 · 2005-01-15 13:44:03 +00:00 · 2005-01-15 13:44:03 +00:00 · c535f37167
commit c535f37167
parent 30836c4ced
64 changed files with 152 additions and 101 deletions
--- a/components/codetools/allcodetoolunits.pp
+++ b/components/codetools/allcodetoolunits.pp
@ -19,10 +19,13 @@ uses
  FindDeclarationTool, StdCodeTools, MethodJumpTool, EventCodeTool,
  CodeCompletionTool, LinkScanner, FindDeclarationCache, BasicCodeTools,
  CodeTree, CodeAtom, SourceChanger, CodeToolMemManager, CodeCache,
-  KeywordFuncLists, SourceLog, ExprEval, DefineTemplates, FileProcs, OldAvLTree,
-  CodeToolsStrConsts, MultiKeyWordListTool, ResourceCodeTool, CodeToolsStructs,
-  // fast xml units
-  laz_dom, laz_xmlcfg, laz_xmlread, laz_xmlwrite;
+  KeywordFuncLists, SourceLog, ExprEval, DefineTemplates, FileProcs, CodeToolsStrConsts,
+  MultiKeyWordListTool, ResourceCodeTool, CodeToolsStructs
+  {$IFDEF VER1_0}
+  // fast xml units, changes not merged in ver 1.0
+  ,OldAvLTree, laz_dom, laz_xmlcfg, laz_xmlread, laz_xmlwrite
+  {$ENDIF}
+  ;


 implementation
@ -32,6 +35,9 @@ end.
 { =============================================================================

  $Log$
+  Revision 1.17  2005/01/15 13:44:03  vincents
+  use xml units from fpc, if not compiling with fpc 1.0
+
  Revision 1.16  2004/11/06 19:49:11  mattias
  renamed avl_tree.pas to oldavltree.pas for new fpc 1.9.5

--- a/components/codetools/codecache.pas
+++ b/components/codetools/codecache.pas
@ -38,7 +38,8 @@ uses
  {$IFDEF MEM_CHECK}
  MemCheck,
  {$ENDIF}
-  Classes, SysUtils, SourceLog, LinkScanner, OldAvLTree, FileProcs, Laz_XMLCfg;
+  Classes, SysUtils, SourceLog, LinkScanner, FileProcs,
+  {$IFNDEF VER1_0}Avl_Tree, XMLCfg{$ELSE}OldAvLTree, Laz_XMLCfg{$ENDIF};

 type
  TCodeCache = class;
--- a/components/codetools/codecompletiontool.pas
+++ b/components/codetools/codecompletiontool.pas
@ -78,7 +78,8 @@ uses
  {$ENDIF}
  Classes, SysUtils, FileProcs, CodeToolsStrConsts, CodeTree, CodeAtom,
  PascalParserTool, MethodJumpTool, FindDeclarationTool, KeywordFuncLists,
-  CodeToolsStructs, BasicCodeTools, LinkScanner, OldAvLTree, SourceChanger;
+  CodeToolsStructs, BasicCodeTools, LinkScanner, SourceChanger,
+  {$IFNDEF VER1_0}AVL_Tree{$ELSE}OldAvLTree{$ENDIF};

 type
  TNewClassPart = (ncpPrivateProcs, ncpPrivateVars,
--- a/components/codetools/codetemplatestool.pas
+++ b/components/codetools/codetemplatestool.pas
@ -39,8 +39,8 @@ uses
  MemCheck,
  {$ENDIF}
  Classes, SysUtils, CodeTree, CodeAtom, KeywordFuncLists, BasicCodeTools,
-  LinkScanner, OldAvLTree, SourceChanger, CustomCodeTool, CodeToolsStructs,
-  StdCodeTools;
+  LinkScanner, {$IFNDEF VER1_0}AVL_Tree{$ELSE}OldAvLTree{$ENDIF}, SourceChanger,
+  CustomCodeTool, CodeToolsStructs, StdCodeTools;

 type
  TCodeTemplateSyntax = (
--- a/components/codetools/codetoolmanager.pas
+++ b/components/codetools/codetoolmanager.pas
@ -42,7 +42,8 @@ uses
  {$ENDIF}
  Classes, SysUtils, FileProcs, BasicCodeTools, CodeToolsStrConsts,
  EventCodeTool, CodeTree, CodeAtom, SourceChanger, DefineTemplates, CodeCache,
-  ExprEval, LinkScanner, KeywordFuncLists, TypInfo, OldAvLTree, LFMTrees,
+  ExprEval, LinkScanner, KeywordFuncLists, TypInfo,
+  {$IFNDEF VER1_0}AVL_Tree{$ELSE}OldAvLTree{$ENDIF}, LFMTrees,
  CustomCodeTool, FindDeclarationTool, IdentCompletionTool, StdCodeTools,
  ResourceCodeTool, CodeToolsStructs, CodeTemplatesTool, ExtractProcTool;

--- a/components/codetools/codetree.pas
+++ b/components/codetools/codetree.pas
@ -40,8 +40,8 @@ uses
  {$IFDEF MEM_CHECK}
  MemCheck,
  {$ENDIF}
-  Classes, SysUtils, FileProcs, CodeToolsStructs, BasicCodeTools, OldAvLTree,
-  CodeToolMemManager;
+  Classes, SysUtils, FileProcs, CodeToolsStructs, BasicCodeTools,
+  {$IFNDEF VER1_0}AVL_Tree{$ELSE}OldAvLTree{$ENDIF}, CodeToolMemManager;

 //-----------------------------------------------------------------------------

--- a/components/codetools/customcodetool.pas
+++ b/components/codetools/customcodetool.pas
@ -43,7 +43,8 @@ uses
  MemCheck,
  {$ENDIF}
  Classes, SysUtils, FileProcs, CodeToolsStrConsts, CodeTree, CodeAtom,
-  KeywordFuncLists, BasicCodeTools, LinkScanner, CodeCache, OldAvLTree;
+  KeywordFuncLists, BasicCodeTools, LinkScanner, CodeCache,
+  {$IFNDEF VER1_0}AVL_Tree{$ELSE}OldAvLTree{$ENDIF};

 const
  CodeToolPhaseNone  = 0;
--- a/components/codetools/definetemplates.pas
+++ b/components/codetools/definetemplates.pas
@ -54,7 +54,8 @@ unit DefineTemplates;
 interface

 uses
-  Classes, SysUtils, CodeToolsStrConsts, ExprEval, Laz_XMLCfg, OldAvLTree,
+  Classes, SysUtils, CodeToolsStrConsts, ExprEval,
+  {$IFNDEF VER1_0}XMLCfg, AVL_Tree{$ELSE}Laz_XMLCfg, OldAvLTree{$ENDIF},
  Process, KeywordFuncLists, FileProcs;

 const
--- a/components/codetools/eventcodetool.pas
+++ b/components/codetools/eventcodetool.pas
@ -44,8 +44,8 @@ uses
  {$ENDIF}
  Classes, SysUtils, FileProcs, CodeToolsStrConsts, CodeTree, CodeAtom,
  PascalParserTool, CodeCompletionTool, KeywordFuncLists, BasicCodeTools,
-  LinkScanner, OldAvLTree, TypInfo, SourceChanger, FindDeclarationTool,
-  ExtractProcTool;
+  LinkScanner, {$IFNDEF VER1_0}AVL_Tree{$ELSE}OldAvLTree{$ENDIF}, TypInfo,
+  SourceChanger, FindDeclarationTool, ExtractProcTool;

 type
  TGetStringProc = procedure(const s: string) of object;
--- a/components/codetools/extractproctool.pas
+++ b/components/codetools/extractproctool.pas
@ -44,7 +44,8 @@ interface
 uses
  Classes, SysUtils, FileProcs, CodeToolsStrConsts, CodeTree, CodeAtom,
  PascalParserTool, CodeCompletionTool, KeywordFuncLists, BasicCodeTools,
-  LinkScanner, OldAvLTree, SourceChanger, FindDeclarationTool;
+  LinkScanner, {$IFNDEF VER1_0}AVL_Tree{$ELSE}OldAvLTree{$ENDIF}, SourceChanger,
+  FindDeclarationTool;
  
 type
  { TExtractProcTool }
--- a/components/codetools/finddeclarationcache.pas
+++ b/components/codetools/finddeclarationcache.pas
@ -37,8 +37,9 @@ interface
 { $DEFINE HardExceptions}

 uses
-  Classes, SysUtils, FileProcs, BasicCodeTools, OldAvLTree, CodeTree, LinkScanner,
-  PascalParserTool, CodeToolMemManager;
+  Classes, SysUtils, FileProcs, BasicCodeTools, CodeTree, LinkScanner,
+  {$IFNDEF VER1_0}AVL_Tree{$ELSE}OldAvLTree{$ENDIF}, PascalParserTool,
+  CodeToolMemManager;

 type
  {
--- a/components/codetools/finddeclarationtool.pas
+++ b/components/codetools/finddeclarationtool.pas
@ -82,9 +82,9 @@ uses
  MemCheck,
  {$ENDIF}
  Classes, SysUtils, CodeToolsStrConsts, CodeTree, CodeAtom, CustomCodeTool,
-  KeywordFuncLists, BasicCodeTools, LinkScanner, CodeCache, OldAvLTree,
-  PascalParserTool, PascalReaderTool, FileProcs, DefineTemplates,
-  FindDeclarationCache;
+  KeywordFuncLists, BasicCodeTools, LinkScanner, CodeCache,
+  {$IFNDEF VER1_0}AVL_Tree{$ELSE}OldAvLTree{$ENDIF}, PascalParserTool,
+  PascalReaderTool, FileProcs, DefineTemplates, FindDeclarationCache;

 type
  TFindDeclarationTool = class;
--- a/components/codetools/identcompletiontool.pas
+++ b/components/codetools/identcompletiontool.pas
@ -53,7 +53,8 @@ uses
  MemCheck,
  {$ENDIF}
  Classes, SysUtils, FileProcs, CodeTree, CodeAtom, CustomCodeTool,
-  KeywordFuncLists, BasicCodeTools, LinkScanner, OldAvLTree, CodeToolMemManager,
+  KeywordFuncLists, BasicCodeTools, LinkScanner,
+  {$IFNDEF VER1_0}AVL_Tree{$ELSE}OldAvLTree{$ENDIF}, CodeToolMemManager,
  SourceChanger, FindDeclarationTool, PascalParserTool;
  

--- a/components/codetools/methodjumptool.pas
+++ b/components/codetools/methodjumptool.pas
@ -42,7 +42,7 @@ uses
  {$ENDIF}
  Classes, SysUtils, FileProcs, CodeTree, CodeAtom, PascalParserTool,
  StdCodeTools, CodeTemplatesTool, KeywordFuncLists, BasicCodeTools,
-  LinkScanner, OldAvLTree;
+  LinkScanner, {$IFNDEF VER1_0}AVL_Tree{$ELSE}OldAvLTree{$ENDIF};


 type
--- a/components/codetools/pascalparsertool.pas
+++ b/components/codetools/pascalparsertool.pas
@ -42,8 +42,8 @@ uses
  MemCheck,
  {$ENDIF}
  Classes, SysUtils, FileProcs, CodeToolsStrConsts, CodeTree, CodeAtom,
-  CustomCodeTool, MultiKeyWordListTool, KeywordFuncLists,
-  BasicCodeTools, LinkScanner, CodeCache, OldAvLTree;
+  CustomCodeTool, MultiKeyWordListTool, KeywordFuncLists, BasicCodeTools,
+  LinkScanner, CodeCache, {$IFNDEF VER1_0}AVL_Tree{$ELSE}OldAvLTree{$ENDIF};

 type
  TProcHeadAttribute = (
--- a/components/codetools/pascalreadertool.pas
+++ b/components/codetools/pascalreadertool.pas
@ -39,7 +39,7 @@ uses
  {$ENDIF}
  Classes, SysUtils, FileProcs, CodeToolsStrConsts, CodeTree, CodeAtom,
  CustomCodeTool, PascalParserTool, KeywordFuncLists, BasicCodeTools,
-  LinkScanner, OldAvLTree;
+  LinkScanner, {$IFNDEF VER1_0}AVL_Tree{$ELSE}OldAvLTree{$ENDIF};

 type
  TPascalReaderTool = class(TPascalParserTool)
--- a/components/codetools/sourcechanger.pas
+++ b/components/codetools/sourcechanger.pas
@ -43,7 +43,8 @@ interface

 uses
  Classes, SysUtils, FileProcs, CodeToolsStrConsts, CodeCache, BasicCodeTools,
-  LinkScanner, OldAvLTree, KeywordFuncLists;
+  LinkScanner, {$IFNDEF VER1_0}AVL_Tree{$ELSE}OldAvLTree{$ENDIF},
+  KeywordFuncLists;
  
 type
  { TBeautifyCodeOptions }
--- a/components/codetools/stdcodetools.pas
+++ b/components/codetools/stdcodetools.pas
@ -50,8 +50,9 @@ uses
  {$ENDIF}
  Classes, SysUtils, CodeToolsStrConsts, FileProcs, CodeTree, CodeAtom,
  FindDeclarationTool, IdentCompletionTool, PascalReaderTool, PascalParserTool,
-  KeywordFuncLists, BasicCodeTools, LinkScanner, CodeCache, OldAvLTree, LFMTrees,
-  SourceChanger, CustomCodeTool, CodeToolsStructs;
+  KeywordFuncLists, BasicCodeTools, LinkScanner, CodeCache,
+  {$IFNDEF VER1_0}AVL_Tree{$ELSE}OldAvLTree{$ENDIF}, LFMTrees, SourceChanger,
+  CustomCodeTool, CodeToolsStructs;

 type
  TOnFindDefinePropertyForContext = procedure(Sender: TObject;
--- a/debugger/debugger.pp
+++ b/debugger/debugger.pp
@ -37,7 +37,8 @@ unit Debugger;
 interface

 uses
-  Classes, SysUtils, LCLProc, Laz_XMLCfg, IDEProcs, DBGUtils;
+  Classes, SysUtils, {$IFNDEF VER1_0}XMLCfg{$ELSE}Laz_XMLCfg{$ENDIF},
+  LCLProc, IDEProcs, DBGUtils;

 type
  // datatype pointing to data on the target
@ -3575,6 +3576,9 @@ finalization
 end.
 { =============================================================================
  $Log$
+  Revision 1.67  2005/01/15 13:44:03  vincents
+  use xml units from fpc, if not compiling with fpc 1.0
+
  Revision 1.66  2004/12/03 14:35:30  vincents
  implemented TIDEExceptions.LoadFromXMLConfig and SaveToXMLConfig

--- a/designer/designermenu.pp
+++ b/designer/designermenu.pp
@ -37,8 +37,8 @@ interface

 uses
  Classes, SysUtils, LCLProc, Forms, Controls, Menus, Graphics, GraphType,
-  Buttons, StdCtrls, ExtCtrls, ComponentEditors, LazConf, Laz_XMLCfg, ComCtrls,
-  Arrow, LazarusIDEStrConsts, PropEdits;
+  Buttons, StdCtrls, ExtCtrls, ComponentEditors, LazConf,  ComCtrls, Arrow, 
+ {$IFNDEF VER1_0}XMLCfg{$ELSE}Laz_XMLCfg{$ENDIF},LazarusIDEStrConsts, PropEdits;

 type

--- a/ide/addtoprojectdlg.pas
+++ b/ide/addtoprojectdlg.pas
@ -36,7 +36,8 @@ interface

 uses
  Classes, SysUtils, Math, LCLProc, LResources, Forms, Controls, Buttons,
-  ComCtrls, StdCtrls, ExtCtrls, Menus, Dialogs, Graphics, FileUtil, OldAvLTree,
+  ComCtrls, StdCtrls, ExtCtrls, Menus, Dialogs, Graphics, FileUtil,
+  {$IFNDEF VER1_0}AVL_Tree{$ELSE}OldAvLTree{$ENDIF},
  LazarusIDEStrConsts, IDEProcs, IDEOptionDefs, EnvironmentOpts,
  Project, PackageDefs, PackageSystem;
  
--- a/ide/basedebugmanager.pas
+++ b/ide/basedebugmanager.pas
@ -40,7 +40,8 @@ uses
 {$IFDEF IDE_MEM_CHECK}
  MemCheck,
 {$ENDIF}
-  Classes, SysUtils, Forms, Laz_XMLCfg, Project, SourceMarks, Debugger;
+  Classes, SysUtils, Forms, Project, SourceMarks, Debugger,
+  {$IFNDEF VER1_0}XMLCfg{$ELSE}Laz_XMLCfg{$ENDIF};

 type
  { TBaseDebugManager }
@ -170,6 +171,9 @@ end.

 { =============================================================================
  $Log$
+  Revision 1.24  2005/01/15 13:44:03  vincents
+  use xml units from fpc, if not compiling with fpc 1.0
+
  Revision 1.23  2004/11/23 11:01:10  mattias
  added key handling for debug manager

--- a/ide/buildlazdialog.pas
+++ b/ide/buildlazdialog.pas
@ -36,8 +36,9 @@ interface
 uses
  Classes, SysUtils, Math, LCLProc, Forms, Controls, LCLType, LCLIntf,
  Graphics, GraphType, StdCtrls, ExtCtrls, Buttons, FileUtil, Dialogs,
-  LResources, Laz_XMLCfg, LazarusIDEStrConsts, TransferMacros, LazConf,
-  IDEProcs, DialogProcs, InputHistory, ExtToolDialog, ExtToolEditDlg,
+  LResources, {$IFNDEF VER1_0}XMLCfg{$ELSE}Laz_XMLCfg{$ENDIF},
+  LazarusIDEStrConsts, TransferMacros, LazConf, IDEProcs, DialogProcs,
+  InputHistory, ExtToolDialog, ExtToolEditDlg,
  CompilerOptions;

 type
--- a/ide/cleandirdlg.pas
+++ b/ide/cleandirdlg.pas
@ -31,8 +31,8 @@ interface

 uses
  Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, Buttons,
-  StdCtrls, FileUtil, LCLProc, Laz_XMLCfg, SynRegExpr,
-  LazarusIDEStrConsts, LazConf, IDEProcs, TransferMacros;
+  StdCtrls, FileUtil, LCLProc, {$IFNDEF VER1_0}XMLCfg{$ELSE}Laz_XMLCfg{$ENDIF},
+  SynRegExpr, LazarusIDEStrConsts, LazConf, IDEProcs, TransferMacros;

 type
  TCleanDirectoryDialog = class(TForm)
--- a/ide/codeexplopts.pas
+++ b/ide/codeexplopts.pas
@ -35,7 +35,7 @@ interface

 uses
  Classes, SysUtils, LCLProc, LResources, Forms, Controls, Graphics, Dialogs,
-  Laz_XMLCfg, Buttons, ExtCtrls, FileUtil,
+  {$IFNDEF VER1_0}XMLCfg{$ELSE}Laz_XMLCfg{$ENDIF}, Buttons, ExtCtrls, FileUtil,
  LazConf;

 type
--- a/ide/codetoolsoptions.pas
+++ b/ide/codetoolsoptions.pas
@ -35,9 +35,9 @@ unit CodeToolsOptions;
 interface

 uses
-  Classes, SysUtils, LazConf, LResources, Forms, Controls, Buttons, LclProc,
-  ExtCtrls, StdCtrls, ComCtrls, Dialogs, Laz_XMLCfg, CodeToolManager,
-  DefineTemplates, SourceChanger, SynEdit,
+  Classes, SysUtils, LazConf, {$IFNDEF VER1_0}XMLCfg{$ELSE}Laz_XMLCfg{$ENDIF},
+  LResources, Forms, Controls, Buttons, LclProc, ExtCtrls, StdCtrls, ComCtrls,
+  Dialogs, CodeToolManager, DefineTemplates, SourceChanger, SynEdit,
  IDEOptionDefs, EditDefineTree, LazarusIDEStrConsts;

 type
--- a/ide/compileroptions.pp
+++ b/ide/compileroptions.pp
@ -42,7 +42,7 @@ interface

 uses
  Classes, SysUtils, FileUtil, LCLProc,
-  Laz_XMLCfg, ProjectIntf,
+  {$IFNDEF VER1_0}XMLCfg{$ELSE}Laz_XMLCfg{$ENDIF}, ProjectIntf,
  IDEProcs, LazConf, TransferMacros;

 type
--- a/ide/componentpalette.pas
+++ b/ide/componentpalette.pas
@ -39,7 +39,8 @@ interface

 uses
  Classes, SysUtils, LCLProc, Controls, Dialogs, Graphics, ExtCtrls, Buttons,
-  Menus, LResources, OldAvLTree, FormEditingIntf,
+  Menus, LResources, {$IFNDEF VER1_0}AVL_Tree{$ELSE}OldAvLTree{$ENDIF},
+  FormEditingIntf,
  {$IFDEF CustomIDEComps}
  CustomIDEComps,
  {$ENDIF}
--- a/ide/condef.pas
+++ b/ide/condef.pas
@ -53,7 +53,7 @@ interface

 uses
  Messages, Graphics, Controls, Forms, Dialogs, StdCtrls, Buttons,
-  Laz_XMLCfg, SysUtils, Classes;
+  {$IFNDEF VER1_0}XMLCfg{$ELSE}Laz_XMLCfg{$ENDIF}, SysUtils, Classes;

 type
  TCondForm = class(TForm)
--- a/ide/customformeditor.pp
+++ b/ide/customformeditor.pp
@ -39,11 +39,11 @@ uses
  MemCheck,
 {$ENDIF}
  // LCL+FCL
-  {$IFNDEF Ver1_0}Variants,{$ENDIF}
-  Classes, SysUtils, TypInfo, Math, LCLProc, Graphics, Controls, Forms, Menus,
-  Dialogs,
+  Classes, SysUtils, TypInfo, Math,
+  {$IFNDEF Ver1_0}AVL_Tree{$ELSE}Variants, OldAvLTree{$ENDIF},
+  LCLProc, Graphics, Controls, Forms, Menus, Dialogs,
  // components
-  OldAvLTree, PropEdits, ObjectInspector, IDECommands,
+  PropEdits, ObjectInspector, IDECommands,
  // IDE
  LazarusIDEStrConsts, JITForms, NonControlForms, FormEditingIntf, ComponentReg,
  IDEProcs, ComponentEditors, KeyMapping, EditorOptions, DesignerProcs;
--- a/ide/debugmanager.pas
+++ b/ide/debugmanager.pas
@ -40,7 +40,8 @@ uses
  MemCheck,
 {$ENDIF}
  Classes, SysUtils, Forms, Controls, Dialogs, Menus, FileUtil, LCLProc,
-  Laz_XMLCfg, SynEdit, CodeCache, CodeToolManager, LazConf, DebugOptionsFrm,
+  {$IFNDEF VER1_0}XMLCfg{$ELSE}Laz_XMLCfg{$ENDIF},
+  SynEdit, CodeCache, CodeToolManager, LazConf, DebugOptionsFrm,
  CompilerOptions, EditorOptions, EnvironmentOpts, KeyMapping, UnitEditor,
  Project, IDEProcs, InputHistory, Debugger,
  IDEOptionDefs, LazarusIDEStrConsts,
@ -1943,6 +1944,9 @@ end.

 { =============================================================================
  $Log$
+  Revision 1.82  2005/01/15 13:44:03  vincents
+  use xml units from fpc, if not compiling with fpc 1.0
+
  Revision 1.81  2004/12/18 10:20:17  mattias
  updatepofiles is now case sensitive,
  replaced many places, where Application was needlessly Owner
--- a/ide/dialogprocs.pas
+++ b/ide/dialogprocs.pas
@ -38,7 +38,7 @@ interface

 uses
  Classes, SysUtils, Forms, Controls, Dialogs, FileUtil, CodeCache,
-  CodeToolManager, OldAvLTree,
+  CodeToolManager, {$IFNDEF VER1_0}AVL_Tree{$ELSE}OldAvLTree{$ENDIF},
  IDEProcs, LazarusIDEStrConsts;

 type
--- a/ide/editoroptions.pp
+++ b/ide/editoroptions.pp
@ -40,8 +40,8 @@ uses
  SynEdit, SynEditHighlighter, SynEditAutoComplete, SynEditKeyCmds,
  SynHighlighterPas, SynHighlighterHTML, SynHighlighterCPP, SynHighlighterXML,
  SynHighlighterLFM, SynHighlighterPerl, SynHighlighterJava,
-  SynHighlighterPython,
-  SynHighlighterUNIXShellScript, Laz_XMLCfg,
+  SynHighlighterPython, SynHighlighterUNIXShellScript,
+  {$IFNDEF VER1_0}XMLCfg{$ELSE}Laz_XMLCfg{$ENDIF},
  IDECommands, CodeTemplateDialog, KeyMapping, InputHistory, IDEOptionDefs,
  LazarusIDEStrConsts, KeymapSchemeDlg;

--- a/ide/environmentopts.pp
+++ b/ide/environmentopts.pp
@ -37,7 +37,7 @@ uses
 {$ENDIF}
  Classes, SysUtils, FPCAdds, LCLProc, Forms, Controls, Buttons, GraphType,
  Graphics, ExtCtrls, StdCtrls, Spin, FileUtil, LResources, Dialogs,
-  Laz_XMLCfg, ObjectInspector,
+  {$IFNDEF VER1_0}XMLCfg{$ELSE}Laz_XMLCfg{$ENDIF}, ObjectInspector,
  LazarusIDEStrConsts, LazConf, ExtToolDialog, IDEProcs, IDEOptionDefs,
  InputHistory, EditorOptions, Translations;

--- a/ide/exttooldialog.pas
+++ b/ide/exttooldialog.pas
@ -40,9 +40,9 @@ uses
  MemCheck,
  {$ENDIF}
  Classes, SysUtils, LCLType, LCLProc, Controls, Forms, Buttons, StdCtrls,
-  ComCtrls, Dialogs, LResources, Laz_XMLCfg, ExtToolEditDlg, Process,
-  IDECommands, KeyMapping, TransferMacros, IDEProcs, CompilerOptions,
-  OutputFilter, FileUtil, LazarusIDEStrConsts;
+  ComCtrls, Dialogs, LResources, {$IFNDEF VER1_0}XMLCfg{$ELSE}Laz_XMLCfg{$ENDIF},
+  ExtToolEditDlg, Process, IDECommands, KeyMapping, TransferMacros, IDEProcs,
+  CompilerOptions, OutputFilter, FileUtil, LazarusIDEStrConsts;

 const
  MaxExtTools = ecExtToolLast-ecExtToolFirst+1;
--- a/ide/exttooleditdlg.pas
+++ b/ide/exttooleditdlg.pas
@ -43,8 +43,8 @@ uses
  MemCheck,
  {$ENDIF}
  Classes, SysUtils, LCLType, Controls, Forms, Buttons, StdCtrls, ComCtrls,
-  Dialogs, LResources, Laz_XMLCfg, KeyMapping, TransferMacros, IDEProcs,
-  LazarusIDEStrConsts;
+  Dialogs, LResources, {$IFNDEF VER1_0}XMLCfg{$ELSE}Laz_XMLCfg{$ENDIF},
+  KeyMapping, TransferMacros, IDEProcs, LazarusIDEStrConsts;

 { The xml format version:
    When the format changes (new values, changed formats) we can distinguish old
--- a/ide/filereferencelist.pas
+++ b/ide/filereferencelist.pas
@ -39,7 +39,8 @@ unit FileReferenceList;
 interface

 uses
-  Classes, SysUtils, OldAvLTree, FileUtil, IDEProcs;
+  Classes, SysUtils, {$IFNDEF VER1_0}AVL_Tree{$ELSE}OldAvLTree{$ENDIF}, FileUtil,
+  IDEProcs;
  
 type
  { TFileReference }
--- a/ide/findrenameidentifier.pas
+++ b/ide/findrenameidentifier.pas
@ -32,7 +32,8 @@ interface
 uses
  Classes, SysUtils, LCLProc, LResources, Forms, Controls, Graphics, Dialogs,
  StdCtrls, Buttons, ExtCtrls,
-  OldAvLTree, CodeAtom, CodeCache, CodeToolManager,
+  {$IFNDEF VER1_0}AVL_Tree{$ELSE}OldAvLTree{$ENDIF}, CodeAtom, CodeCache,
+  CodeToolManager,
  LazarusIDEStrConsts, IDEProcs, IDEOptionDefs, MiscOptions, DialogProcs,
  InputHistory, SearchResultView;

--- a/ide/helpoptions.pas
+++ b/ide/helpoptions.pas
@ -36,8 +36,8 @@ interface

 uses
  Classes, SysUtils, LCLProc, LResources, Forms, Controls, Graphics, Dialogs,
-  Buttons, ExtCtrls, HelpIntf, Laz_XMLCfg, ObjectInspector,
-  LazConf, LazarusIDEStrConsts, IDEOptionDefs, StdCtrls;
+  Buttons, ExtCtrls, HelpIntf, {$IFNDEF VER1_0}XMLCfg{$ELSE}Laz_XMLCfg{$ENDIF},
+  ObjectInspector, LazConf, LazarusIDEStrConsts, IDEOptionDefs, StdCtrls;

 type
  { THelpOptions }
--- a/ide/ideoptiondefs.pas
+++ b/ide/ideoptiondefs.pas
@ -33,8 +33,8 @@ unit IDEOptionDefs;
 interface

 uses
-  Classes, SysUtils, Laz_XMLCfg, LCLProc, Forms, Controls, StdCtrls, Buttons,
-  ConfigStorage, LazarusIDEStrConsts;
+  Classes, SysUtils, {$IFNDEF VER1_0}XMLCfg{$ELSE}Laz_XMLCfg{$ENDIF}, LCLProc,
+  Forms, Controls, StdCtrls, Buttons, ConfigStorage, LazarusIDEStrConsts;

 type
  { TXMLOptionsStorage }
--- a/ide/ideprocs.pp
+++ b/ide/ideprocs.pp
@ -30,8 +30,8 @@ unit IDEProcs;
 interface

 uses
-  Classes, SysUtils, Laz_XMLCfg, FileUtil, FileProcs, SynRegExpr,
-  LazConf;
+  Classes, SysUtils, {$IFNDEF VER1_0}XMLCfg{$ELSE}Laz_XMLCfg{$ENDIF}, FileUtil,
+  FileProcs, SynRegExpr, LazConf;

 type
  // comments
--- a/ide/imexportcompileropts.pas
+++ b/ide/imexportcompileropts.pas
@ -33,7 +33,7 @@ interface

 uses
  Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  Buttons, FileUtil, Laz_XMLCfg,
+  Buttons, FileUtil, {$IFNDEF VER1_0}XMLCfg{$ELSE}Laz_XMLCfg{$ENDIF},
  LazarusIDEStrConsts, InputHistory, CompilerOptions, CompilerOptionsDlg;

 type
--- a/ide/inputhistory.pas
+++ b/ide/inputhistory.pas
@ -35,8 +35,8 @@ unit InputHistory;
 interface

 uses
-  Classes, SysUtils, FileUtil, DiffPatch, IDEProcs, Laz_XMLCfg, LazConf,
-  Dialogs, LCLProc;
+  Classes, SysUtils, FileUtil, DiffPatch, IDEProcs,
+  {$IFNDEF VER1_0}XMLCfg{$ELSE}Laz_XMLCfg{$ENDIF}, LazConf, Dialogs, LCLProc;

 const
  // these are the names of the various history lists in the IDE:
--- a/ide/keymapping.pp
+++ b/ide/keymapping.pp
@ -34,8 +34,8 @@ interface
 uses
  LCLIntf, LCLType, LCLProc,
  Forms, Classes, SysUtils, Buttons, LResources, StdCtrls, Controls,
-  SynEdit, SynEditKeyCmds, Laz_XMLCfg, Dialogs, StringHashList,
-  LazarusIDEStrConsts, IDECommands;
+  SynEdit, SynEditKeyCmds, {$IFNDEF VER1_0}XMLCfg{$ELSE}Laz_XMLCfg{$ENDIF},
+  Dialogs, StringHashList, LazarusIDEStrConsts, IDECommands;

 const
  { editor commands constants. see syneditkeycmds.pp for more
--- a/ide/main.pp
+++ b/ide/main.pp
@ -66,7 +66,7 @@ uses
  Forms, Buttons, Menus, FileUtil, Controls, GraphType, Graphics, ExtCtrls,
  Dialogs, InterfaceBase, {SetDesigning}
  // codetools
-  OldAvLTree, Laz_XMLCfg, CodeToolsStructs, CodeToolManager, CodeCache,
+  {$IFNDEF VER1_0}AVL_Tree, XMLCfg{$ELSE}OldAvLTree, Laz_XMLCfg{$ENDIF}, CodeToolsStructs, CodeToolManager, CodeCache,
  DefineTemplates,
  // IDE interface
  AllIDEIntf, ObjectInspector, PropEdits, MacroIntf, IDECommands, SrcEditorIntf,
@ -11375,6 +11375,9 @@ end.

 { =============================================================================
  $Log$
+  Revision 1.833  2005/01/15 13:44:03  vincents
+  use xml units from fpc, if not compiling with fpc 1.0
+
  Revision 1.832  2005/01/15 03:09:40  mattias
  fixed checking unitname after adding default unit extension

--- a/ide/mainbase.pas
+++ b/ide/mainbase.pas
@ -58,7 +58,7 @@ uses
 {$ENDIF}
  Classes, LCLType, LCLIntf, StdCtrls, Buttons, Menus, ComCtrls, SysUtils,
  Controls, Graphics, ExtCtrls, Dialogs, FileUtil, Forms, CodeToolManager,
-  CodeCache, OldAvLTree, SynEditKeyCmds,
+  CodeCache, {$IFNDEF VER1_0}AVL_Tree{$ELSE}OldAvLTree{$ENDIF}, SynEditKeyCmds,
  // IDE
  LazConf, LazarusIDEStrConsts, SrcEditorIntf,
  ProjectDefs, Project, PublishModule, BuildLazDialog, Compiler, LazIDEIntf,
--- a/ide/mainintf.pas
+++ b/ide/mainintf.pas
@ -62,7 +62,7 @@ uses
 {$ENDIF}
  Classes, LCLType, LCLIntf, StdCtrls, Buttons, Menus, ComCtrls, SysUtils,
  Controls, Graphics, ExtCtrls, Dialogs, FileUtil, Forms, CodeToolManager,
-  CodeCache, OldAvLTree, SynEditKeyCmds,
+  CodeCache, {$IFNDEF VER1_0}AVL_Tree{$ELSE}OldAvLTree{$ENDIF}, SynEditKeyCmds,
  // IDE
  ObjectInspector,
  LazConf, LazarusIDEStrConsts, MacroIntf,
--- a/ide/miscoptions.pas
+++ b/ide/miscoptions.pas
@ -30,8 +30,9 @@ unit MiscOptions;
 interface

 uses
-  Classes, SysUtils, LCLProc, BuildLazDialog, CodeToolsStructs, Laz_XMLCfg,
-  TextTools, LazConf, LazarusIDEStrConsts, IDEProcs;
+  Classes, SysUtils, LCLProc, BuildLazDialog, CodeToolsStructs, TextTools,
+  {$IFNDEF VER1_0}XMLCfg{$ELSE}Laz_XMLCfg{$ENDIF}, LazConf, LazarusIDEStrConsts,
+  IDEProcs;

 type
  { TFindRenameIdentifierOptions }
--- a/ide/project.pp
+++ b/ide/project.pp
@ -47,8 +47,8 @@ uses
 {$IFDEF IDE_MEM_CHECK}
  MemCheck,
 {$ENDIF}
-  Classes, SysUtils, FPCAdds, LCLProc, LCLIntf, LCLType, Laz_XMLCfg, LazConf,
-  Forms, Controls, Dialogs, FileUtil,
+  Classes, SysUtils, FPCAdds, LCLProc, LCLIntf, LCLType, Forms, Controls,
+  Dialogs, {$IFNDEF VER1_0}XMLCfg{$ELSE}Laz_XMLCfg{$ENDIF}, LazConf, FileUtil,
  LazarusIDEStrConsts, CompilerOptions, CodeToolManager, CodeCache,
  EditorOptions, IDEProcs, RunParamsOpts, ProjectIntf, ProjectDefs,
  EditDefineTree, DefineTemplates, PackageDefs, LazIDEIntf;
@ -3169,6 +3169,9 @@ end.

 {
  $Log$
+  Revision 1.177  2005/01/15 13:44:03  vincents
+  use xml units from fpc, if not compiling with fpc 1.0
+
  Revision 1.176  2005/01/13 19:54:58  mattias
  added loading/saving project pathdelim  from Vincent

--- a/ide/projectdefs.pas
+++ b/ide/projectdefs.pas
@ -37,7 +37,8 @@ unit ProjectDefs;
 interface

 uses
-  Classes, SysUtils, Laz_XMLCfg, Forms, SynRegExpr, FileUtil, LCLProc,
+  Classes, SysUtils, {$IFNDEF VER1_0}XMLCfg{$ELSE}Laz_XMLCfg{$ENDIF},
+  Forms, SynRegExpr, FileUtil, LCLProc,
  NewItemIntf, ProjectIntf,
  LazarusIDEStrConsts, PublishModule;

--- a/ide/publishmodule.pas
+++ b/ide/publishmodule.pas
@ -35,7 +35,8 @@ unit PublishModule;
 interface

 uses
-  Classes, SysUtils, Laz_XMLCfg, IDEProcs, SynRegExpr, FileUtil, LCLProc;
+  Classes, SysUtils, {$IFNDEF VER1_0}XMLCfg{$ELSE}Laz_XMLCfg{$ENDIF},
+  IDEProcs, SynRegExpr, FileUtil, LCLProc;

 type
  { TPublishModuleOptions }
--- a/ide/runparamsopts.pas
+++ b/ide/runparamsopts.pas
@ -48,8 +48,8 @@ uses
  MemCheck,
  {$ENDIF}
  Classes, SysUtils, Controls, Forms, Buttons, StdCtrls, ComCtrls, Dialogs,
-  ExtCtrls, LResources, Laz_XMLCfg, IDEProcs, SysVarUserOverrideDlg,
-  InputHistory, LazarusIDEStrConsts, FileUtil;
+  ExtCtrls, LResources, {$IFNDEF VER1_0}XMLCfg{$ELSE}Laz_XMLCfg{$ENDIF},
+  IDEProcs, SysVarUserOverrideDlg, InputHistory, LazarusIDEStrConsts, FileUtil;

 { The xml format version:
    When the format changes (new values, changed formats) we can distinguish old
--- a/ide/sortselectiondlg.pas
+++ b/ide/sortselectiondlg.pas
@ -41,7 +41,8 @@ interface

 uses
  Classes, SysUtils, LCLProc, Forms, Controls, SynEdit, Buttons, StdCtrls,
-  ExtCtrls, IDEOptionDefs, Dialogs, BasicCodeTools, OldAvLTree, TextTools,
+  ExtCtrls, IDEOptionDefs, Dialogs, BasicCodeTools,
+  {$IFNDEF VER1_0}AVL_Tree{$ELSE}OldAvLTree{$ENDIF}, TextTools,
  LazarusIDEStrConsts, EditorOptions, MiscOptions, SynEditHighlighter;
  
 type
--- a/ide/sourcemarks.pas
+++ b/ide/sourcemarks.pas
@ -39,7 +39,8 @@ interface

 uses
  Classes, SysUtils, LCLProc, LResources, Graphics, GraphType, Controls, Menus,
-  OldAvLTree, SynEdit, IDEProcs, EditorOptions;
+  {$IFNDEF VER1_0}AVL_Tree{$ELSE}OldAvLTree{$ENDIF}, SynEdit, IDEProcs,
+  EditorOptions;
  
 type
  TSourceMarks = class;
--- a/packager/addfiletoapackagedlg.pas
+++ b/packager/addfiletoapackagedlg.pas
@ -39,8 +39,8 @@ interface

 uses
  Classes, SysUtils, Forms, Controls, Buttons, ExtCtrls, StdCtrls,
-  LazarusIDEStrConsts, Dialogs, OldAvLTree, FileUtil, IDEProcs, IDEOptionDefs,
-  ComponentReg, PackageDefs, PackageSystem;
+  LazarusIDEStrConsts, Dialogs, {$IFNDEF VER1_0}AVL_Tree{$ELSE}OldAvLTree{$ENDIF},
+  FileUtil, IDEProcs, IDEOptionDefs, ComponentReg, PackageDefs, PackageSystem;
  
 type
  TAddFileToAPackageDlg = class(TForm)
--- a/packager/addtopackagedlg.pas
+++ b/packager/addtopackagedlg.pas
@ -40,8 +40,8 @@ interface
 uses
  Classes, SysUtils, LResources, Forms, Controls, Buttons, StdCtrls, ExtCtrls,
  Dialogs, FileUtil, ComCtrls, LazarusIDEStrConsts, IDEOptionDefs, InputHistory,
-  OldAvLTree, CodeToolManager, IDEDefs, IDEProcs, EnvironmentOpts, PackageSystem,
-  PackageDefs, ComponentReg;
+  {$IFNDEF VER1_0}AVL_Tree{$ELSE}OldAvLTree{$ENDIF}, CodeToolManager, IDEDefs,
+  IDEProcs, EnvironmentOpts, PackageSystem, PackageDefs, ComponentReg;
  
 type
  TAddToPkgType = (
--- a/packager/installpkgsetdlg.pas
+++ b/packager/installpkgsetdlg.pas
@ -39,7 +39,8 @@ interface

 uses
  Classes, SysUtils, LCLProc, LResources, Forms, Controls, Graphics, Dialogs,
-  StdCtrls, Buttons, OldAvLTree, FileUtil, Laz_XMLCfg,
+  StdCtrls, Buttons, FileUtil,
+  {$IFNDEF VER1_0}AVL_Tree, XMLCfg{$ELSE}OldAvLTree, Laz_XMLCfg{$ENDIF},
  LazarusIDEStrConsts, EnvironmentOpts, InputHistory, LazConf,
  PackageDefs, PackageSystem;

--- a/packager/packagedefs.pas
+++ b/packager/packagedefs.pas
@ -45,7 +45,8 @@ unit PackageDefs;
 interface

 uses
-  Classes, SysUtils, LCLProc, LResources, Graphics, Laz_XMLCfg, OldAvLTree,
+  Classes, SysUtils, LCLProc, LResources, Graphics,
+  {$IFNDEF VER1_0}AVL_Tree, XMLCfg{$ELSE}OldAvLTree, Laz_XMLCfg{$ENDIF},
  DefineTemplates, CodeToolManager, EditDefineTree, CompilerOptions, Forms,
  FileUtil, LazarusIDEStrConsts, IDEProcs, ComponentReg, TransferMacros,
  FileReferenceList, PublishModule;
--- a/packager/packageeditor.pas
+++ b/packager/packageeditor.pas
@ -39,7 +39,8 @@ interface

 uses
  Classes, SysUtils, Forms, Controls, StdCtrls, ComCtrls, Buttons, LResources,
-  Graphics, LCLType, LCLProc, Menus, Dialogs, FileUtil, Laz_XMLCfg, OldAvLTree,
+  Graphics, LCLType, LCLProc, Menus, Dialogs, FileUtil,
+  {$IFNDEF VER1_0}AVL_Tree, XMLCfg{$ELSE}OldAvLTree, Laz_XMLCfg{$ENDIF},
  IDEProcs, LazConf, LazarusIDEStrConsts, IDEOptionDefs, IDEDefs,
  CompilerOptions, CompilerOptionsDlg, ComponentReg, PackageDefs, PkgOptionsDlg,
  AddToPackageDlg, PkgVirtualUnitEditor, PackageSystem;
--- a/packager/packagelinks.pas
+++ b/packager/packagelinks.pas
@ -38,8 +38,9 @@ unit PackageLinks;
 interface

 uses
-  Classes, SysUtils, OldAvLTree, Laz_XMLCfg, LCLProc, FileUtil, IDEProcs,
-  MacroIntf, EnvironmentOpts, PackageDefs, LazConf;
+  Classes, SysUtils,
+  {$IFNDEF VER1_0}AVL_Tree, XMLCfg{$ELSE}OldAvLTree, Laz_XMLCfg{$ENDIF},
+  LCLProc, FileUtil, IDEProcs, MacroIntf, EnvironmentOpts, PackageDefs, LazConf;
  
 type

--- a/packager/packagesystem.pas
+++ b/packager/packagesystem.pas
@ -45,10 +45,11 @@ uses
 {$IFDEF IDE_MEM_CHECK}
  MemCheck,
 {$ENDIF}
-  Classes, SysUtils, OldAvLTree, Laz_XMLCfg, FileUtil, LCLProc, Forms, Controls,
-  Dialogs, LazarusIDEStrConsts, IDEProcs, LazConf, CompilerOptions,
-  PackageLinks, PackageDefs, LazarusPackageIntf, ComponentReg, RegisterFCL,
-  RegisterLCL, RegisterSynEdit, RegisterIDEIntf;
+  Classes, SysUtils, FileUtil,
+  {$IFNDEF VER1_0}AVL_Tree, XMLCfg{$ELSE}OldAvLTree, Laz_XMLCfg{$ENDIF},
+  LCLProc, Forms, Controls, Dialogs, LazarusIDEStrConsts, IDEProcs, LazConf,
+  CompilerOptions, PackageLinks, PackageDefs, LazarusPackageIntf, ComponentReg,
+  RegisterFCL, RegisterLCL, RegisterSynEdit, RegisterIDEIntf;
  
 type
  TFindPackageFlag = (
--- a/packager/pkggraphexplorer.pas
+++ b/packager/pkggraphexplorer.pas
@ -39,7 +39,8 @@ interface

 uses
  Classes, SysUtils, LCLProc, LResources, Forms, Controls, Buttons, ComCtrls,
-  StdCtrls, Menus, Dialogs, Graphics, FileCtrl, OldAvLTree,
+  StdCtrls, Menus, Dialogs, Graphics, FileCtrl,
+  {$IFNDEF VER1_0}AVL_Tree{$ELSE}OldAvLTree{$ENDIF},
  IDECommands,
  LazConf, LazarusIDEStrConsts, IDEProcs, IDEOptionDefs, EnvironmentOpts,
  Project, PackageDefs, PackageSystem, PackageEditor;
--- a/packager/pkgmanager.pas
+++ b/packager/pkgmanager.pas
@ -47,7 +47,8 @@ uses
  // FCL, LCL
  Classes, SysUtils, LCLProc, Forms, Controls, FileUtil, Dialogs, Menus,
  // codetools
-  CodeToolManager, CodeCache, BasicCodeTools, Laz_XMLCfg, OldAvLTree,
+  CodeToolManager, CodeCache, BasicCodeTools,
+  {$IFNDEF VER1_0}AVL_Tree, XMLCfg{$ELSE}OldAvLTree, Laz_XMLCfg{$ENDIF},
  // IDE Interface
  NewItemIntf, ProjectIntf, PackageIntf, LazIDEIntf,
  // IDE
--- a/tools/updatepofiles.pas
+++ b/tools/updatepofiles.pas
@ -36,7 +36,7 @@ program UpdatePoFiles;
 {$mode objfpc}{$H+}

 uses
-  Classes, SysUtils, FileUtil, OldAvLTree;
+  Classes, SysUtils, FileUtil, AvLTree;
  
 type
  TMsgItem = record