From 751e89bca4fef6814f2a0f8be07a949503f7e71a Mon Sep 17 00:00:00 2001 From: Juha Date: Sun, 11 Jun 2023 14:01:42 +0300 Subject: [PATCH] Reduce "deprecated" warnings for LazUtils.UITypes. --- components/buildintf/packageintf.pas | 5 +++-- components/buildintf/packagelinkintf.pas | 3 ++- components/buildintf/projectintf.pas | 3 ++- components/ideintf/dbgridcolumnspropeditform.pas | 5 +++-- components/ideintf/graphpropedits.pas | 3 ++- components/ideintf/idedialogs.pas | 3 ++- components/ideintf/idetextconverter.pas | 3 ++- components/ideintf/lazideintf.pas | 3 ++- components/ideintf/texttools.pas | 5 ++--- components/ideintf/unitresources.pas | 5 ++--- components/messagecomposer/messagecomposer.pas | 3 +-- ide/buildmodesmanager.pas | 3 ++- ide/diskdiffsdialog.pas | 3 ++- ide/exttools.pas | 3 ++- ide/publishmoduledlg.pas | 3 ++- lcl/interfaces/gtk3/gtk3boxes.pas | 3 +-- packager/packagedefs.pas | 5 +++-- packager/projpackchecks.pas | 3 ++- 18 files changed, 37 insertions(+), 27 deletions(-) diff --git a/components/buildintf/packageintf.pas b/components/buildintf/packageintf.pas index b879da72b4..aa3eed66b2 100644 --- a/components/buildintf/packageintf.pas +++ b/components/buildintf/packageintf.pas @@ -16,9 +16,10 @@ unit PackageIntf; interface uses - Classes, SysUtils, contnrs, + Classes, SysUtils, Contnrs, + {$IF FPC_FULLVERSION >= 30200}System.{$ENDIF}UITypes, // LazUtils - LazConfigStorage, LazMethodList, LazLoggerBase, UITypes, + LazConfigStorage, LazMethodList, LazLoggerBase, // BuildIntf NewItemIntf, ProjPackIntf, PackageDependencyIntf, IDEOptionsIntf; diff --git a/components/buildintf/packagelinkintf.pas b/components/buildintf/packagelinkintf.pas index 8fc9c28ca2..aa151a3e3b 100644 --- a/components/buildintf/packagelinkintf.pas +++ b/components/buildintf/packagelinkintf.pas @@ -6,8 +6,9 @@ interface uses SysUtils, Classes, + {$IF FPC_FULLVERSION >= 30200}System.{$ENDIF}UITypes, // LazUtils - LazFileUtils, UITypes, + LazFileUtils, // BuildIntf PackageDependencyIntf, PackageIntf; diff --git a/components/buildintf/projectintf.pas b/components/buildintf/projectintf.pas index 544f934163..c2f9e5ac0f 100644 --- a/components/buildintf/projectintf.pas +++ b/components/buildintf/projectintf.pas @@ -17,8 +17,9 @@ interface uses Classes, SysUtils, Contnrs, + {$IF FPC_FULLVERSION >= 30200}System.{$ENDIF}UITypes, // LazUtils - FileUtil, LazFileUtils, LazFileCache, LazMethodList, UITypes, AvgLvlTree, + FileUtil, LazFileUtils, LazFileCache, LazMethodList, AvgLvlTree, // BuildIntf IDEOptionsIntf, NewItemIntf, ProjPackIntf, CompOptsIntf, BuildStrConsts; diff --git a/components/ideintf/dbgridcolumnspropeditform.pas b/components/ideintf/dbgridcolumnspropeditform.pas index 1e9e6108c0..4855a7e935 100644 --- a/components/ideintf/dbgridcolumnspropeditform.pas +++ b/components/ideintf/dbgridcolumnspropeditform.pas @@ -5,11 +5,12 @@ unit DBGridColumnsPropEditForm; interface uses - Classes, SysUtils, typinfo, db, + Classes, SysUtils, TypInfo, DB, + {$IF FPC_FULLVERSION >= 30200}System.{$ENDIF}UITypes, // LCL LCLType, Dialogs, Forms, ComCtrls, StdCtrls, ActnList, DBGrids, // LazUtils - UITypes, LazLoggerBase, + LazLoggerBase, // IdeIntf ObjInspStrConsts, IDEImagesIntf, PropEdits, PropEditUtils; diff --git a/components/ideintf/graphpropedits.pas b/components/ideintf/graphpropedits.pas index fd74aa73b0..e1665f2b7c 100644 --- a/components/ideintf/graphpropedits.pas +++ b/components/ideintf/graphpropedits.pas @@ -17,10 +17,11 @@ interface uses Types, Classes, TypInfo, SysUtils, Math, + {$IF FPC_FULLVERSION >= 30200}System.{$ENDIF}UITypes, // LCL LCLType, Forms, Graphics, Buttons, Menus, Dialogs, Grids, ImgList, EditBtn, // LazUtils - GraphType, LazFileUtils, UITypes, + GraphType, LazFileUtils, // IdeIntf PropEdits, GraphicPropEdit; // defines TGraphicPropertyEditorForm diff --git a/components/ideintf/idedialogs.pas b/components/ideintf/idedialogs.pas index 53aa94d7d6..8ea903c892 100644 --- a/components/ideintf/idedialogs.pas +++ b/components/ideintf/idedialogs.pas @@ -18,10 +18,11 @@ interface uses Classes, + {$IF FPC_FULLVERSION >= 30200}System.{$ENDIF}UITypes, // LCL Dialogs, // LazUtils - UITypes, LazFileCache, + LazFileCache, // BuildIntf LazMsgWorker; diff --git a/components/ideintf/idetextconverter.pas b/components/ideintf/idetextconverter.pas index 7f3369977e..aa6faddfd3 100644 --- a/components/ideintf/idetextconverter.pas +++ b/components/ideintf/idetextconverter.pas @@ -22,10 +22,11 @@ interface uses Classes, SysUtils, TypInfo, + {$IF FPC_FULLVERSION >= 30200}System.{$ENDIF}UITypes, // LCL LCLProc, // LazUtils - UITypes, FileUtil, LazFileUtils, LazUTF8, LazLoggerBase, + FileUtil, LazFileUtils, LazUTF8, LazLoggerBase, // IdeIntf SrcEditorIntf, PropEdits, ObjInspStrConsts; diff --git a/components/ideintf/lazideintf.pas b/components/ideintf/lazideintf.pas index b10e300cd8..3b1f5a540e 100644 --- a/components/ideintf/lazideintf.pas +++ b/components/ideintf/lazideintf.pas @@ -17,10 +17,11 @@ interface uses Classes, SysUtils, + {$IF FPC_FULLVERSION >= 30200}System.{$ENDIF}UITypes, // LCL Forms, Controls, LazHelpHTML, // LazUtils - UITypes, LazMethodList, AvgLvlTree, + LazMethodList, AvgLvlTree, // BuildIntf BaseIDEIntf, IDEOptionsIntf, CompOptsIntf, ProjectIntf, IDEExternToolIntf, PackageIntf, // IdeIntf diff --git a/components/ideintf/texttools.pas b/components/ideintf/texttools.pas index c6cc84e6bb..86e8722a18 100644 --- a/components/ideintf/texttools.pas +++ b/components/ideintf/texttools.pas @@ -17,10 +17,9 @@ interface uses Classes, SysUtils, + {$IF FPC_FULLVERSION >= 30200}System.{$ENDIF}UITypes, // LCL - LCLType, - // LazUtils - UITypes; + LCLType; { Sorting } type diff --git a/components/ideintf/unitresources.pas b/components/ideintf/unitresources.pas index e52a3d6b25..7339617882 100644 --- a/components/ideintf/unitresources.pas +++ b/components/ideintf/unitresources.pas @@ -20,10 +20,9 @@ interface uses Classes, SysUtils, + {$IF FPC_FULLVERSION >= 30200}System.{$ENDIF}UITypes, // LCL - LCLMemManager, Forms, LResources, - // LazUtils - UITypes; + LCLMemManager, Forms, LResources; type diff --git a/components/messagecomposer/messagecomposer.pas b/components/messagecomposer/messagecomposer.pas index 0281c95bee..f373c0c3b8 100644 --- a/components/messagecomposer/messagecomposer.pas +++ b/components/messagecomposer/messagecomposer.pas @@ -27,11 +27,10 @@ interface uses Classes, SysUtils, + {$IF FPC_FULLVERSION >= 30200}System.{$ENDIF}UITypes, // LCL LResources, LCLType, Forms, Controls, Graphics, Dialogs, StdCtrls, ExtCtrls, Spin, Grids, ActnList, Buttons, EditBtn, - // LazUtils - UITypes, // IdeIntf IDECommands, MenuIntf, LazIDEIntf, SrcEditorIntf; diff --git a/ide/buildmodesmanager.pas b/ide/buildmodesmanager.pas index 1fd11b318c..d00cf4cea2 100644 --- a/ide/buildmodesmanager.pas +++ b/ide/buildmodesmanager.pas @@ -32,10 +32,11 @@ interface uses Classes, SysUtils, + {$IF FPC_FULLVERSION >= 30200}System.{$ENDIF}UITypes, // LCL Forms, Controls, Dialogs, StdCtrls, Grids, Menus, ComCtrls, ButtonPanel, LCLProc, // LazUtils - LazFileUtils, LazLoggerBase, UITypes, + LazFileUtils, LazLoggerBase, // IdeIntf IDEDialogs, CompOptsIntf, IDEOptionsIntf, LazIDEIntf, IDEImagesIntf, // IDE diff --git a/ide/diskdiffsdialog.pas b/ide/diskdiffsdialog.pas index 2a2156767f..c3a7e231b6 100644 --- a/ide/diskdiffsdialog.pas +++ b/ide/diskdiffsdialog.pas @@ -30,12 +30,13 @@ interface uses // RTL + FCL Classes, SysUtils, + {$IF FPC_FULLVERSION >= 30200}System.{$ENDIF}UITypes, // LCL LCLProc, LCLType, Forms, StdCtrls, ExtCtrls, CheckLst, ButtonPanel, Buttons, // CodeTools FileProcs, CodeCache, // LazUtils - LazFileUtils, UITypes, LazFileCache, + LazFileUtils, LazFileCache, // IdeIntf IDEImagesIntf, // SynEdit diff --git a/ide/exttools.pas b/ide/exttools.pas index fcfc5dd16d..16d83b8125 100644 --- a/ide/exttools.pas +++ b/ide/exttools.pas @@ -36,9 +36,10 @@ interface uses // RTL + FCL Classes, SysUtils, math, process, Pipes, Laz_AVL_Tree, + {$IF FPC_FULLVERSION >= 30200}System.{$ENDIF}UITypes, // LazUtils FileUtil, LazFileUtils, LazUtilities, LazLoggerBase, UTF8Process, LazUTF8, - UITypes, AvgLvlTree, + AvgLvlTree, // BuildIntf IDEExternToolIntf, BaseIDEIntf, MacroIntf, LazMsgWorker, // IDE diff --git a/ide/publishmoduledlg.pas b/ide/publishmoduledlg.pas index d751d69df8..5c1c6052e9 100644 --- a/ide/publishmoduledlg.pas +++ b/ide/publishmoduledlg.pas @@ -33,10 +33,11 @@ interface uses Classes, SysUtils, StrUtils, Zipper, + {$IF FPC_FULLVERSION >= 30200}System.{$ENDIF}UITypes, // LCL LCLType, Forms, StdCtrls, Dialogs, Buttons, ButtonPanel, LCLIntf, // LazUtils - FileUtil, LazFileUtils, LazStringUtils, LazLoggerBase, UITypes, LazUTF8, + FileUtil, LazFileUtils, LazStringUtils, LazLoggerBase, LazUTF8, // BuildIntf ProjPackIntf, CompOptsIntf, PublishModuleIntf, // IdeIntf diff --git a/lcl/interfaces/gtk3/gtk3boxes.pas b/lcl/interfaces/gtk3/gtk3boxes.pas index 9c3f82d9c6..64cdd488df 100644 --- a/lcl/interfaces/gtk3/gtk3boxes.pas +++ b/lcl/interfaces/gtk3/gtk3boxes.pas @@ -13,8 +13,7 @@ unit Gtk3Boxes; interface uses - // LazUtils - UITypes, + {$IF FPC_FULLVERSION >= 30200}System.{$ENDIF}UITypes, // LCL LCLType, LCLStrConsts,LCLProc, InterfaceBase, LazGtk3, LazGLib2, LazGObject2, LazGdk3, gtk3objects; diff --git a/packager/packagedefs.pas b/packager/packagedefs.pas index bf61c5e5a1..13316782b7 100644 --- a/packager/packagedefs.pas +++ b/packager/packagedefs.pas @@ -38,7 +38,8 @@ interface uses // FCL - Classes, SysUtils, contnrs, typinfo, Laz_AVL_Tree, + Classes, SysUtils, Contnrs, TypInfo, Laz_AVL_Tree, + {$IF FPC_FULLVERSION >= 30200}System.{$ENDIF}UITypes, // LCL Forms, ImgList, // Codetools @@ -46,7 +47,7 @@ uses CodeCache, CodeToolsCfgScript, CodeToolsStructs, BasicCodeTools, // LazUtils FileUtil, LazFileUtils, LazUtilities, LazFileCache, LazUTF8, FileReferenceList, - LazTracer, LazLoggerBase, UITypes, Laz2_XMLCfg, AvgLvlTree, + LazTracer, LazLoggerBase, Laz2_XMLCfg, AvgLvlTree, // BuildIntf MacroIntf, MacroDefIntf, IDEOptionsIntf, PublishModuleIntf, PackageDependencyIntf, PackageIntf, FppkgIntf, diff --git a/packager/projpackchecks.pas b/packager/projpackchecks.pas index d376ae43b7..71c532ad18 100644 --- a/packager/projpackchecks.pas +++ b/packager/projpackchecks.pas @@ -6,10 +6,11 @@ interface uses Classes, SysUtils, + {$IF FPC_FULLVERSION >= 30200}System.{$ENDIF}UITypes, // LCL LCLProc, Forms, Dialogs, // LazUtils - FileUtil, LazFileUtils, UITypes, + FileUtil, LazFileUtils, // Codetools CodeToolManager, CodeCache, // BuildIntf