renamed avl_tree.pas to oldavltree.pas for new fpc 1.9.5

git-svn-id: trunk@6210 -
2025-04-08 09:38:12 +02:00 · 2004-11-06 19:49:14 +00:00 · 2004-11-06 19:49:14 +00:00 · 68c0ee8c21
commit 68c0ee8c21
parent c30a2ded81
44 changed files with 58 additions and 48 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -4,7 +4,6 @@ components/README.txt svneol=native#text/plain
 components/cgi/cgilaz.lpk svneol=native#text/pascal
 components/cgi/cgimodules.pas svneol=native#text/pascal
 components/codetools/allcodetoolunits.pp svneol=native#text/pascal
-components/codetools/avl_tree.pas svneol=native#text/pascal
 components/codetools/basiccodetools.pas svneol=native#text/pascal
 components/codetools/codeatom.pas svneol=native#text/pascal
 components/codetools/codecache.pas svneol=native#text/pascal
@ -50,6 +49,7 @@ components/codetools/memcheck.pas svneol=native#text/pascal
 components/codetools/memcheck_laz.inc svneol=native#text/pascal
 components/codetools/methodjumptool.pas svneol=native#text/pascal
 components/codetools/multikeywordlisttool.pas svneol=native#text/pascal
+components/codetools/oldavltree.pas svneol=native#text/pascal
 components/codetools/pascalparsertool.pas svneol=native#text/pascal
 components/codetools/pascalreadertool.pas svneol=native#text/pascal
 components/codetools/resourcecodetool.pas svneol=native#text/pascal
--- a/components/codetools/allcodetoolunits.pp
+++ b/components/codetools/allcodetoolunits.pp
@ -19,7 +19,7 @@ uses
  FindDeclarationTool, StdCodeTools, MethodJumpTool, EventCodeTool,
  CodeCompletionTool, LinkScanner, FindDeclarationCache, BasicCodeTools,
  CodeTree, CodeAtom, SourceChanger, CodeToolMemManager, CodeCache,
-  KeywordFuncLists, SourceLog, ExprEval, DefineTemplates, FileProcs, AVL_Tree,
+  KeywordFuncLists, SourceLog, ExprEval, DefineTemplates, FileProcs, OldAvLTree,
  CodeToolsStrConsts, MultiKeyWordListTool, ResourceCodeTool, CodeToolsStructs,
  // fast xml units
  laz_dom, laz_xmlcfg, laz_xmlread, laz_xmlwrite;
