Remove old deprecated functions and units.

This commit is contained in:
Juha 2023-06-15 01:26:02 +03:00
parent 37b459f0c5
commit 74446557f6
17 changed files with 14 additions and 344 deletions

View File

@ -308,7 +308,6 @@ type
procedure ConsistencyCheck; virtual;
class function GetParserName: string; virtual;
class function GetLocalizedParserName: string; virtual;
class function IsSubTool(const SubTool: string): boolean; deprecated 'use CanParseSubTool';
class function CanParseSubTool(const SubTool: string): boolean; virtual;
class function GetMsgPattern({%H-}SubTool: string; {%H-}MsgID: integer;
out Urgency: TMessageLineUrgency): string; virtual;
@ -707,7 +706,6 @@ type
property Title: string read fTitle write fTitle;
property Hint: string read FHint write FHint;
property Executable: string read FExecutable write FExecutable;
property Filename: string read FExecutable write FExecutable; deprecated; // use Executable instead
property CmdLineParams: string read fCmdLineParams write fCmdLineParams;
property WorkingDirectory: string read fWorkingDirectory write fWorkingDirectory;
property EnvironmentOverrides: TStringList read FEnvironmentOverrides write SetEnvironmentOverrides;
@ -1552,11 +1550,6 @@ begin
Result:=DefaultSubTool;
end;
class function TExtToolParser.IsSubTool(const SubTool: string): boolean;
begin
Result:=CanParseSubTool(SubTool);
end;
class function TExtToolParser.CanParseSubTool(const SubTool: string): boolean;
begin
Result:=CompareText(DefaultSubTool,SubTool)=0;

View File