@ -32,6 +32,9 @@ end.
 { =============================================================================

  $Log$
+  Revision 1.16  2004/11/06 19:49:11  mattias
+  renamed avl_tree.pas to oldavltree.pas for new fpc 1.9.5
+
  Revision 1.15  2004/07/10 18:17:28  mattias
  added Delphi ToDo support, Application.WndProc, small bugfixes  from Colin

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

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

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

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

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

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

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

 uses
-  Classes, SysUtils, CodeToolsStrConsts, ExprEval, Laz_XMLCfg, AVL_Tree,
+  Classes, SysUtils, CodeToolsStrConsts, ExprEval, Laz_XMLCfg, OldAvLTree,
  Process, KeywordFuncLists, FileProcs;

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

 type
--- a/components/codetools/extractproctool.pas
+++ b/components/codetools/extractproctool.pas
@ -44,7 +44,7 @@ interface
 uses
  Classes, SysUtils, FileProcs, CodeToolsStrConsts, CodeTree, CodeAtom,
  PascalParserTool, CodeCompletionTool, KeywordFuncLists, BasicCodeTools,
-  LinkScanner, AVL_Tree, SourceChanger, FindDeclarationTool;
+  LinkScanner, OldAvLTree, SourceChanger, FindDeclarationTool;
  
 type
  { TExtractProcTool }
--- a/components/codetools/finddeclarationcache.pas
+++ b/components/codetools/finddeclarationcache.pas
@ -37,7 +37,7 @@ interface
 { $DEFINE HardExceptions}

 uses
-  Classes, SysUtils, FileProcs, BasicCodeTools, AVL_Tree, CodeTree, LinkScanner,
+  Classes, SysUtils, FileProcs, BasicCodeTools, OldAvLTree, CodeTree, LinkScanner,
  PascalParserTool, CodeToolMemManager;

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

--- a/components/codetools/identcompletiontool.pas
+++ b/components/codetools/identcompletiontool.pas
@ -55,7 +55,7 @@ uses
  MemCheck,
  {$ENDIF}
  Classes, SysUtils, FileProcs, CodeTree, CodeAtom, CustomCodeTool,
-  KeywordFuncLists, BasicCodeTools, LinkScanner, AVL_Tree, CodeToolMemManager,
+  KeywordFuncLists, BasicCodeTools, LinkScanner, OldAvLTree, CodeToolMemManager,
  SourceChanger, FindDeclarationTool, PascalParserTool;
  

--- a/components/codetools/laz_dom.pas
+++ b/components/codetools/laz_dom.pas
@ -47,7 +47,7 @@ interface

 uses
  {$IFDEF MEM_CHECK}MemCheck,{$ENDIF}
-  SysUtils, Classes, AVL_Tree;
+  SysUtils, Classes, OldAvLTree;


 type
@ -1633,6 +1633,9 @@ end.

 {
  $Log$
+  Revision 1.8  2004/11/06 19:49:12  mattias
+  renamed avl_tree.pas to oldavltree.pas for new fpc 1.9.5
+
  Revision 1.7  2004/10/28 09:38:16  mattias
  fixed COPYING.modifiedLGPL links

--- 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, AVL_Tree;
+  LinkScanner, OldAvLTree;


 type
--- a/components/codetools/oldavltree.pas
+++ b/components/codetools/oldavltree.pas
@ -25,7 +25,7 @@
    balanced, so that inserting, deleting and finding a node is performed in
    O(log(#Nodes)).
 }
-unit AVL_Tree;
+unit OldAvLTree;

 {$ifdef FPC}{$mode objfpc}{$endif}{$H+}

--- a/components/codetools/pascalparsertool.pas
+++ b/components/codetools/pascalparsertool.pas
@ -43,7 +43,7 @@ uses
  {$ENDIF}
  Classes, SysUtils, FileProcs, CodeToolsStrConsts, CodeTree, CodeAtom,
  CustomCodeTool, MultiKeyWordListTool, KeywordFuncLists,
-  BasicCodeTools, LinkScanner, CodeCache, AVL_Tree;
+  BasicCodeTools, LinkScanner, CodeCache, OldAvLTree;

 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, AVL_Tree;
+  LinkScanner, OldAvLTree;

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

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

 type
--- a/components/gtk/gtkglarea/gtkglareacontrol.pas
+++ b/components/gtk/gtkglarea/gtkglareacontrol.pas
@ -20,8 +20,8 @@ unit GTKGLAreaControl;
 interface

 uses
-  Classes, SysUtils, LCLType, {$IFDEF VER1_0}Linux{$ELSE}Unix{$ENDIF}, Forms,
-  Controls, Graphics, LMessages, InterfaceBase, WSLCLClasses, WSControls,
+  Classes, SysUtils, LCLType, LCLIntf, {$IFDEF VER1_0}Linux{$ELSE}Unix{$ENDIF},
+  Forms, Controls, Graphics, LMessages, InterfaceBase, WSLCLClasses, WSControls,
  LResources, GTKInt, GLib, Gtk, NVGL, GTKGLArea_Int;
  
 type
@ -328,14 +328,13 @@ procedure TCustomGTKGLAreaControl.UpdateFrameTimeDiff;
 var
  hour, minutes, secs, msecs, usecs: word;
 begin
-  GetTime(hour, minutes, secs, msecs, usecs);
-  FCurrentFrameTime:=(((minutes*60)+secs) * 1000)+msecs;
+  FCurrentFrameTime:=GetTickCount;
  if FLastFrameTime=0 then
    FLastFrameTime:=FCurrentFrameTime;
  // calculate time since last call:
  FFrameDiffTime:=FCurrentFrameTime-FLastFrameTime;
-  // if the hour changed, the minutes restarts:
-  if (FFrameDiffTime<0) then inc(FFrameDiffTime,60*60*1000);
+  // if the counter is reset restart:
+  if (FFrameDiffTime<0) then FFrameDiffTime:=1;
  FLastFrameTime:=FCurrentFrameTime;
 end;

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

 uses
  Classes, SysUtils, Math, LCLProc, LResources, Forms, Controls, Buttons,
-  ComCtrls, StdCtrls, ExtCtrls, Menus, Dialogs, Graphics, FileUtil, AVL_Tree,
+  ComCtrls, StdCtrls, ExtCtrls, Menus, Dialogs, Graphics, FileUtil, OldAvLTree,
  LazarusIDEStrConsts, IDEProcs, IDEOptionDefs, EnvironmentOpts,
  Project, PackageDefs, PackageSystem;
  
--- a/ide/componentpalette.pas
+++ b/ide/componentpalette.pas
@ -39,7 +39,7 @@ interface

 uses
  Classes, SysUtils, Controls, Dialogs, Graphics, ExtCtrls, Buttons, Menus,
-  LResources, AVL_Tree,
+  LResources, OldAvLTree,
  {$IFDEF CustomIDEComps}
  CustomIDEComps,
  {$ENDIF}
--- a/ide/customformeditor.pp
+++ b/ide/customformeditor.pp
@ -42,7 +42,7 @@ uses
  Classes, SysUtils, TypInfo, Math, LCLProc, Graphics, Controls, Forms, Menus,
  Dialogs,
  // components
-  AVL_Tree, PropEdits, ObjectInspector, IDECommands,
+  OldAvLTree, PropEdits, ObjectInspector, IDECommands,
  // IDE
  JITForms, NonControlForms, FormEditingIntf, ComponentReg, IDEProcs,
  ComponentEditors, KeyMapping, EditorOptions, DesignerProcs;
--- a/ide/dialogprocs.pas
+++ b/ide/dialogprocs.pas
@ -38,7 +38,7 @@ interface

 uses
  Classes, SysUtils, Forms, Controls, Dialogs, FileUtil, CodeCache,
-  CodeToolManager, AVL_Tree,
+  CodeToolManager, OldAvLTree,
  IDEProcs, LazarusIDEStrConsts;

 type
--- a/ide/environmentopts.pp
+++ b/ide/environmentopts.pp
@ -1010,7 +1010,7 @@ begin
    Path:='EnvironmentOptions/';
    
    FileVersion:=XMLConfig.GetValue(Path+'Version/Value',0);
-    
+
    // language
    LoadLanguage;

--- a/ide/filereferencelist.pas
+++ b/ide/filereferencelist.pas
@ -39,7 +39,7 @@ unit FileReferenceList;
 interface

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

--- a/ide/include/unix/lazbaseconf.inc
+++ b/ide/include/unix/lazbaseconf.inc
@ -74,6 +74,7 @@ end;
 ---------------------------------------------------------------------------}
 procedure SetPrimaryConfigPath(const NewValue: String);
 begin
+writeln('SetPrimaryConfigPath NewValue="',NewValue,'" -> "',ExpandFileName(NewValue),'"');
  PrimaryConfigPath:=ExpandFileName{FExpand}(NewValue);
 end;

@ -193,6 +194,7 @@ end;
 ---------------------------------------------------------------------------}
 procedure InternalInit;
 begin
+  //writeln('InternalInit AAA1 ',Dos.FExpand{FExpand}('~/.lazarus'));
  PrimaryConfigPath:=ExpandFileName{FExpand}('~/.lazarus');
  SecondaryConfigPath:='/etc/lazarus';
 end;
--- 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
-  AVL_Tree, Laz_XMLCfg, CodeToolsStructs, CodeToolManager, CodeCache,
+  OldAvLTree, Laz_XMLCfg, CodeToolsStructs, CodeToolManager, CodeCache,
  DefineTemplates,
  // IDE interface
  AllIDEIntf, ObjectInspector, PropEdits, IDECommands, SrcEditorIntf,
@ -10968,6 +10968,9 @@ end.

 { =============================================================================
  $Log$
+  Revision 1.789  2004/11/06 19:49:11  mattias
+  renamed avl_tree.pas to oldavltree.pas for new fpc 1.9.5
+
  Revision 1.788  2004/11/05 22:05:41  vincents
  Use symbolic constant for restart exitcode.

--- 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, AVL_Tree, SynEditKeyCmds,
+  CodeCache, OldAvLTree, 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, AVL_Tree, SynEditKeyCmds,
+  CodeCache, OldAvLTree, SynEditKeyCmds,
  // IDE
  ObjectInspector,
  LazConf, LazarusIDEStrConsts,
--- a/ide/sortselectiondlg.pas
+++ b/ide/sortselectiondlg.pas
@ -41,7 +41,7 @@ interface

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

 uses
  Classes, SysUtils, LCLProc, LResources, Graphics, GraphType, Controls, Menus,
-  AVL_Tree, SynEdit, IDEProcs, EditorOptions;
+  OldAvLTree, SynEdit, IDEProcs, EditorOptions;
  
 type
  TSourceMarks = class;
--- a/packager/addfiletoapackagedlg.pas
+++ b/packager/addfiletoapackagedlg.pas
@ -39,7 +39,7 @@ interface

 uses
  Classes, SysUtils, Forms, Controls, Buttons, ExtCtrls, StdCtrls,
-  LazarusIDEStrConsts, Dialogs, AVL_Tree, FileUtil, IDEProcs, IDEOptionDefs,
+  LazarusIDEStrConsts, Dialogs, OldAvLTree, FileUtil, IDEProcs, IDEOptionDefs,
  ComponentReg, PackageDefs, PackageSystem;
  
 type
--- a/packager/addtopackagedlg.pas
+++ b/packager/addtopackagedlg.pas
@ -40,7 +40,7 @@ interface
 uses
  Classes, SysUtils, LResources, Forms, Controls, Buttons, StdCtrls, ExtCtrls,
  Dialogs, FileUtil, ComCtrls, LazarusIDEStrConsts, IDEOptionDefs, InputHistory,
-  AVL_Tree, CodeToolManager, IDEDefs, IDEProcs, EnvironmentOpts, PackageSystem,
+  OldAvLTree, CodeToolManager, IDEDefs, IDEProcs, EnvironmentOpts, PackageSystem,
  PackageDefs, ComponentReg;
  
 type
--- a/packager/packagedefs.pas
+++ b/packager/packagedefs.pas
@ -45,7 +45,7 @@ unit PackageDefs;
 interface

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

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

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

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

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