@ -228,7 +228,6 @@ type
IdentifierHistory: TIdentifierHistoryList;
Positions: TCodeXYPositions;
Indenter: TFullyAutomaticBeautifier;
property FPCDefinesCache: TCompilerDefinesCache read CompilerDefinesCache; deprecated 'use CompilerDefinesCache'; // 1.9
property Beautifier: TBeautifyCodeOptions read GetBeautifier;
constructor Create;
@ -381,7 +380,6 @@ type
UseCache: boolean = true): string;// value of macro #FPCUnitPath
procedure GetFPCVersionForDirectory(const Directory: string;
out FPCVersion, FPCRelease, FPCPatch: integer);
function GetPCVersionForDirectory(const Directory: string): integer; deprecated 'use below'; // 2.0.1
function GetPCVersionForDirectory(const Directory: string; out Kind: TPascalCompiler): integer;
function GetNamespacesForDirectory(const Directory: string;
UseCache: boolean = true): string;// value of macro #Namespaces
@ -724,21 +722,12 @@ type
function AddUnitToMainUsesSection(Code: TCodeBuffer;
const NewUnitName, NewUnitInFile: string;
const Flags: TAddUsesFlags = []): boolean; overload;
function AddUnitToMainUsesSection(Code: TCodeBuffer;
const NewUnitName, NewUnitInFile: string;
AsLast: boolean; CheckSpecialUnits: boolean = true): boolean; overload; deprecated;
function AddUnitToMainUsesSectionIfNeeded(Code: TCodeBuffer;
const NewUnitName, NewUnitInFile: string;
const Flags: TAddUsesFlags = []): boolean;
function AddUnitToMainUsesSectionIfNeeded(Code: TCodeBuffer;
const NewUnitName, NewUnitInFile: string;
AsLast: boolean; CheckSpecialUnits: boolean = true): boolean; overload; deprecated;
function AddUnitToImplementationUsesSection(Code: TCodeBuffer;
const NewUnitName, NewUnitInFile: string;
const Flags: TAddUsesFlags = []): boolean;
function AddUnitToImplementationUsesSection(Code: TCodeBuffer;
const NewUnitName, NewUnitInFile: string;
AsLast: boolean; CheckSpecialUnits: boolean = true): boolean; overload; deprecated;
const Flags: TAddUsesFlags = []): boolean;
function RemoveUnitFromAllUsesSections(Code: TCodeBuffer;
const AnUnitName: string): boolean;
function FindUsedUnitFiles(Code: TCodeBuffer; var MainUsesSection: TStrings
@ -1735,15 +1724,6 @@ begin
FPCPatch:=FPCFullVersion mod 100;
end;
function TCodeToolManager.GetPCVersionForDirectory(const Directory: string
): integer;
var
Kind: TPascalCompiler;
begin
Result:=GetPCVersionForDirectory(Directory,Kind);
if Kind=pcFPC then ;
end;
function TCodeToolManager.GetPCVersionForDirectory(const Directory: string; out
Kind: TPascalCompiler): integer;
var
@ -5179,18 +5159,6 @@ begin
end;
end;
function TCodeToolManager.AddUnitToMainUsesSection(Code: TCodeBuffer;
const NewUnitName, NewUnitInFile: string; AsLast: boolean;
CheckSpecialUnits: boolean = true): boolean;
var
Flags: TAddUsesFlags;
begin
Flags:=[];
if AsLast then Include(Flags,aufLast);
if not CheckSpecialUnits then Include(Flags,aufNotCheckSpecialUnit);
Result:=AddUnitToMainUsesSection(Code,NewUnitName,NewUnitInFile,Flags);
end;
function TCodeToolManager.AddUnitToMainUsesSectionIfNeeded(Code: TCodeBuffer;
const NewUnitName, NewUnitInFile: string; const Flags: TAddUsesFlags
): boolean;
@ -5211,18 +5179,6 @@ begin
end;
end;
function TCodeToolManager.AddUnitToMainUsesSectionIfNeeded(Code: TCodeBuffer;
const NewUnitName, NewUnitInFile: string; AsLast: boolean;
CheckSpecialUnits: boolean): boolean;
var
Flags: TAddUsesFlags;
begin
Flags:=[];
if AsLast then Include(Flags,aufLast);
if not CheckSpecialUnits then Include(Flags,aufNotCheckSpecialUnit);
Result:=AddUnitToMainUsesSectionIfNeeded(Code,NewUnitName,NewUnitInFile,Flags);
end;
function TCodeToolManager.AddUnitToImplementationUsesSection(Code: TCodeBuffer;
const NewUnitName, NewUnitInFile: string; const Flags: TAddUsesFlags
): boolean;
@ -5241,18 +5197,6 @@ begin
end;
end;
function TCodeToolManager.AddUnitToImplementationUsesSection(Code: TCodeBuffer;
const NewUnitName, NewUnitInFile: string; AsLast: boolean;
CheckSpecialUnits: boolean): boolean;
var
Flags: TAddUsesFlags;
begin
Flags:=[];
if AsLast then Include(Flags,aufLast);
if not CheckSpecialUnits then Include(Flags,aufNotCheckSpecialUnit);
Result:=AddUnitToImplementationUsesSection(Code,NewUnitName,NewUnitInFile,Flags);
end;
function TCodeToolManager.RemoveUnitFromAllUsesSections(Code: TCodeBuffer;
const AnUnitName: string): boolean;
begin

View File

@ -363,7 +363,6 @@ type
function GetValue: ansistring; virtual;
function GetHint({%H-}HintType: TPropEditHint; {%H-}x, {%H-}y: integer): string; virtual;
function HasDefaultValue: Boolean;
function HasStoredFunction: Boolean; deprecated; // a stored function is always present, so returns true
function GetDefaultValue: ansistring; virtual;
function CallStoredFunction: Boolean; virtual;
function GetVisualValue: ansistring; virtual;
@ -1454,7 +1453,6 @@ type
procedure Notification(AComponent: TComponent; Operation: TOperation); override;
public
GetPrivateDirectory: AnsiString;
constructor Create; overload; deprecated 'Use Create(TComponent) instead';
destructor Destroy; override;
// lookup root
@ -3130,11 +3128,6 @@ begin
Result := APropInfo^.Default<>NoDefaultValue;
end;
function TPropertyEditor.HasStoredFunction: Boolean;
begin
Result := True;
end;
function TPropertyEditor.GetUnicodeStrValue: UnicodeString;
begin
Result:=GetUnicodeStrValueAt(0);
@ -7551,11 +7544,6 @@ begin
LookupRoot:=nil;
end;
constructor TPropertyEditorHook.Create;
begin
Create(nil);
end;
destructor TPropertyEditorHook.Destroy;
var
HookType: TPropHookType;

View File

@ -191,21 +191,6 @@ begin
and (CompareFilenames(ExpDir,LeftStr(ExpFile,p))=0);
end;
function ExtractFileNameWithoutExt(const AFilename: string): string;
begin
Result:=LazFileUtils.ExtractFileNameWithoutExt(AFilename);
end;
function CreateAbsoluteSearchPath(const SearchPath, BaseDirectory: string): string;
begin
Result:=LazFileUtils.CreateAbsoluteSearchPath(SearchPath, BaseDirectory);
end;
function CreateAbsolutePath(const Filename, BaseDirectory: string): string;
begin
Result:=LazFileUtils.CreateAbsolutePath(Filename, BaseDirectory);
end;
function CopyFile(const SrcFilename, DestFilename: string;
Flags: TCopyFileFlags; ExceptionOnError: Boolean): boolean;
var

View File

@ -65,10 +65,6 @@ function FilenameHasPascalExt(const Filename: string): boolean;
function FileIsInPath(const Filename, Path: string): boolean;
function FileIsInDirectory(const Filename, Directory: string): boolean;
function ExtractFileNameWithoutExt(const AFilename: string): string; deprecated 'Use the function from unit LazFileUtils';
function CreateAbsoluteSearchPath(const SearchPath, BaseDirectory: string): string; deprecated 'Use the function from unit LazFileUtils';
function CreateAbsolutePath(const Filename, BaseDirectory: string): string; deprecated 'Use the function from unit LazFileUtils';
function GetAllFilesMask: string; inline;
function GetExeExt: string; inline;
function ReadFileToString(const Filename: string): string;

View File

@ -101,8 +101,6 @@ begin
D := T.Dependencies.AddUnit('LazUnicode');
D := T.Dependencies.AddUnit('LazUTF16');
D := T.Dependencies.AddUnit('LazUTF8');
D := T.Dependencies.AddUnit('LazUTF8Classes');
D := T.Dependencies.AddUnit('LazUTF8SysUtils');
D := T.Dependencies.AddUnit('LazUtilities');
D := T.Dependencies.AddInclude('lazutils_defines.inc');
D := T.Dependencies.AddUnit('LazUtilsStrConsts');
@ -172,8 +170,6 @@ begin
T := P.Targets.AddImplicitUnit('lazunicode.pas');
T := P.Targets.AddImplicitUnit('lazutf16.pas');
T := P.Targets.AddImplicitUnit('lazutf8.pas');
T := P.Targets.AddImplicitUnit('lazutf8classes.pas');
T := P.Targets.AddImplicitUnit('lazutf8sysutils.pas');
T := P.Targets.AddImplicitUnit('lazutilities.pas');
T := P.Targets.AddImplicitUnit('lazutilsstrconsts.pas');
T := P.Targets.AddImplicitUnit('lazversion.pas');

View File

@ -125,7 +125,6 @@ type
protected
procedure DoInit; virtual;
procedure DoFinish; virtual;
procedure DoFinsh; deprecated 'Use DoFinish'; // Deprecated in 2.1 / 30.04.2020 / Remove in 2.3
procedure IncreaseIndent; overload; virtual;
procedure DecreaseIndent; overload; virtual;
@ -730,13 +729,7 @@ begin
//
end;
procedure TLazLogger.DoFinsh;
begin
DoFinish;
end;
procedure TLazLogger.DoDebuglnStack(const s: string; AGroup: PLazLoggerLogGroup
);
procedure TLazLogger.DoDebuglnStack(const s: string; AGroup: PLazLoggerLogGroup);
begin
//
end;

View File

@ -49,7 +49,6 @@ function LineEndingCount(const Txt: string; var LengthOfLastLine: integer): inte
function ChangeLineEndings(const s, NewLineEnding: string): string;
function LineBreaksToSystemLineBreaks(const s: string): string;
function LineBreaksToDelimiter(const s: string; Delimiter: char): string;
function ConvertLineEndings(const s: string): string; inline; deprecated 'use LineBreaksToSystemLineBreaks instead';
// Conversions
function TabsToSpaces(const s: string; TabWidth: integer; UseUTF8: boolean): string;
@ -316,11 +315,6 @@ begin
end;
end;
function ConvertLineEndings(const s: string): string;
begin
Result:=LineBreaksToSystemLineBreaks(s);
end;
function TabsToSpaces(const s: string; TabWidth: integer; UseUTF8: boolean): string;
// Convert all tabs to TabWidth number of spaces.

View File

@ -1,145 +0,0 @@
{
**********************************************************************
This file is part of LazUtils.
See the file COPYING.modifiedLGPL.txt, included in this distribution,
for details about the license.
**********************************************************************
}
unit LazUTF8Classes;
{$mode objfpc}{$H+}
interface
uses
Classes, SysUtils, LazUTF8;
type
{ TFileStreamUTF8 }
TFileStreamUTF8 = TFileStream;
{ TStringListUTF8 }
TStringListUTF8 = class(TStringList)
protected
function DoCompareText(const s1,s2 : string) : PtrInt; override;
public
procedure LoadFromFile(const FileName: string); override;
procedure SaveToFile(const FileName: string); override;
end deprecated 'Use TStringList instead';
{ TMemoryStreamUTF8 }
TMemoryStreamUTF8 = class(TMemoryStream)
public
procedure LoadFromFile(const FileName: string);
procedure SaveToFile(const FileName: string);
end deprecated 'Use TMemoryStream instead';
procedure LoadStringsFromFileUTF8(List: TStrings; const FileName: string);
deprecated 'Just use TStrings.LoadFromFile';
procedure SaveStringsToFileUTF8(List: TStrings; const FileName: string);
deprecated 'Just use TStrings.SaveToFile';
implementation
procedure LoadStringsFromFileUTF8(List: TStrings; const FileName: string);
var
uList: TStringListUTF8;
begin
if List is TStringListUTF8 then
begin
List.LoadFromFile(FileName);
exit;
end;
uList:=TStringListUTF8.Create;
try
uList.LoadFromFile(FileName);
List.Assign(uList);
finally
uList.Free;
end;
end;
procedure SaveStringsToFileUTF8(List: TStrings; const FileName: string);
var
uList: TStringListUTF8;
begin
if List is TStringListUTF8 then
begin
List.SaveToFile(FileName);
exit;
end;
uList:=TStringListUTF8.Create;
try
uList.Assign(List);
uList.SaveToFile(FileName);
finally
uList.Free;
end;
end;
{ TMemoryStreamUTF8 }
procedure TMemoryStreamUTF8.LoadFromFile(const FileName: string);
var
S: TFileStreamUTF8;
begin
S:=TFileStreamUTF8.Create (FileName,fmOpenRead or fmShareDenyWrite);
Try
LoadFromStream(S);
finally
S.free;
end;
end;
procedure TMemoryStreamUTF8.SaveToFile(const FileName: string);
var
S: TFileStreamUTF8;
begin
S:=TFileStreamUTF8.Create (FileName,fmCreate);
Try
SaveToStream(S);
finally
S.free;
end;
end;
function TStringListUTF8.DoCompareText(const s1, s2: string): PtrInt;
begin
if CaseSensitive then
Result:= UTF8CompareStr(s1,s2)
else
Result:= UTF8CompareText(s1,s2);
end;
procedure TStringListUTF8.LoadFromFile(const FileName: string);
var
TheStream: TFileStreamUTF8;
begin
TheStream:= TFileStreamUTF8.Create(FileName, fmOpenRead or fmShareDenyWrite);
try
LoadFromStream(TheStream);
finally
TheStream.Free;
end;
end;
procedure TStringListUTF8.SaveToFile(const FileName: string);
var
TheStream: TFileStreamUTF8;
begin
TheStream:=TFileStreamUTF8.Create(FileName,fmCreate);
try
SaveToStream(TheStream);
finally
TheStream.Free;
end;
end;
end.

View File

@ -1,37 +0,0 @@
{
*****************************************************************************
This file is part of LazUtils.
See the file COPYING.modifiedLGPL.txt, included in this distribution,
for details about the license.
*****************************************************************************
This unit was renamed to LazSysUtils.
Now just give "deprecated" warnings. Will be removed later.
}
unit LazUTF8SysUtils;
{$mode objfpc}{$H+}
interface
uses
LazSysUtils;
function NowUTC: TDateTime; deprecated 'Use the function from unit LazSysUtils.';
function GetTickCount64: QWord; deprecated 'Use the function from unit LazSysUtils.';
implementation
function NowUTC: TDateTime;
begin
result := LazSysUtils.NowUTC;
end;
function GetTickCount64: QWord;
begin
Result := LazSysUtils.GetTickCount64;
end;
end.

View File

@ -120,19 +120,19 @@
</Item>
<Item>
<Filename Value="laz2_xmlread.pas"/>
<UnitName Value="laz2_XMLRead"/>
<UnitName Value="Laz2_XMLRead"/>
</Item>
<Item>
<Filename Value="laz2_xmlutils.pas"/>
<UnitName Value="laz2_xmlutils"/>
<UnitName Value="Laz2_XMLUtils"/>
</Item>
<Item>
<Filename Value="laz2_xmlwrite.pas"/>
<UnitName Value="laz2_XMLWrite"/>
<UnitName Value="Laz2_XMLWrite"/>
</Item>
<Item>
<Filename Value="laz2_xpath.pas"/>
<UnitName Value="laz2_xpath"/>
<UnitName Value="Laz2_XPath"/>
</Item>
<Item>
<Filename Value="laz_avl_tree.pp"/>
@ -246,14 +246,6 @@
<Filename Value="lazutf8.pas"/>
<UnitName Value="LazUTF8"/>
</Item>
<Item>
<Filename Value="lazutf8classes.pas"/>
<UnitName Value="LazUTF8Classes"/>
</Item>
<Item>
<Filename Value="lazutf8sysutils.pas"/>
<UnitName Value="LazUTF8SysUtils"/>
</Item>
<Item>
<Filename Value="lazutilities.pas"/>
<UnitName Value="LazUtilities"/>
@ -276,7 +268,7 @@
</Item>
<Item>
<Filename Value="lcsvutils.pas"/>
<UnitName Value="lcsvutils"/>
<UnitName Value="LCSVUtils"/>
</Item>
<Item>
<Filename Value="lookupstringlist.pas"/>

View File

@ -11,16 +11,16 @@ uses
AvgLvlTree, CodepagesAsian, CodepagesCommon, CompWriterPas, DynamicArray,
DynHashArray, DynQueue, ExtendedStrings, FileReferenceList, FileUtil,
FPCAdds, GraphMath, GraphType, HTML2TextRender, IntegerList, Laz2_DOM,
Laz2_XMLCfg, laz2_XMLRead, laz2_xmlutils, laz2_XMLWrite, laz2_xpath,
Laz2_XMLCfg, Laz2_XMLRead, Laz2_XMLUtils, Laz2_XMLWrite, Laz2_XPath,
Laz_AVL_Tree, Laz_DOM, Laz_XMLCfg, Laz_XMLRead, Laz_XMLStreaming,
Laz_XMLWrite, LazClasses, lazCollections, LazConfigStorage, LazDbgLog,
lazfglhash, LazFileCache, LazFileUtils, LazLinkedList, LazListClasses,
LazFglHash, LazFileCache, LazFileUtils, LazLinkedList, LazListClasses,
LazLogger, LazLoggerBase, LazLoggerDummy, LazLoggerProfiling, LazMethodList,
LazPasReadUtil, LazStringUtils, LazSysUtils, LazTracer, LazUnicode,
LazUTF16, LazUTF8, LazUTF8Classes, LazUTF8SysUtils, LazUtilities,
LazUtilsStrConsts, LazVersion, LConvEncoding, lcsvutils, LookupStringList,
Maps, Masks, ObjectLists, StringHashList, TextStrings, Translations,
UITypes, UTF8Process, LazarusPackageIntf;
LazUTF16, LazUTF8, LazUtilities, LazUtilsStrConsts, LazVersion,
LConvEncoding, LCSVUtils, LookupStringList, Maps, Masks, ObjectLists,
StringHashList, TextStrings, Translations, UITypes, UTF8Process,
LazarusPackageIntf;
implementation

View File

@ -160,8 +160,6 @@ function CP865ToUTF8(const s: string): string; // DOS nordic
function CP866ToUTF8(const s: string): string; // DOS and Windows console's cyrillic
function CP874ToUTF8(const s: string): string; // thai
function KOI8RToUTF8(const s: string): string; // russian cyrillic
// Deprecated in Lazarus 2.2, 14.7.2021.
function KOI8ToUTF8(const s: string): string; deprecated 'Call KOI8RToUTF8 instead.';
function MacintoshToUTF8(const s: string): string; // Macintosh, alias Mac OS Roman
function SingleByteToUTF8(const s: string; const Table: TCharToUTF8Table): string;
function UCS2LEToUTF8(const s: string): string; // UCS2-LE 2byte little endian
@ -521,11 +519,6 @@ begin
Result:=SingleByteToUTF8(s,ArrayKOI8RUToUTF8);
end;
function KOI8ToUTF8(const s: string): string;
begin
Result:=KOI8RUToUTF8(s);
end;
function MacintoshToUTF8(const s: string): string;
begin
Result:=SingleByteToUTF8(s,ArrayMacintoshToUTF8);

View File

@ -226,7 +226,6 @@ type
protected
class procedure WSRegisterClass; override;
procedure ResolveLinks; virtual;
procedure DereferenceLinks; virtual; deprecated 'override ResolveLinks instead' {Laz 1.9};
function CheckFile(var AFilename: string): Boolean; virtual;
function CheckFileMustExist(const AFileName: string): Boolean; virtual;
function CheckAllFiles: Boolean; virtual;

View File

@ -254,11 +254,6 @@ begin
Files[i]:=GetPhysicalFilename(Files[i],pfeOriginal);
end;
procedure TOpenDialog.DereferenceLinks;
begin
ResolveLinks;
end;
function PromptForFileName(var AFileName: string;
const AFilter: string = '';
const ADefaultExt: string = '';
@ -436,15 +431,8 @@ end;
function TOpenDialog.DoExecute: boolean;
begin
Result:=inherited DoExecute;
if not (ofNoResolveLinks in Options) then begin
Assert(TMethod(@Self.DereferenceLinks).Code = Pointer(@TOpenDialog.DereferenceLinks),
'TOpenDialog.DoExecute: DereferenceLinks mismatch.');
//if TMethod(@Self.DereferenceLinks).Code <> Pointer(@TOpenDialog.DereferenceLinks)
//then begin
// DereferenceLinks{%H-}; // call for compatibility
//end else
if not (ofNoResolveLinks in Options) then
ResolveLinks;
end;
if not (ofNoChangeDir in Options) then begin
if (ExtractFilePath(Filename)<>'') then
InitialDir:=ExtractFilePath(Filename)

View File

@ -81,7 +81,6 @@ type
function TranslateLCLResourceStrings(Lang, Dir: string): string;
function TranslateUnitResourceStringsEx(Lang, Dir, LocaleFileName: string; LocaleUnitName: string = ''): string;
function SetDefaultLang(Lang: string; Dir: string = ''; LocaleFileName: string = ''; ForceUpdate: boolean = true): string;
function GetDefaultLang: String; deprecated 'Use SetDefaultLang function result instead'; // Lazarus 2.1.0
implementation
@ -616,12 +615,6 @@ begin
end;
end;
function GetDefaultLang: String;
begin
if DefaultLang = '' then SetDefaultLang('');
GetDefaultLang := DefaultLang;
end;
finalization
LRSTranslator.Free;

View File

@ -297,7 +297,6 @@ type
FCharCase: TEditCharCase;
FDropDownCount: Integer;
FDroppedDown: boolean;
FDroppingDown: Boolean;
FEditingDone: Boolean;
FEmulatedTextHintStatus: TEmulatedTextHintStatus;
FItemHeight: integer;
@ -418,7 +417,6 @@ type
procedure ClearSelection; //override;
property CharCase: TEditCharCase read FCharCase write SetCharCase default ecNormal;
property DroppedDown: Boolean read GetDroppedDown write SetDroppedDown;
property DroppingDown: Boolean read FDroppingDown write FDroppingDown; deprecated 'Will be removed in 2.2';
procedure SelectAll;
property AutoComplete: boolean read GetAutoComplete write SetAutoComplete default False;
property AutoCompleteText: TComboBoxAutoCompleteText