paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-05 05:28:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Lazarus trunk requires at least FPC 3.2.0. Remove checks for earlier FPC_FULLVERSION.

Browse Source
This commit is contained in:
Juha 2023-07-07 14:58:51 +03:00
parent 41adb276bb
commit adfc424e92
121 changed files with 160 additions and 5933 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/PascalScript/Source/x86.inc
View File

@ -389,14 +389,9 @@ var
TempStr := StringOfChar(AnsiChar(#0),4);
Pointer((@TempStr[1])^) := Pointer(fvar.Dta^);
{$IFDEF FPC}
{$IF FPC_FULLVERSION < 30101}
// pass dyn. array on stack
UseReg := false;
{$ELSE}
// pass dyn. arrays in registers when i386 register calling conventions are used
// more details -> FPC r30870
UseReg := CallingConv = cdRegister;
{$ENDIF}
{$ENDIF ~FPC}
{$ELSE}
Exit;

4
components/chmhelp/lhelp/chmspecialparser.pas
View File

@ -141,7 +141,6 @@ begin
NewNode := TContentTreeNode(fTreeView.Items.Insert(ANextNode, txt))
else
NewNode := TContentTreeNode(fTreeView.Items.AddChild(AParentNode, txt));
{$IF FPC_FULLVERSION>=30200}
URL:='';
for x:=0 to AItem.SubItemcount-1 do
begin
@ -152,9 +151,6 @@ begin
if URL<>'' then
break;
end;
{$ELSE}
URL:=AItem.URL;
{$ENDIF}
NewNode.Url := FixURL('/'+URL);
NewNode.Data := fChm;
if fTreeView.Images <> nil then

2
components/chmhelp/lhelp/filecontentprovider.pas
View File

@ -43,7 +43,7 @@ begin
if FileContentProviders = nil Then // Singleton
begin
FileContentProviders := TStringList.Create;
{$IF FPC_FULLVERSION>=30200}FileContentProviders.UseLocale := false;{$ENDIF}
FileContentProviders.UseLocale := false;
end;
Result := FileContentProviders;
end;

BIN
components/chmhelp/packages/idehelp/chmlangref.pas
View File

Binary file not shown.

2
components/codetools/finddeclarationtool.pas
View File

@ -1566,7 +1566,7 @@ begin
inherited;
FResults := TStringList.Create;
FResults.CaseSensitive := True; // Why CaseSensitive?
{$IF FPC_FULLVERSION>=30200}FResults.UseLocale := False;{$ENDIF}
FResults.UseLocale := False;
FResults.Duplicates := dupIgnore;
FResults.Sorted := True;
end;

4
components/codetools/tests/runtestscodetools.inc
View File

@ -1,6 +1,4 @@
{$mode objfpc}{$H+}
{$IF FPC_FULLVERSION>30100}
{$warn 6058 off} // cannot inline
{$ENDIF}
{$warn 6058 off} // cannot inline

12
components/codetools/tests/runtestscodetools.lpr
View File

@ -31,8 +31,6 @@ uses
TestGlobals,
// non Pascal
TestCfgScript, TestCTH2Pas, TestCTXMLFixFragments,
{$IF FPC_FULLVERSION >= 30101}
{$ENDIF}
{$IFDEF Darwin}
fdt_objccategory, fdt_objcclass,
{$ENDIF}
@ -56,11 +54,7 @@ type
protected
Options: TCodeToolsOptions;
procedure AppendLongOpts; override;
{$IF FPC_FULLVERSION>=30100}
function ParseOptions: Boolean; override;
{$ELSE}
procedure ParseOptions; override;
{$ENDIF}
procedure WriteCustomHelp; override;
procedure ExtendXmlDocument(Doc: TXMLDocument); override;
@ -78,15 +72,9 @@ begin
LongOpts.Add('filemask:');
end;
{$IF FPC_FULLVERSION>=30100}
function TCTTestRunner.ParseOptions: Boolean;
begin
Result:=inherited ParseOptions;
{$ELSE}
procedure TCTTestRunner.ParseOptions;
begin
inherited ParseOptions;
{$ENDIF}
if Options=nil then
Options:=TCodeToolsOptions.Create;

2
components/datadict/reglazdatadict.pp
View File

@ -23,10 +23,8 @@ uses
,fpcgdbcoll
,fpcgCreateDBF
,fpcgtiOPF
{$IF FPC_FULLVERSION>=30101}
,fpcgfieldmap
,fpcgtypesafedataset
{$ENDIF}
{$ENDIF NOSTDCODEGENS}
;

11
components/fpcunit/guitestrunner.pas
View File

@ -877,12 +877,7 @@ begin
Format(rsException, [AFailure.ExceptionClassName])) as TMessageTreeNode;
Node.ImageIndex := imgWarningSign;
Node.SelectedIndex := imgWarningSign;
{$IF FPC_FULLVERSION <= 30001}
Node := TestTree.Items.AddChild(FailureNode,
Format('at line %d in <%s>', [AFailure.LineNumber, AFailure.UnitName])) as TMessageTreeNode;
{$ELSE}
Node := TestTree.Items.AddChild(FailureNode, 'at ' + AFailure.LocationInfo) as TMessageTreeNode;
{$ENDIF}
Node.ImageIndex := imgWarningSign;
Node.SelectedIndex := imgWarningSign;
PaintNodeFailure(FailureNode);
@ -933,13 +928,7 @@ begin
Node.ImageIndex := imgWarningSign;
Node.SelectedIndex := imgWarningSign;
// line info details
{$IF FPC_FULLVERSION <= 30001}
Node := TestTree.Items.AddChild(ErrorNode,
Format('at line %d in <%s>', [AError.LineNumber, AError.UnitName])) as TMessageTreeNode;
{$ELSE}
node := TestTree.Items.AddChild(ErrorNode, 'at ' + AError.LocationInfo);
{$ENDIF}
Node.ImageIndex := imgInfoSign;
Node.SelectedIndex := imgInfoSign;
// TODO : add stack trace info

49
components/fpdebug/fpdbghardcodedfreepascalinfo.pas
View File

@ -36,19 +36,11 @@ unit FpDbgHardcodedFreepascalInfo;
{$mode objfpc}{$H+}
{$IFDEF INLINE_OFF}{$INLINE OFF}{$ENDIF}
{$IF FPC_FULLVERSION>30100}
{$DEFINE HasGenObjDict}
{$ENDIF}
interface
uses
SysUtils,
{$IFDEF HasGenObjDict}
generics.collections,
{$ELSE}
AvgLvlTree,
{$ENDIF}
DbgIntfBaseTypes,
fpDbgSymTable,
FpdMemoryTools,
@ -57,11 +49,7 @@ uses
type
TDbgHardcodedFPCClassMember = class;
TDbgHardcodedVariableValue = class;
{$IFDEF HasGenObjDict}
TDbgHardcodedFPCClassMemberCollection = specialize TObjectDictionary<string, TDbgHardcodedFPCClassMember>;
{$ELSE}
TDbgHardcodedFPCClassMemberCollection = TStringToPointerTree;
{$ENDIF}
{ TDbgTypeSymbol }
@ -290,11 +278,7 @@ begin
FieldTypeDef := TDbgTypeSymbol.Create('longint');
try
FieldDef := TDbgHardcodedFPCClassMember.Create('HelpContext', skInteger, FieldTypeDef, 0);
{$IFDEF HasGenObjDict}
FFields.Add(FieldDef.Name, FieldDef);
{$ELSE}
FFields[FieldDef.Name]:=FieldDef;
{$ENDIF}
finally
FieldTypeDef.ReleaseReference;
end;
@ -302,11 +286,7 @@ begin
FieldTypeDef := TDbgHardcodedFPCAnsistringTypeSymbol.Create('string');
try
FieldDef := TDbgHardcodedFPCClassMember.Create('Message', skAnsiString, FieldTypeDef, 1);
{$IFDEF HasGenObjDict}
FFields.Add(FieldDef.Name, FieldDef);
{$ELSE}
FFields[FieldDef.Name]:=FieldDef;
{$ENDIF}
finally
FieldTypeDef.ReleaseReference;
end;
@ -539,18 +519,13 @@ function TDbgHardcodedFPCClassTypeSymbol.GetFields: TDbgHardcodedFPCClassMemberC
begin
if not Assigned(FFields) then
begin
{$IFDEF HasGenObjDict}
FFields := TDbgHardcodedFPCClassMemberCollection.Create;
{$ELSE}
FFields := TStringToPointerTree.Create(true);
{$ENDIF}
FillFields;
end;
Result := FFields;
end;
function TDbgHardcodedFPCClassTypeSymbol.GetNestedSymbol(AIndex: Int64): TFpSymbol;
{$IFDEF HasGenObjDict}
var
Member: TDbgHardcodedFPCClassMember;
begin
@ -562,25 +537,11 @@ begin
Break;
end;
end;
{$ELSE}
var
Node: PStringToPointerTreeItem;
begin
Result := nil;
for Node in FFields do
if TDbgHardcodedFPCClassMember(Node^.Value).FieldIndex=AIndex then
exit(TDbgHardcodedFPCClassMember(Node^.Value));
end;
{$ENDIF}
function TDbgHardcodedFPCClassTypeSymbol.GetNestedSymbolByName(
const AIndex: string): TFpSymbol;
begin
{$IFDEF HasGenObjDict}
Result := GetFields.Items[AIndex]
{$ELSE}
Result := TFpSymbol(FFields[AIndex]);
{$ENDIF}
end;
function TDbgHardcodedFPCClassTypeSymbol.GetNestedSymbolCount: Integer;
@ -589,21 +550,11 @@ begin
end;
destructor TDbgHardcodedFPCClassTypeSymbol.Destroy;
{$IFDEF HasGenObjDict}
var
Field: TDbgHardcodedFPCClassMember;
{$ELSE}
var
Node: PStringToPointerTreeItem;
{$ENDIF}
begin
{$IFDEF HasGenObjDict}
for Field in FFields.Values do
Field.ReleaseReference;
{$ELSE}
for Node in FFields do
TDbgHardcodedFPCClassMember(Node^.Value).ReleaseReference;
{$ENDIF}
FFields.Free;
inherited Destroy;
end;

4
components/fpreport/design/frmfpreportvariables.pp
View File

@ -21,11 +21,7 @@ interface
uses
Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
ButtonPanel, Buttons, Spin, EditBtn, ActnList,
{$IF FPC_FULLVERSION>=30101}
fpexprpars,
{$ELSE}
fprepexprpars,
{$ENDIF}
fpreport, reportdesignbaseforms;
type

5
components/fpreport/design/reportconns.pp
View File

@ -8,10 +8,7 @@ unit reportconns;
{$DEFINE HASMYSQL4CONNECTION}
{$DEFINE HASPQCONNECTION}
{$DEFINE HASSQLITE3CONNECTION}
{$IF (FPC_FULLVERSION>=30002) or not defined(win64)}
{$DEFINE HASORACLECONNECTION}
{$ENDIF}
{$DEFINE HASORACLECONNECTION}
// MS SQL Server and Sybase ASE connectors were introduced in the FPC 2.7 development branch,
// and backported to 2.6.1. Operating systems should match FPC packages\fcl-db\fpmake.pp

10
components/fpweb/weblazideintf.pp
View File

@ -25,14 +25,10 @@ uses
Classes, SysUtils, fpWeb, fpHTML, fpdatasetform,
extjsjson, extjsxml, fpjsonrpc, jstree,jsparser,
fpextdirect,fpwebdata, fpwebfile,
{$IF FPC_FULLVERSION>=30004}
fphttpclient,
fphttpserver,
{$ENDIF}
{$IF FPC_FULLVERSION>=30100}
fpoauth2,
fpoauth2ini,
{$ENDIF}
webjsonrpc,
Controls, Dialogs, Forms,
frmnewhttpapp,
@ -258,7 +254,6 @@ begin
]);
end;
{$IF FPC_FULLVERSION>=30100}
procedure RegisterTFPHTTPWebClient;
begin
end;
@ -270,22 +265,17 @@ procedure RegisterTFPOAuth2IniStore;
begin
RegisterComponents(fpWebTab,[TFPOAuth2IniStore]);
end;
{$ENDIF}
Procedure RegisterWebComponents;
begin
{$IF FPC_FULLVERSION>=30004}
RegisterComponents(fpWebTab,[TFPHTTPClient,TFPHTTPServer]);
{$ENDIF}
RegisterUnit('fphtml',@RegisterHTMLComponents);
RegisterUnit('fpdatasetform',@RegisterdatasetComponents);
{$IF FPC_FULLVERSION>=30100}
RegisterUnit('fphttpwebclient',@RegisterTFPHTTPWebClient);
RegisterUnit('fpoauth2',@RegisterTOAuth2Handler);
RegisterUnit('fpoauth2ini',@RegisterTFPOAuth2IniStore);
//classes.RegisterComponents(fpWebTab,[TFPHTTPWebClient,TOAuth2Handler,TFPOAuth2IniStore]);
{$ENDIF}
end;
procedure Register;

2
components/ideintf/changeparentdlg.pas
View File

@ -231,7 +231,7 @@ var
begin
ControlsCount := 0;
CurParentNameList := TStringList.Create;
{$IF FPC_FULLVERSION>=30200}CurParentNameList.UseLocale := False;{$ENDIF}
CurParentNameList.UseLocale := False;
for i:=0 to ASelection.Count-1 do
if ASelection.Items[i] is TControl then

4
components/ideintf/componentreg.pas
View File

@ -797,12 +797,12 @@ begin
fComponentCache:=TAVLTree.Create(@CompareIDEComponentByClass);
fOrigComponentPageCache:=TStringList.Create;
fOrigComponentPageCache.OwnsObjects:=True;
{$IF FPC_FULLVERSION>=30200}fOrigComponentPageCache.UseLocale:=False;{$ENDIF}
fOrigComponentPageCache.UseLocale:=False;
fOrigComponentPageCache.CaseSensitive:=True;
fOrigComponentPageCache.Sorted:=True;
fUserComponentPageCache:=TStringList.Create;
fUserComponentPageCache.OwnsObjects:=True;
{$IF FPC_FULLVERSION>=30200}fUserComponentPageCache.UseLocale:=False;{$ENDIF}
fUserComponentPageCache.UseLocale:=False;
fUserComponentPageCache.CaseSensitive:=True;
fUserComponentPageCache.Sorted:=True;
fOrigPageHelper:=TStringListUTF8Fast.Create; // Note: CaseSensitive = False

3
components/ideintf/dbgridcolumnspropeditform.pas
View File

@ -5,8 +5,7 @@ unit DBGridColumnsPropEditForm;
interface
uses
Classes, SysUtils, TypInfo, DB,
{$IF FPC_FULLVERSION >= 30200}System.{$ENDIF}UITypes,
Classes, SysUtils, TypInfo, DB, System.UITypes,
// LCL
LCLType, Dialogs, Forms, ComCtrls, StdCtrls, ActnList, DBGrids,
// LazUtils

2
components/ideintf/frmselectprops.pas
View File

@ -141,7 +141,7 @@ var
begin
//debugln('TSelectPropertiesForm.SetSelectedProps');
L:=TStringList.Create;
{$IF FPC_FULLVERSION>=30200}L.UseLocale:=False;{$ENDIF}
L.UseLocale:=False;
Try
L.Delimiter:=';';
L.DelimitedText:=AValue;

3
components/ideintf/graphpropedits.pas
View File

@ -16,8 +16,7 @@ unit GraphPropEdits;
interface
uses
Types, Classes, TypInfo, SysUtils, Math,
{$IF FPC_FULLVERSION >= 30200}System.{$ENDIF}UITypes,
Types, Classes, TypInfo, SysUtils, Math, System.UITypes,
// LCL
LCLType, Forms, Graphics, Buttons, Menus, Dialogs, Grids, ImgList, EditBtn,
// LazUtils

3
components/ideintf/idedialogs.pas
View File

@ -17,8 +17,7 @@ unit IDEDialogs;
interface
uses
Classes,
{$IF FPC_FULLVERSION >= 30200}System.{$ENDIF}UITypes,
Classes, System.UITypes,
// LCL
Dialogs,
// LazUtils

3
components/ideintf/idetextconverter.pas
View File

@ -21,8 +21,7 @@ unit IDETextConverter;
interface
uses
Classes, SysUtils, TypInfo,
{$IF FPC_FULLVERSION >= 30200}System.{$ENDIF}UITypes,
Classes, SysUtils, TypInfo, System.UITypes,
// LCL
LCLProc,
// LazUtils

3
components/ideintf/lazideintf.pas
View File

@ -16,8 +16,7 @@ unit LazIDEIntf;
interface
uses
Classes, SysUtils,
{$IF FPC_FULLVERSION >= 30200}System.{$ENDIF}UITypes,
Classes, SysUtils, System.UITypes,
// LCL
Forms, Controls, LazHelpHTML,
// LazUtils

4
components/ideintf/propedits.pp
View File

@ -2738,7 +2738,7 @@ var
begin
if not AutoFill then Exit;
Values:=TStringList.Create;
{$IF FPC_FULLVERSION>=30200}Values.UseLocale := False;{$ENDIF}
Values.UseLocale := False;
Values.Sorted:=paSortList in GetAttributes;
try
AddValue := @Values.Add;
@ -8220,9 +8220,7 @@ begin
RegisterPropertyEditor(TypeInfo(TTabOrder), TControl, 'TabOrder', TTabOrderPropertyEditor);
RegisterPropertyEditor(TypeInfo(ShortString), nil, '', TCaptionPropertyEditor);
RegisterPropertyEditor(TypeInfo(TStrings), nil, '', TStringsPropertyEditor);
{$IF FPC_FULLVERSION > 30101}
RegisterPropertyEditor(TypeInfo(TFileName), nil, '', TFileNamePropertyEditor);
{$ENDIF}
RegisterPropertyEditor(TypeInfo(AnsiString), nil, 'SessionProperties', TSessionPropertiesPropertyEditor);
RegisterPropertyEditor(TypeInfo(TModalResult), nil, 'ModalResult', TModalResultPropertyEditor);
RegisterPropertyEditor(TypeInfo(TShortCut), nil, '', TShortCutPropertyEditor);

4
components/ideintf/seledits.pas
View File

@ -62,11 +62,7 @@ begin
FPanel := APanel;
FControl := AControl;
FPropType := TypeInfo(Integer);
{$if FPC_FULLVERSION<30101}
FPropInfo.PropType := FPropType;
{$else}
FPropInfo.PropTypeRef := @FPropType;
{$endif}
FPropInfo.Name := 'ControlIndex';
SetPropEntry(0, Nil, @FPropInfo);
end;

3
components/ideintf/texttools.pas
View File

@ -16,8 +16,7 @@ unit TextTools;
interface
uses
Classes, SysUtils,
{$IF FPC_FULLVERSION >= 30200}System.{$ENDIF}UITypes,
Classes, SysUtils, System.UITypes,
// LCL
LCLType;

3
components/ideintf/unitresources.pas
View File

@ -19,8 +19,7 @@ unit UnitResources;
interface
uses
Classes, SysUtils,
{$IF FPC_FULLVERSION >= 30200}System.{$ENDIF}UITypes,
Classes, SysUtils, System.UITypes,
// LCL
LCLMemManager, Forms, LResources;

2
components/jcf2/Parse/AsmKeywords.pas
View File

@ -53,7 +53,7 @@ begin
}
mcWords := TStringList.Create(); // Will compare with CompareText.
{$IF FPC_FULLVERSION>=30200}mcWords.UseLocale := False;{$ENDIF}
mcWords.UseLocale := False;
mcWords.Add('RAX');
mcWords.Add('EAX');

2
components/jcf2/Parse/PreProcessor/PreProcessorParseTree.pas
View File

@ -160,7 +160,7 @@ begin
fiCurrentTokenIndex := 0;
fcDefinedSymbols := TStringList.Create; // Will compare with CompareText.
{$IF FPC_FULLVERSION>=30200}fcDefinedSymbols.UseLocale := False;{$ENDIF}
fcDefinedSymbols.UseLocale := False;
fcDefinedSymbols.Sorted := True;
fcDefinedSymbols.Duplicates := dupIgnore;

4
components/jcf2/Settings/JcfRegistrySettings.pas
View File

@ -279,9 +279,9 @@ begin
fcReg := TRegIniFile.Create(REG_ROOT_KEY);
fcExclusionsFiles := TStringList.Create; // Will compare with CompareText.
{$IF FPC_FULLVERSION>=30200}fcExclusionsFiles.UseLocale := False;{$ENDIF}
fcExclusionsFiles.UseLocale := False;
fcExclusionsDirs := TStringList.Create;
{$IF FPC_FULLVERSION>=30200}fcExclusionsDirs.UseLocale := False;{$ENDIF}
fcExclusionsDirs.UseLocale := False;
end;
destructor TJCFRegistrySettings.Destroy;

2
components/jcf2/Settings/SetAnyWordCaps.pas
View File

@ -134,7 +134,7 @@ begin
SetSection('SpecificWordCaps');
fcWords := TStringList.Create; // Will compare with CompareText.
{$IF FPC_FULLVERSION>=30200}fcWords.UseLocale := False;{$ENDIF}
fcWords.UseLocale := False;
fcWords.Duplicates := dupIgnore;
end;

4
components/jcf2/Settings/SetClarify.pas
View File

@ -89,11 +89,11 @@ begin
SetSection('Clarify');
fcIgnoreUnusedParams := TStringList.Create; // Will compare with CompareText.
{$IF FPC_FULLVERSION>=30200}fcIgnoreUnusedParams.UseLocale := False;{$ENDIF}
fcIgnoreUnusedParams.UseLocale := False;
fcIgnoreUnusedParams.Duplicates := dupIgnore;
fcFileExtensions := TStringList.Create;
{$IF FPC_FULLVERSION>=30200}fcFileExtensions.UseLocale := False;{$ENDIF}
fcFileExtensions.UseLocale := False;
fcFileExtensions.Duplicates := dupIgnore;
end;

4
components/jcf2/Settings/SetPreProcessor.pas
View File

@ -78,12 +78,12 @@ begin
SetSection('PreProcessor');
fcDefinedSymbols := TStringList.Create; // Will compare with CompareText.
{$IF FPC_FULLVERSION>=30200}fcDefinedSymbols.UseLocale := False;{$ENDIF}
fcDefinedSymbols.UseLocale := False;
//fcDefinedSymbols.Sorted := True;
fcDefinedSymbols.Duplicates := dupIgnore;
fcDefinedOptions := TStringList.Create;
{$IF FPC_FULLVERSION>=30200}fcDefinedOptions.UseLocale := False;{$ENDIF}
fcDefinedOptions.UseLocale := False;
//fcDefinedOptions.Sorted := True;
fcDefinedOptions.Duplicates := dupIgnore;
end;

4
components/jcf2/Settings/SetReplace.pas
View File

@ -85,9 +85,9 @@ begin
fcWords := TStringList.Create;
fcLeftWords := TStringList.Create; // Will compare with CompareText.
{$IF FPC_FULLVERSION>=30200}fcLeftWords.UseLocale := False;{$ENDIF}
fcLeftWords.UseLocale := False;
fcRightWords := TStringList.Create;
{$IF FPC_FULLVERSION>=30200}fcRightWords.UseLocale := False;{$ENDIF}
fcRightWords.UseLocale := False;
end;
destructor TSetReplace.Destroy;

2
components/jcf2/Settings/SetWordList.pas
View File

@ -84,7 +84,7 @@ begin
SetSection(psSectionName);
fcWords := TStringList.Create; // Will compare with CompareText.
{$IF FPC_FULLVERSION>=30200}fcWords.UseLocale := False;{$ENDIF}
fcWords.UseLocale := False;
fcWords.Sorted := True;
fcWords.Duplicates := dupIgnore;
end;

17
components/jitclasses/jitclass.pas
View File

@ -27,9 +27,6 @@ unit JitClass;
{$PointerMath on}
{.$Inline off}
{$IF FPC_FULLVERSION<30100}
{$DEFINE HasVMTParent}
{$ENDIF}
{$WARN 4055 off : Conversion between ordinals and pointers is not portable}
interface
@ -1195,12 +1192,8 @@ begin
FJitPVmt^.vIntfTable:=@EmptyIntf; // A nil pointer stops the recursion
// set vmtParent
{$IFDEF HasVMTParent}
FJitPVmt^.vParent:=AncestorVMT;
{$ELSE}
GetMem(FJitPVmt^.vParentRef,SizeOf(Pointer));
FJitPVmt^.vParentRef^:=AncestorVMT;
{$ENDIF}
// copy the methods part
System.Move(Pointer(Pointer(AncestorVMT)+vmtMethodStart)^,
@ -1323,10 +1316,8 @@ begin
Freemem(AJitPVmtMem.VmtPtr^.vMethodTable);
if AJitPVmtMem.VmtPtr^.vClassName <> nil then
Freemem(AJitPVmtMem.VmtPtr^.vClassName);
{$IFnDEF HasVMTParent}
if AJitPVmtMem.VmtPtr^.vParentRef<> nil then
Freemem(AJitPVmtMem.VmtPtr^.vParentRef);
{$ENDIF}
AJitPVmtMem.DeAllocate;
end;
@ -1434,11 +1425,7 @@ begin
end;
NameIdxMap.Free;
{$IFDEF HasVMTParent}
FVmtParentMemSize := 0;
{$ELSE}
FVmtParentMemSize := SizeOf(Pointer);
{$ENDIF}
(* vmtTypeInfo = pointer to
TTypeInfo (Kind, Name)
@ -1451,12 +1438,8 @@ begin
FJitPVmt^.vTypeInfo:=NewTypeInfo;
FJitPVmt^.vInstanceSize := 0; // not yet ready
{$IFDEF HasVMTParent}
VmtParentMem := FAncestorClass.ClassInfo;
{$ELSE}
VmtParentMem := Pointer(NewTypeInfo) + FTypeInfoMemSize;
VmtParentMem^ :=FAncestorClass.ClassInfo;
{$ENDIF}
FRttiWriterClass := TJitRttiWriterTkClass.Create(NewTypeInfo,
FClassName, FClassUnit, TClass(FJitPVmt), VmtParentMem,

14
components/jitclasses/jitrttiwriter.pas
View File

@ -24,9 +24,6 @@ unit JitRttiWriter;
{$mode objfpc}{$H+}
{$ModeSwitch typehelpers}
{$IF FPC_FULLVERSION<30100}
{$DEFINE HasVMTParent}
{$ENDIF}
{$WARN 4055 off : Conversion between ordinals and pointers is not portable}
interface
@ -848,11 +845,7 @@ begin
inherited Create(ADestMem, AClassName, tkClass);
FTypeData^.ClassType := AClass;
{$IFDEF HasVMTParent}
FTypeData^.ParentInfo := AnAnchestorInfo;
{$ELSE}
FTypeData^.ParentInfoRef := AnAnchestorInfo;
{$ENDIF}
FTypeData^.UnitName := AUnitName;
FTypeData^.PropCount := ATotalPropCount;
@ -862,14 +855,9 @@ begin
FCurDestMemPos := nil;
end;
procedure TJitRttiWriterTkClass.WriteAnchestorInfo(AnAnchestorInfo: TypeInfoPtr
);
procedure TJitRttiWriterTkClass.WriteAnchestorInfo(AnAnchestorInfo: TypeInfoPtr);
begin
{$IFDEF HasVMTParent}
FTypeData^.ParentInfo := AnAnchestorInfo;
{$ELSE}
FTypeData^.ParentInfoRef := AnAnchestorInfo;
{$ENDIF}
end;
procedure TJitRttiWriterTkClass.WriteTotalPropCount(APropCount: Integer);

4
components/lazdebuggergdbmi/gdbmidebugger.pp
View File

@ -8262,12 +8262,12 @@ end;
constructor TGDBMILineInfo.Create(const ADebugger: TDebuggerIntf);
begin
FSourceIndex := TStringList.Create;
{$IF FPC_FULLVERSION>=30200}FSourceIndex.UseLocale := False;{$ENDIF}
FSourceIndex.UseLocale := False;
FSourceIndex.Sorted := True;
FSourceIndex.Duplicates := dupError;
FSourceIndex.CaseSensitive := True;
FRequestedSources := TStringList.Create;
{$IF FPC_FULLVERSION>=30200}FRequestedSources.UseLocale := False;{$ENDIF}
FRequestedSources.UseLocale := False;
FRequestedSources.Sorted := True;
FRequestedSources.Duplicates := dupError;
FRequestedSources.CaseSensitive := True;

4
components/lazreport/source/addons/lrFclPDFExport/lr_e_fclpdf.pas
View File

@ -399,9 +399,7 @@ end;
begin
if gTTFontCache.Count = 0 then
begin
{$IF (FPC_FULLVERSION >= 30101)}
gTTFontCache.BuildFontCacheIgnoresErrors:=true;
{$ENDIF}
{$IFDEF WINDOWS}
CreateFontDirList;
{$ELSE}
@ -781,13 +779,11 @@ end;
procedure TlrPdfExportFilter.WriteURL(X, Y, W, H: TPDFFloat; AUrlText: string);
begin
{$IF (FPC_FULLVERSION >= 30101)}
X := ConvetUnits(X);
Y := ConvetUnits(Y);
W := ConvetUnits(W);
H := ConvetUnits(H);
FCurPage.AddExternalLink(X, Y + H, W, H, AUrlText, false);
{$ENDIF}
end;
procedure TlrPdfExportFilter.DrawLine(X1, Y1, X2, Y2: TPDFFloat;

4
components/lazreport/source/addons/lrFclPDFExport/lrpdfexport.pas
View File

@ -32,10 +32,6 @@
Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1335, USA.
}
{$IF (FPC_FULLVERSION < 30002)}
!!! This component compiled only FPC 3.1.1 or hight
{$ENDIF}
unit lrPDFExport;
{$mode objfpc}{$H+}

12
components/lazreport/source/lr_class.pas
View File

@ -2494,11 +2494,7 @@ end;
constructor TlrDetailReport.Create;
begin
inherited Create;
{$IF FPC_FULLVERSION >= 30101}
FReportBody:=TStringStream.CreateRaw('');
{$ELSE}
FReportBody:=TStringStream.Create('');
{$ENDIF}
end;
destructor TlrDetailReport.Destroy;
@ -10205,11 +10201,7 @@ procedure TfrReport.WriteReportXML(Writer: TWriter);
var
st: TStringStream;
begin
{$IF FPC_FULLVERSION >= 30101}
st := TStringStream.CreateRaw('');
{$ELSE}
st := TStringStream.Create('');
{$ENDIF}
SaveToXMLStream(st);
Writer.WriteString(st.DataString);
st.free;
@ -12070,11 +12062,7 @@ begin
inherited Loaded;
if FXMLReport<>'' then
begin
{$IF FPC_FULLVERSION >= 30101}
st := TStringStream.CreateRaw(FXMLReport);
{$ELSE}
st := TStringStream.Create(FXMLReport);
{$ENDIF}
LoadFromXMLStream(st);
st.free;
FXMLReport := '';

4
components/lazutils/translations.pas
View File

@ -56,7 +56,7 @@ interface
uses
Classes, SysUtils,
{$IF FPC_FULLVERSION>=30001}jsonscanner,{$ENDIF} jsonparser, fpjson,
jsonscanner, jsonparser, fpjson,
// LazUtils
FileUtil, LazFileUtils, LazUTF8, LConvEncoding, LazLoggerBase,
AvgLvlTree, StringHashList;
@ -1392,7 +1392,7 @@ var
K, L: Integer;
Data: TJSONData;
begin
Parser := TJSONParser.Create(InputLines.Text{$IF FPC_FULLVERSION>=30001},jsonscanner.DefaultOptions{$ENDIF});
Parser := TJSONParser.Create(InputLines.Text,jsonscanner.DefaultOptions);
try
JsonData := Parser.Parse as TJSONObject;
try

4
components/lazutils/utf8process.pp
View File

@ -119,11 +119,7 @@ begin
mib[0] := CTL_HW;
mib[1] := HW_NCPU;
len := sizeof(t);
{$if FPC_FULLVERSION >= 30101}
fpsysctl(@mib, 2, @t, @len, Nil, 0);
{$else}
fpsysctl(pchar(@mib), 2, @t, @len, Nil, 0);
{$endif}
Result:=t;
end;
{$ELSEIF defined(linux)}

4
components/lclextensions/oleutils.pas
View File

@ -104,11 +104,7 @@ begin
//soFrom* constants are equal to STREAM_SEEK_* constants. Assume it here
liOffset.LowPart:=Offset;
liOffset.HighPart:=0;
{$if FPC_FULLVERSION >= 30001}
Res:=FSrcStream.Seek(QWord(liOffset), Origin, QWord(liResult));
{$else}
Res:=FSrcStream.Seek(Int64(liOffset), Origin, Int64(liResult));
{$endif}
Result:=liResult.LowPart;
if Res <> S_OK then
Raise Exception.Create('TOLEStream - Error while seeking: '+ErrorString(Res));

3
components/messagecomposer/messagecomposer.pas
View File

@ -26,8 +26,7 @@ unit MessageComposer;
interface
uses
Classes, SysUtils,
{$IF FPC_FULLVERSION >= 30200}System.{$ENDIF}UITypes,
Classes, SysUtils, System.UITypes,
// LCL
LResources, LCLType, Forms, Controls, Graphics, Dialogs,
StdCtrls, ExtCtrls, Spin, Grids, ActnList, Buttons, EditBtn,

2121
components/onlinepackagemanager/fpcmod/opkman_httpclient.pas
View File

File diff suppressed because it is too large Load Diff

3071
components/onlinepackagemanager/fpcmod/opkman_zip.pas
View File

File diff suppressed because it is too large Load Diff

7
components/onlinepackagemanager/opkman_downloader.pas
View File

@ -29,10 +29,11 @@ unit opkman_downloader;
interface
uses
Classes, SysUtils, fpjson, LazIDEIntf, md5,
Classes, SysUtils, fpjson, md5, fphttpclient, opensslsockets,
// IdeIntf
LazIDEIntf,
// OpkMan
opkman_common, opkman_serializablepackages, opkman_const, opkman_options,
{$IF FPC_FULLVERSION>=30200}fphttpclient, opensslsockets{$ELSE}opkman_httpclient{$ENDIF};
opkman_common, opkman_serializablepackages, opkman_const, opkman_options;
type
TDownloadType = (dtJSON, dtPackage, dtUpdate);

13
components/onlinepackagemanager/opkman_updates.pas
View File

@ -30,16 +30,11 @@ interface
uses
{$IFDEF MSWINDOWS}windows, opkman_const,{$ENDIF}
Classes, SysUtils, Controls, fpjson, fpjsonrtti, jsonparser, dateutils,
fphttpclient, opensslsockets, openssl,
// LazUtils
LazIDEIntf, LazFileUtils,
// OpkMan
opkman_serializablepackages, opkman_options, opkman_common, opkman_visualtree,
opkman_OpenSSLfrm,
{$IF FPC_FULLVERSION>=30200}
zipper, fphttpclient, opensslsockets, openssl;
{$ELSE}
opkman_zip, opkman_httpclient;
{$ENDIF}
opkman_serializablepackages, opkman_options, opkman_common, opkman_visualtree;
const
OpkVersion = 1;
@ -130,7 +125,7 @@ var
Updates: TUpdates = nil;
implementation
uses opkman_mainfrm;
{ TUpdatePackage }
procedure TUpdatePackage.Clear;
@ -252,9 +247,7 @@ begin
FreeOnTerminate := True;
OnTerminate := @DoTerminated;
FHTTPClient := TFPHTTPClient.Create(nil);
{$IF FPC_FULLVERSION>=30200}
FHTTPClient.IOTimeout := Options.ConTimeOut*1000;
{$ENDIF}
if Options.ProxyEnabled then
begin
FHTTPClient.Proxy.Host:= Options.ProxyServer;

5
components/onlinepackagemanager/opkman_uploader.pas
View File

@ -29,10 +29,9 @@ unit opkman_uploader;
interface
uses
Classes, SysUtils, base64,
Classes, SysUtils, base64, fphttpclient, opensslsockets,
// OpkMan
opkman_options, opkman_const,
{$IF FPC_FULLVERSION>=30200}fphttpclient, opensslsockets{$ELSE}opkman_httpclient{$ENDIF};
opkman_options, opkman_const;
type
TOnUploadProgress = procedure(Sender: TObject; AFileName: String) of object;

5
components/onlinepackagemanager/opkman_zipper.pas
View File

@ -29,12 +29,11 @@ unit opkman_zipper;
interface
uses
Classes, SysUtils, strutils,
Classes, SysUtils, strutils, zipper,
// LazUtils
FileUtil, LazFileUtils,
// OpkMan
opkman_serializablepackages, opkman_common,
{$IF FPC_FULLVERSION>=30200}zipper{$ELSE}opkman_zip{$ENDIF};
opkman_serializablepackages, opkman_common;
type
TOnProgressEx = procedure(Sender : TObject; const ATotPos, ATotSize: Int64);

2
components/projecttemplates/idetemplateproject.pp
View File

@ -277,7 +277,7 @@ begin
Name:='Template Project';
FVariables:=TStringList.Create;
FIgnoreExts:=TStringList.Create;
{$IF FPC_FULLVERSION>=30200}FIgnoreExts.UseLocale := false;{$ENDIF}
FIgnoreExts.UseLocale := false;
FIgnoreExts.CommaText:='.lpr,.lps,.lfm,.lrs,.ico,.res,.lpi,.bak';
end;

4
components/sparta/dockedformeditor/source/sparta_mainide.pas
View File

@ -18,11 +18,7 @@ interface
uses
Classes, SysUtils,
{$IF FPC_FULLVERSION>=30200}
Generics.Collections, Generics.Defaults,
{$ELSE}
sparta_Generics.Collections, sparta_Generics.Defaults,
{$ENDIF}
contnrs,
// LCL
LCLIntf, LCLType, LMessages, ComCtrls, Controls, Forms, ExtCtrls, Graphics,

9
components/sparta/mdi/source/sparta_basicfakecustom.pas
View File

@ -205,16 +205,7 @@ procedure TFormImpl.SetRealBounds(AIndex: Integer; AValue: Integer);
LFormRect := Rect(0, 0, 0, 0);;
LCLIntf.GetClientRect(GetForm.Handle, LFormRect);
LRealValue := GetRealBounds(AIndex);
{$IF FPC_FULLVERSION < 30101}
case AIndex of
0: LValue := LFormRect.Left;
1: LValue := LFormRect.Top;
2: LValue := LFormRect.Right;
3: LValue := LFormRect.Bottom;
end;
{$ELSE}
LValue := LFormRect.Vector[AIndex];
{$ENDIF}
if LValue <> LRealValue then
FDesignedRealForm.SetRealBounds(AIndex, AValue - (LRealValue - LValue));

4
components/sparta/mdi/source/sparta_multiplyresizer.pas
View File

@ -7,11 +7,7 @@ interface
uses
Classes, SysUtils,
Forms, Controls, LMessages,
{$IF FPC_FULLVERSION>=30200}
Generics.Collections,
{$ELSE}
sparta_Generics.Collections,
{$ENDIF}
sparta_AbstractResizer, sparta_InterfacesMDI, sparta_BasicResizeFrame;
type

4
components/sparta/smartformeditor/source/sparta_componentpalette.pas
View File

@ -22,11 +22,7 @@ uses
Controls, ComCtrls, ExtCtrls, Buttons, LResources, LCLType, Graphics,
// LazUtils
LazStringUtils,
{$IF FPC_FULLVERSION>=30200}
Generics.Collections,
{$ELSE}
sparta_Generics.Collections,
{$ENDIF}
// IdeIntf
ComponentReg, LazIDEIntf, PropEdits, FormEditingIntf, IDEImagesIntf;

4
components/sparta/toolsapi/source/designeditors.pas
View File

@ -8,11 +8,7 @@ uses
Classes, SysUtils, TypInfo, IniFiles,
Menus,
ComponentEditors, PropEdits,
{$IF FPC_FULLVERSION>=30200}
Generics.Defaults,
{$ELSE}
sparta_Generics.Defaults,
{$ENDIF}
DesignIntf, DesignMenus;
type

5
components/sqldb/registersqldb.pas
View File

@ -32,10 +32,7 @@ unit registersqldb;
{$DEFINE HASMYSQL4CONNECTION}
{$DEFINE HASPQCONNECTION}
{$DEFINE HASSQLITE3CONNECTION}
{$IF (FPC_FULLVERSION>=30002) or not defined(win64)}
{$DEFINE HASORACLECONNECTION}
{$ENDIF}
{$DEFINE HASORACLECONNECTION}
// MS SQL Server and Sybase ASE connectors were introduced in the FPC 2.7 development branch,
// and backported to 2.6.1. Operating systems should match FPC packages\fcl-db\fpmake.pp

5
components/sqldbrest/editor/schemaconns.pp
View File

@ -8,10 +8,7 @@ unit schemaconns;
{$DEFINE HASMYSQL4CONNECTION}
{$DEFINE HASPQCONNECTION}
{$DEFINE HASSQLITE3CONNECTION}
{$IF (FPC_FULLVERSION>=30002) or not defined(win64)}
{$DEFINE HASORACLECONNECTION}
{$ENDIF}
{$DEFINE HASORACLECONNECTION}
// MS SQL Server and Sybase ASE connectors were introduced in the FPC 2.7 development branch,
// and backported to 2.6.1. Operating systems should match FPC packages\fcl-db\fpmake.pp

2
components/synedit/synhighlighterany.pas
View File

@ -1139,7 +1139,7 @@ begin
else
HL.StringDelim:=sdSingleQuote;
genlist:=TStringList.create;
{$IF FPC_FULLVERSION>=30200}genlist.UseLocale:=false;{$ENDIF}
genlist.UseLocale:=false;
// read keywords
hini.ReadSectionNames('Keywords',genlist);
if genlist.count>0 then

2
components/synedit/synhighlighterpas.pp
View File

@ -5283,7 +5283,7 @@ var
begin
if KeywordsList = nil then begin
KeywordsList := TStringList.Create;
{$IF FPC_FULLVERSION>=30200}KeywordsList.UseLocale := false;{$ENDIF}
KeywordsList.UseLocale := false;
KeywordsList.CaseSensitive := true;
for i := 1 to High(RESERVED_WORDS_TP) do
KeywordsList.AddObject(RESERVED_WORDS_TP[i], TObject(pcmTP));

26
components/tachart/demo/fit/Main.pas
View File

@ -479,12 +479,8 @@ end;
procedure TfrmMain.FitCompleteHandler(Sender:TObject);
const
{$IF FPC_FullVersion >= 30004}
MASK = '%-4s %10s %10s %10s %10s';
CONF_MASK = '%-4s %10s %10s %10s';
{$ELSE}
MASK = '%-4s %10s %10s %10s';
{$IFEND}
EXP_FMT = '%.3e';
STD_FMT = '%.3f';
PARAM_NAME: array[0..1] of String = ('a', 'b');
@ -506,11 +502,7 @@ begin
fitOK:
begin
Add('PARAMETERS');
{$IF FPC_FullVersion >= 30004}
Add(Format(MASK, ['Name', 'Value', 'Std.Error', 't value', 'p (>|t|)']));
{$ELSE}
Add(Format(MASK, ['Name', 'Value', 'Std.Error', 't value']));
{$IFEND}
for i := 0 to FitSeries.ParamCount - 1 do begin
case FitSeries.FitEquation of
fePolynomial, feCustom:
@ -523,13 +515,10 @@ begin
FloatToStrEx(FitSeries.Param[i], PRECISION, STD_FMT, EXP_FMT),
FloatToStrEx(FitSeries.ParamError[i], PRECISION, STD_FMT, EXP_FMT),
FloatToStrEx(FitSeries.Param_tValue[i], PRECISION, STD_FMT, EXP_FMT)
{$IF FPC_FullVersion >= 30004},
FloatToStrEx(FitSeries.Param_pValue[i], PRECISION, STD_FMT, EXP_FMT)
{$IFEND}
]));
end;
Add('');
{$IF FPC_FullVersion >= 30004}
Add('CONFIDENCE LIMITS');
Add(Format(CONF_MASK, ['Name', 'Value', 'Lower', 'Upper']));
for i := 0 to FitSeries.ParamCount - 1 do begin
@ -548,7 +537,6 @@ begin
]));
end;
Add('');
{$IFEND}
Add('ANALYSIS OF VARIANCE');
lbResults.Canvas.Font.Assign(lbResults.Font);
FReportDecimals := 5;
@ -557,16 +545,13 @@ begin
Add('VARIANCE-COVARIANCE MATRIX');
FitSeries.FitStatistics.Report_VarCovar(lbResults.Items);
{$IF FPC_FullVersion >= 30004}
UpperConfIntervalSeries.OnCalculate := @FitSeries.GetUpperConfidenceInterval;
LowerConfIntervalSeries.OnCalculate := @FitSeries.GetLowerConfidenceInterval;
UpperPredIntervalSeries.OnCalculate := @FitSeries.GetUpperPredictionInterval;
LowerPredIntervalSeries.OnCalculate := @FitSeries.GetLowerPredictionInterval;
{$IFEND}
Add('');
Add('VALUES');
{$IF FPC_FullVersion >= 30004}
Add(Format('%8s %8s %8s %8s %8s %8s %8s', ['x', 'y', 'y hat', 'confL', 'confH', 'predL', 'predH']));
for i := 0 to FitSeries.Count-1 do
begin
@ -578,15 +563,6 @@ begin
FitSeries.XValue[i], FitSeries.YValue[i], FitSeries.Calculate(FitSeries.XValue[i]),
confL, confH, predL, predH]));
end;
{$ELSE}
Add(Format('%8s %8s %8s', ['x', 'y', 'y hat']));
for i := 0 to FitSeries.Count-1 do
begin
Add(Format('%8.2f %8.2f %8.2f', [
FitSeries.XValue[i], FitSeries.YValue[i], FitSeries.Calculate(FitSeries.XValue[i])
]));
end;
{$IFEND}
ShowIntervalSeries(true);
end;
@ -739,12 +715,10 @@ end;
procedure TfrmMain.ShowIntervalSeries(AEnable: Boolean);
begin
{$IF FPC_FullVersion > 30004}
UpperConfIntervalSeries.Active := AEnable and cbShowConfidenceIntervals.Checked;
LowerConfIntervalSeries.Active := AEnable and cbShowConfidenceIntervals.Checked;
UpperPredIntervalSeries.Active := AEnable and cbShowPredictionIntervals.Checked;
LowerPredIntervalSeries.Active := AEnable and cbShowPredictionIntervals.Checked;
{$IFEND}
end;
end.

10
components/tachart/tafitutils.pas
View File

@ -118,11 +118,9 @@ type
property xBar: Double read fXBar;
property SSx: Double read fSSx;
public
{$IF FPC_FullVersion >= 30004}
function Fcrit: Double;
function pValue: Double;
property tValue: Double read ftValue;
{$ENDIF}
end;
operator := (AEq: IFitEquationText): String; inline;
@ -439,10 +437,8 @@ end;
procedure TFitStatistics.CalcTValue;
begin
fTValue := NaN;
{$IF FPC_FullVersion >= 30004}
if (fAlpha > 0) and (fN > fM) then
fTValue := invtdist(fAlpha, fN - fM, 2)
{$IFEND}
end;
{ Total variance of data values minus calculated values, weighted by
@ -468,7 +464,6 @@ begin
Result := NaN;
end;
{$IF FPC_FullVersion >= 30004}
function TFitStatistics.Fcrit: Double;
begin
if (M = 1) then
@ -476,14 +471,12 @@ begin
else
Result := InvFDist(FAlpha, M-1, N-M);
end;
{$IFEND}
function TFitStatistics.GetVarCovar(i, j: Integer): Double;
begin
Result := fVarCovar[i, j];
end;
{$IF FPC_FullVersion >= 30004}
{ Probability that the scatter of the data around the fitted curve is by chance.
Should be several 0.1, the higher the better.
According to Numerical Recipes, very small (<< 0.1) values mean
@ -499,7 +492,6 @@ begin
else
Result := NaN;
end;
{$IFEND}
{ Variance normalized to the degrees of freedem. Should be about 1 for
a "moderately" good fit. }
@ -547,10 +539,8 @@ begin
AText.Add(Format('Fcrit(%d, %d)', [M-1, DOF]) + ASeparator +
Format(IfThen(Fcrit < 1E-3, FMT, ANumFormat), [Fcrit]));
}
{$IF FPC_FullVersion >= 30004}
AText.Add(rsFitTValue + ASeparator + FloatToStrEx(FtValue, PRECISION, ANumFormat, AExpFormat, NaNStr));
AText.Add(rsFitPValue + ASeparator + FloatToStrEx(pValue, PRECISION, ANumFormat, AExpFormat, NaNStr));
{$IFEND}
end;
procedure TFitStatistics.Report_VarCovar(AText: TStrings; ANumFormat: String = '%12.6f');

12
components/tachart/tafuncseries.pas
View File

@ -320,10 +320,8 @@ type
procedure SetPen(AValue: TChartPen);
procedure SetStep(AValue: TFuncSeriesStep);
procedure SetUseCombinedExtentY(AValue: Boolean);
{$IF FPC_FullVersion >= 30004}
procedure GetInterval(const Ax: Double; out AY: Double; IsUpper, IsPrediction: Boolean);
function GetParam_pValue(AIndex: Integer): Double;
{$IFEND}
strict protected
procedure CalcXRange(out AXMin, AXMax: Double);
function TransformX(AX: Double): Extended; inline;
@ -351,13 +349,11 @@ type
function Extent: TDoubleRect; override;
function EquationText: IFitEquationText;
function FitParams: TDoubleDynArray;
{$IF FPC_FullVersion >= 30004}
procedure GetConfidenceLimits(AIndex: Integer; out ALower, AUpper: Double);
procedure GetLowerConfidenceInterval(const Ax: Double; out AY: Double);
procedure GetUpperConfidenceInterval(const Ax: Double; out AY: Double);
procedure GetLowerPredictionInterval(const Ax: Double; out AY: Double);
procedure GetUpperPredictionInterval(const Ax: Double; out AY: Double);
{$IFEND}
function GetNearestPoint(
const AParams: TNearestPointParams;
out AResults: TNearestPointResults): Boolean; override;
@ -366,9 +362,7 @@ type
public // properties
property Param[AIndex: Integer]: Double read GetParam;
property ParamError[AIndex: Integer]: Double read GetParamError;
{$IF FPC_FullVersion >= 30004}
property Param_pValue[AIndex: Integer]: Double read GetParam_pValue;
{$IFEND}
property Param_tValue[AIndex: Integer]: Double read GetParam_tValue;
property FitStatistics: TFitStatistics read FFitStatistics;
property ConfidenceLevel: Double read FConfidenceLevel write SetConfidenceLevel;
@ -504,7 +498,7 @@ type
implementation
uses
{$IF FPC_FullVersion >= 30101}ipf{$ELSE}ipf_fix{$ENDIF},
ipf,
GraphType, GraphUtil, Math, spe, StrUtils, SysUtils,
TAChartStrConsts, TAGeometry, TAGraph, TAMath;
@ -2010,7 +2004,6 @@ begin
Result[i] := Param[i];
end;
{$IF FPC_FullVersion >= 30004}
procedure TFitSeries.GetConfidenceLimits(AIndex: Integer; out ALower, AUpper: Double);
var
val, sig, t: Double;
@ -2082,7 +2075,6 @@ procedure TFitSeries.GetUpperPredictionInterval(const AX: Double; out AY: Double
begin
GetInterval(AX, AY, true, true);
end;
{$IFEND}
{ Function removed, but left here commented to show useage of IEquationText.
function TFitSeries.GetFitEquationString(ANumFormat: String; AXText: String;
@ -2183,7 +2175,6 @@ begin
end;
end;
{$IF FPC_FullVersion >= 30004}
function TFitSeries.GetParam_pValue(AIndex: Integer): Double;
var
t: Double;
@ -2197,7 +2188,6 @@ begin
else
Result := tDist(t, FFitStatistics.DOF, 2);
end;
{$IFEND}
function TFitSeries.GetParam_RawError(AIndex: Integer): Double;
var

3
components/virtualtreeview/include/intf/laz.dummydragmanager.inc
View File

@ -533,8 +533,7 @@ end;
//----------------------------------------------------------------------------------------------------------------------
function TVTDataObject.SetData(const FormatEtc: TFormatEtc;
{$IF FPC_FullVersion >= 30200}var{$ELSE}const{$IFEND} Medium: TStgMedium;
function TVTDataObject.SetData(const FormatEtc: TFormatEtc; var Medium: TStgMedium;
DoRelease: BOOL): HResult;
// Allows dynamic adding to the IDataObject during its existance. Most noteably it is used to implement

3
components/virtualtreeview/include/intf/win32/laz.vtvdragmanager.inc
View File

@ -481,8 +481,7 @@ end;
//----------------------------------------------------------------------------------------------------------------------
function TVTDataObject.SetData(const FormatEtc: TFormatEtc;
{$IF FPC_FullVersion >= 30200}var{$ELSE}const{$IFEND} Medium: TStgMedium;
function TVTDataObject.SetData(const FormatEtc: TFormatEtc; var Medium: TStgMedium;
DoRelease: BOOL): HResult;
// Allows dynamic adding to the IDataObject during its existance. Most noteably it is used to implement

8
components/virtualtreeview/laz.virtualtrees.pas
View File

@ -851,8 +851,7 @@ type
function GetData(const FormatEtcIn: TFormatEtc; out Medium: TStgMedium): HResult; virtual; stdcall;
function GetDataHere(const {%H-}FormatEtc: TFormatEtc; out {%H-}Medium: TStgMedium): HResult; virtual; stdcall;
function QueryGetData(const FormatEtc: TFormatEtc): HResult; virtual; stdcall;
function SetData(const FormatEtc: TFormatEtc;
{$IF FPC_FullVersion >= 30200}var{$ELSE}const{$IFEND} Medium: TStgMedium;
function SetData(const FormatEtc: TFormatEtc; var Medium: TStgMedium;
DoRelease: BOOL): HResult; virtual; stdcall;
end;
@ -14278,12 +14277,7 @@ asm
PUSH EBX
PUSH EDI
PUSH ESI
{$if FPC_FULLVERSION >= 30100}
MOV ESI, EDX
{$else}
MOV ECX, EDX //fpc < 3.1: count is in EDX. Move to ECX
MOV ESI, [EBP+8] //fpc < 3.1: TheArray is in EBP+8
{$endif}
MOV EDX, -1
JCXZ @@Finish // Empty list?
INC EDX // init remaining entries counter

9
components/virtualtreeview/units/carbon/laz.virtualdragmanager.pas
View File

@ -265,8 +265,7 @@ type
Function GetDataHere(CONST pformatetc : FormatETC; Out medium : STGMEDIUM):HRESULT; STDCALL;
Function QueryGetData(const pformatetc : FORMATETC):HRESULT; STDCALL;
Function GetCanonicalFormatTEtc(const pformatetcIn : FORMATETC;Out pformatetcOut : FORMATETC):HResult; STDCALl;
Function SetData (Const pformatetc : FORMATETC;
{$IF FPC_FullVersion >= 30200}var{$ELSE}const{$IFEND} medium:STGMEDIUM;
Function SetData (Const pformatetc : FORMATETC; var medium:STGMEDIUM;
FRelease : BOOL):HRESULT; StdCall;
Function EnumFormatEtc(dwDirection : DWord; OUT enumformatetcpara : IENUMFORMATETC):HRESULT; StdCall;
Function DAdvise(const formatetc : FORMATETC;advf :DWORD; CONST AdvSink : IAdviseSink;OUT dwConnection:DWORD):HRESULT;StdCall;
@ -400,8 +399,7 @@ type
function GetData(const FormatEtcIn: TFormatEtc; out Medium: TStgMedium): HResult; virtual; stdcall;
function GetDataHere(const FormatEtc: TFormatEtc; out Medium: TStgMedium): HResult; virtual; stdcall;
function QueryGetData(const FormatEtc: TFormatEtc): HResult; virtual; stdcall;
function SetData(const FormatEtc: TFormatEtc;
{$IF FPC_FullVersion >= 30200}var{$ELSE}const{$IFEND} Medium: TStgMedium;
function SetData(const FormatEtc: TFormatEtc; var Medium: TStgMedium;
DoRelease: BOOL): HResult; virtual; stdcall;
end;
@ -1332,8 +1330,7 @@ end;
//----------------------------------------------------------------------------------------------------------------------
function TVTDataObject.SetData(const FormatEtc: TFormatEtc;
{$IF FPC_FullVersion >= 30200}var{$ELSE}const{$IFEND} Medium: TStgMedium;
function TVTDataObject.SetData(const FormatEtc: TFormatEtc; var Medium: TStgMedium;
DoRelease: BOOL): HResult;
// Allows dynamic adding to the IDataObject during its existance. Most noteably it is used to implement

6
components/virtualtreeview/units/cocoa/laz.virtualdragmanager.pas
View File

@ -265,8 +265,7 @@ type
Function GetDataHere(CONST pformatetc : FormatETC; Out medium : STGMEDIUM):HRESULT; STDCALL;
Function QueryGetData(const pformatetc : FORMATETC):HRESULT; STDCALL;
Function GetCanonicalFormatTEtc(const pformatetcIn : FORMATETC;Out pformatetcOut : FORMATETC):HResult; STDCALl;
Function SetData (Const pformatetc : FORMATETC;
{$IF FPC_FullVersion >= 30200}var{$ELSE}const{$IFEND} medium:STGMEDIUM;
Function SetData (Const pformatetc : FORMATETC; var medium:STGMEDIUM;
FRelease : BOOL):HRESULT; StdCall;
Function EnumFormatEtc(dwDirection : DWord; OUT enumformatetcpara : IENUMFORMATETC):HRESULT; StdCall;
Function DAdvise(const formatetc : FORMATETC;advf :DWORD; CONST AdvSink : IAdviseSink;OUT dwConnection:DWORD):HRESULT;StdCall;
@ -400,8 +399,7 @@ type
function GetData(const FormatEtcIn: TFormatEtc; out Medium: TStgMedium): HResult; virtual; stdcall;
function GetDataHere(const FormatEtc: TFormatEtc; out Medium: TStgMedium): HResult; virtual; stdcall;
function QueryGetData(const FormatEtc: TFormatEtc): HResult; virtual; stdcall;
function SetData(const FormatEtc: TFormatEtc;
{$IF FPC_FullVersion >= 30200}var{$ELSE}const{$IFEND} Medium: TStgMedium;
function SetData(const FormatEtc: TFormatEtc; var Medium: TStgMedium;
DoRelease: BOOL): HResult; virtual; stdcall;
end;

9
components/virtualtreeview/units/gtk/laz.virtualdragmanager.pas
View File

@ -265,8 +265,7 @@ type
Function GetDataHere(CONST pformatetc : FormatETC; Out medium : STGMEDIUM):HRESULT; STDCALL;
Function QueryGetData(const pformatetc : FORMATETC):HRESULT; STDCALL;
Function GetCanonicalFormatTEtc(const pformatetcIn : FORMATETC;Out pformatetcOut : FORMATETC):HResult; STDCALl;
Function SetData (Const pformatetc : FORMATETC;
{$IF FPC_FullVersion >= 30200}var{$ELSE}const{$IFEND} medium:STGMEDIUM;
Function SetData (Const pformatetc : FORMATETC; var medium:STGMEDIUM;
FRelease : BOOL):HRESULT; StdCall;
Function EnumFormatEtc(dwDirection : DWord; OUT enumformatetcpara : IENUMFORMATETC):HRESULT; StdCall;
Function DAdvise(const formatetc : FORMATETC;advf :DWORD; CONST AdvSink : IAdviseSink;OUT dwConnection:DWORD):HRESULT;StdCall;
@ -400,8 +399,7 @@ type
function GetData(const FormatEtcIn: TFormatEtc; out Medium: TStgMedium): HResult; virtual; stdcall;
function GetDataHere(const FormatEtc: TFormatEtc; out Medium: TStgMedium): HResult; virtual; stdcall;
function QueryGetData(const FormatEtc: TFormatEtc): HResult; virtual; stdcall;
function SetData(const FormatEtc: TFormatEtc;
{$IF FPC_FullVersion >= 30200}var{$ELSE}const{$IFEND} Medium: TStgMedium;
function SetData(const FormatEtc: TFormatEtc; var Medium: TStgMedium;
DoRelease: BOOL): HResult; virtual; stdcall;
end;
@ -1332,8 +1330,7 @@ end;
//----------------------------------------------------------------------------------------------------------------------
function TVTDataObject.SetData(const FormatEtc: TFormatEtc;
{$IF FPC_FullVersion >= 30200}var{$ELSE}const{$IFEND} Medium: TStgMedium;
function TVTDataObject.SetData(const FormatEtc: TFormatEtc; var Medium: TStgMedium;
DoRelease: BOOL): HResult;
// Allows dynamic adding to the IDataObject during its existance. Most noteably it is used to implement

9
components/virtualtreeview/units/gtk2/laz.virtualdragmanager.pas
View File

@ -265,8 +265,7 @@ type
Function GetDataHere(CONST pformatetc : FormatETC; Out medium : STGMEDIUM):HRESULT; STDCALL;
Function QueryGetData(const pformatetc : FORMATETC):HRESULT; STDCALL;
Function GetCanonicalFormatTEtc(const pformatetcIn : FORMATETC;Out pformatetcOut : FORMATETC):HResult; STDCALl;
Function SetData (Const pformatetc : FORMATETC;
{$IF FPC_FullVersion >= 30200}var{$ELSE}const{$IFEND} medium:STGMEDIUM;
Function SetData (Const pformatetc : FORMATETC; var medium:STGMEDIUM;
FRelease : BOOL):HRESULT; StdCall;
Function EnumFormatEtc(dwDirection : DWord; OUT enumformatetcpara : IENUMFORMATETC):HRESULT; StdCall;
Function DAdvise(const formatetc : FORMATETC;advf :DWORD; CONST AdvSink : IAdviseSink;OUT dwConnection:DWORD):HRESULT;StdCall;
@ -400,8 +399,7 @@ type
function GetData(const FormatEtcIn: TFormatEtc; out Medium: TStgMedium): HResult; virtual; stdcall;
function GetDataHere(const FormatEtc: TFormatEtc; out Medium: TStgMedium): HResult; virtual; stdcall;
function QueryGetData(const FormatEtc: TFormatEtc): HResult; virtual; stdcall;
function SetData(const FormatEtc: TFormatEtc;
{$IF FPC_FullVersion >= 30200}var{$ELSE}const{$IFEND} Medium: TStgMedium;
function SetData(const FormatEtc: TFormatEtc; var Medium: TStgMedium;
DoRelease: BOOL): HResult; virtual; stdcall;
end;
@ -1332,8 +1330,7 @@ end;
//----------------------------------------------------------------------------------------------------------------------
function TVTDataObject.SetData(const FormatEtc: TFormatEtc;
{$IF FPC_FullVersion >= 30200}var{$ELSE}const{$IFEND} Medium: TStgMedium;
function TVTDataObject.SetData(const FormatEtc: TFormatEtc; var Medium: TStgMedium;
DoRelease: BOOL): HResult;
// Allows dynamic adding to the IDataObject during its existance. Most noteably it is used to implement

9
components/virtualtreeview/units/gtk3/laz.virtualdragmanager.pas
View File

@ -265,8 +265,7 @@ type
Function GetDataHere(CONST pformatetc : FormatETC; Out medium : STGMEDIUM):HRESULT; STDCALL;
Function QueryGetData(const pformatetc : FORMATETC):HRESULT; STDCALL;
Function GetCanonicalFormatTEtc(const pformatetcIn : FORMATETC;Out pformatetcOut : FORMATETC):HResult; STDCALl;
Function SetData (Const pformatetc : FORMATETC;
{$IF FPC_FullVersion >= 30200}var{$ELSE}const{$IFEND} medium:STGMEDIUM;
Function SetData (Const pformatetc : FORMATETC; var medium:STGMEDIUM;
FRelease : BOOL):HRESULT; StdCall;
Function EnumFormatEtc(dwDirection : DWord; OUT enumformatetcpara : IENUMFORMATETC):HRESULT; StdCall;
Function DAdvise(const formatetc : FORMATETC;advf :DWORD; CONST AdvSink : IAdviseSink;OUT dwConnection:DWORD):HRESULT;StdCall;
@ -400,8 +399,7 @@ type
function GetData(const FormatEtcIn: TFormatEtc; out Medium: TStgMedium): HResult; virtual; stdcall;
function GetDataHere(const FormatEtc: TFormatEtc; out Medium: TStgMedium): HResult; virtual; stdcall;
function QueryGetData(const FormatEtc: TFormatEtc): HResult; virtual; stdcall;
function SetData(const FormatEtc: TFormatEtc;
{$IF FPC_FullVersion >= 30200}var{$ELSE}const{$IFEND} Medium: TStgMedium;
function SetData(const FormatEtc: TFormatEtc; var Medium: TStgMedium;
DoRelease: BOOL): HResult; virtual; stdcall;
end;
@ -1332,8 +1330,7 @@ end;
//----------------------------------------------------------------------------------------------------------------------
function TVTDataObject.SetData(const FormatEtc: TFormatEtc;
{$IF FPC_FullVersion >= 30200}var{$ELSE}const{$IFEND} Medium: TStgMedium;
function TVTDataObject.SetData(const FormatEtc: TFormatEtc; var Medium: TStgMedium;
DoRelease: BOOL): HResult;
// Allows dynamic adding to the IDataObject during its existance. Most noteably it is used to implement

3
components/virtualtreeview/units/laz.dummyactivex.inc
View File

@ -263,8 +263,7 @@ type
Function GetDataHere(CONST pformatetc : FormatETC; Out medium : STGMEDIUM):HRESULT; STDCALL;
Function QueryGetData(const pformatetc : FORMATETC):HRESULT; STDCALL;
Function GetCanonicalFormatEtc(const pformatetcIn : FORMATETC;Out pformatetcOut : FORMATETC):HResult; STDCALl;
Function SetData (Const pformatetc : FORMATETC;
{$IF FPC_FullVersion >= 30200}var{$else}const{$IFEND} medium:STGMEDIUM;
Function SetData (Const pformatetc : FORMATETC; var medium:STGMEDIUM;
FRelease : BOOL):HRESULT; StdCall;
Function EnumFormatEtc(dwDirection : DWord; OUT enumformatetcpara : IENUMFORMATETC):HRESULT; StdCall;
Function DAdvise(const formatetc : FORMATETC;advf :DWORD; CONST AdvSink : IAdviseSink;OUT dwConnection:DWORD):HRESULT;StdCall;

9
components/virtualtreeview/units/qt/laz.virtualdragmanager.pas
View File

@ -265,8 +265,7 @@ type
Function GetDataHere(CONST pformatetc : FormatETC; Out medium : STGMEDIUM):HRESULT; STDCALL;
Function QueryGetData(const pformatetc : FORMATETC):HRESULT; STDCALL;
Function GetCanonicalFormatTEtc(const pformatetcIn : FORMATETC;Out pformatetcOut : FORMATETC):HResult; STDCALl;
Function SetData (Const pformatetc : FORMATETC;
{$IF FPC_FullVersion >= 30200}var{$ELSE}const{$IFEND} medium:STGMEDIUM;
Function SetData (Const pformatetc : FORMATETC; var medium:STGMEDIUM;
FRelease : BOOL):HRESULT; StdCall;
Function EnumFormatEtc(dwDirection : DWord; OUT enumformatetcpara : IENUMFORMATETC):HRESULT; StdCall;
Function DAdvise(const formatetc : FORMATETC;advf :DWORD; CONST AdvSink : IAdviseSink;OUT dwConnection:DWORD):HRESULT;StdCall;
@ -400,8 +399,7 @@ type
function GetData(const FormatEtcIn: TFormatEtc; out Medium: TStgMedium): HResult; virtual; stdcall;
function GetDataHere(const FormatEtc: TFormatEtc; out Medium: TStgMedium): HResult; virtual; stdcall;
function QueryGetData(const FormatEtc: TFormatEtc): HResult; virtual; stdcall;
function SetData(const FormatEtc: TFormatEtc;
{$IF FPC_FullVersion >= 30200}var{$ELSE}const{$IFEND} Medium: TStgMedium;
function SetData(const FormatEtc: TFormatEtc; var Medium: TStgMedium;
DoRelease: BOOL): HResult; virtual; stdcall;
end;
@ -1332,8 +1330,7 @@ end;
//----------------------------------------------------------------------------------------------------------------------
function TVTDataObject.SetData(const FormatEtc: TFormatEtc;
{$IF FPC_FullVersion >= 30200}var{$ELSE}const{$IFEND} Medium: TStgMedium;
function TVTDataObject.SetData(const FormatEtc: TFormatEtc; var Medium: TStgMedium;
DoRelease: BOOL): HResult;
// Allows dynamic adding to the IDataObject during its existance. Most noteably it is used to implement

9
components/virtualtreeview/units/qt5/laz.virtualdragmanager.pas
View File

@ -265,8 +265,7 @@ type
Function GetDataHere(CONST pformatetc : FormatETC; Out medium : STGMEDIUM):HRESULT; STDCALL;
Function QueryGetData(const pformatetc : FORMATETC):HRESULT; STDCALL;
Function GetCanonicalFormatTEtc(const pformatetcIn : FORMATETC;Out pformatetcOut : FORMATETC):HResult; STDCALl;
Function SetData (Const pformatetc : FORMATETC;
{$IF FPC_FullVersion >= 30200}var{$ELSE}const{$IFEND} medium:STGMEDIUM;
Function SetData (Const pformatetc : FORMATETC; var medium:STGMEDIUM;
FRelease : BOOL):HRESULT; StdCall;
Function EnumFormatEtc(dwDirection : DWord; OUT enumformatetcpara : IENUMFORMATETC):HRESULT; StdCall;
Function DAdvise(const formatetc : FORMATETC;advf :DWORD; CONST AdvSink : IAdviseSink;OUT dwConnection:DWORD):HRESULT;StdCall;
@ -400,8 +399,7 @@ type
function GetData(const FormatEtcIn: TFormatEtc; out Medium: TStgMedium): HResult; virtual; stdcall;
function GetDataHere(const FormatEtc: TFormatEtc; out Medium: TStgMedium): HResult; virtual; stdcall;
function QueryGetData(const FormatEtc: TFormatEtc): HResult; virtual; stdcall;
function SetData(const FormatEtc: TFormatEtc;
{$IF FPC_FullVersion >= 30200}var{$ELSE}const{$IFEND} Medium: TStgMedium;
function SetData(const FormatEtc: TFormatEtc; var Medium: TStgMedium;
DoRelease: BOOL): HResult; virtual; stdcall;
end;
@ -1332,8 +1330,7 @@ end;
//----------------------------------------------------------------------------------------------------------------------
function TVTDataObject.SetData(const FormatEtc: TFormatEtc;
{$IF FPC_FullVersion >= 30200}var{$ELSE}const{$IFEND} Medium: TStgMedium;
function TVTDataObject.SetData(const FormatEtc: TFormatEtc; var Medium: TStgMedium;
DoRelease: BOOL): HResult;
// Allows dynamic adding to the IDataObject during its existance. Most noteably it is used to implement

9
components/virtualtreeview/units/qt6/laz.virtualdragmanager.pas
View File

@ -265,8 +265,7 @@ type
Function GetDataHere(CONST pformatetc : FormatETC; Out medium : STGMEDIUM):HRESULT; STDCALL;
Function QueryGetData(const pformatetc : FORMATETC):HRESULT; STDCALL;
Function GetCanonicalFormatTEtc(const pformatetcIn : FORMATETC;Out pformatetcOut : FORMATETC):HResult; STDCALl;
Function SetData (Const pformatetc : FORMATETC;
{$IF FPC_FullVersion >= 30200}var{$ELSE}const{$IFEND} medium:STGMEDIUM;
Function SetData (Const pformatetc : FORMATETC; var medium:STGMEDIUM;
FRelease : BOOL):HRESULT; StdCall;
Function EnumFormatEtc(dwDirection : DWord; OUT enumformatetcpara : IENUMFORMATETC):HRESULT; StdCall;
Function DAdvise(const formatetc : FORMATETC;advf :DWORD; CONST AdvSink : IAdviseSink;OUT dwConnection:DWORD):HRESULT;StdCall;
@ -400,8 +399,7 @@ type
function GetData(const FormatEtcIn: TFormatEtc; out Medium: TStgMedium): HResult; virtual; stdcall;
function GetDataHere(const FormatEtc: TFormatEtc; out Medium: TStgMedium): HResult; virtual; stdcall;
function QueryGetData(const FormatEtc: TFormatEtc): HResult; virtual; stdcall;
function SetData(const FormatEtc: TFormatEtc;
{$IF FPC_FullVersion >= 30200}var{$ELSE}const{$IFEND} Medium: TStgMedium;
function SetData(const FormatEtc: TFormatEtc; var Medium: TStgMedium;
DoRelease: BOOL): HResult; virtual; stdcall;
end;
@ -1332,8 +1330,7 @@ end;
//----------------------------------------------------------------------------------------------------------------------
function TVTDataObject.SetData(const FormatEtc: TFormatEtc;
{$IF FPC_FullVersion >= 30200}var{$ELSE}const{$IFEND} Medium: TStgMedium;
function TVTDataObject.SetData(const FormatEtc: TFormatEtc; var Medium: TStgMedium;
DoRelease: BOOL): HResult;
// Allows dynamic adding to the IDataObject during its existance. Most noteably it is used to implement

6
components/virtualtreeview/units/win32/laz.virtualdragmanager.pas
View File

@ -145,8 +145,7 @@ type
function GetData(const FormatEtcIn: TFormatEtc; out Medium: TStgMedium): HResult; virtual; stdcall;
function GetDataHere(const FormatEtc: TFormatEtc; out Medium: TStgMedium): HResult; virtual; stdcall;
function QueryGetData(const FormatEtc: TFormatEtc): HResult; virtual; stdcall;
function SetData(const FormatEtc: TFormatEtc;
{$IF FPC_FullVersion >= 30200}var{$ELSE}const{$IFEND} Medium: TStgMedium;
function SetData(const FormatEtc: TFormatEtc; var Medium: TStgMedium;
DoRelease: BOOL): HResult; virtual; stdcall;
end;
@ -897,8 +896,7 @@ end;
//----------------------------------------------------------------------------------------------------------------------
function TVTDataObject.SetData(const FormatEtc: TFormatEtc;
{$IF FPC_FullVersion >= 30200}var{$ELSE}const{$IFEND} Medium: TStgMedium;
function TVTDataObject.SetData(const FormatEtc: TFormatEtc; var Medium: TStgMedium;
DoRelease: BOOL): HResult;
// Allows dynamic adding to the IDataObject during its existance. Most noteably it is used to implement

15
components/wiki/lazwiki/wiki2chmconvert.pas
View File

@ -129,9 +129,7 @@ end;
procedure TWiki2CHMConverter.AddIndexItem(AText, AUrl: String);
var
{$IF FPC_FULLVERSION>=30200}
x: integer;
{$ENDIF}
AItem: TCHMSiteMapItem;
i: Integer;
txt, url, itemtxt, itemurl, itemlocal: String;
@ -148,7 +146,6 @@ begin
for i:=0 to FIndexSiteMap.Items.Count-1 do begin
AItem := FIndexSiteMap.Items.Item[i];
itemtxt := UTF8Lowercase(AItem.Text);
{$IF FPC_FULLVERSION>=30200}
URL:='';
for x:=0 to AItem.SubItemcount-1 do
begin
@ -159,9 +156,6 @@ begin
if URL<>'' then
break;
end;
{$ELSE}
URL:=AItem.URL;
{$ENDIF}
itemurl := UTF8Lowercase(URL);
itemlocal := UTF8Lowercase(AItem.Local);
if (txt = itemtxt) and ((url = itemurl) or (url = itemlocal)) then
@ -170,12 +164,7 @@ begin
AItem := FIndexSiteMap.Items.NewItem;
AItem.Text := UTF8Trim(AText);
{$IF FPC_FULLVERSION>=30200}
AItem.AddLocal(AUrl);
{$ELSE}
AItem.Local := Trim(AUrl);
AItem.Keyword := UTF8Trim(AText);
{$ENDIF}
end;
procedure TWiki2CHMConverter.AddTocItem(ALevel: Integer; AText, AUrl: String);
@ -204,11 +193,7 @@ var
item: TCHMSitemapItem;
begin
item := NewItemAtLevel(ALevel);
{$IF FPC_FULLVERSION>=30200}
Item.AddLocal(AUrl);
{$ELSE}
item.Local := AUrl;
{$ENDIF}
item.Text := EscapeToHTML(AText);
item.ImageNumber := 0;
end;

5
components/wiki/wikiget.lpr
View File

@ -37,12 +37,7 @@ uses
CodeToolsStructs,
// Wiki
fphttpclient,HTTPDefs,
{$IF FPC_FULLVERSION >= 30200}
opensslsockets,
{$ELSE}
fpopenssl,
openssl,
{$ENDIF}
WikiParser, WikiFormat;
const

18
designer/jitforms.pp
View File

@ -34,10 +34,6 @@ unit JITForms;
{$I ide.inc}
{$IF FPC_FULLVERSION<30100}
{$DEFINE HasVMTParent}
{$ENDIF}
{ $DEFINE VerboseJITForms}
interface
@ -1535,12 +1531,8 @@ begin
NewVMT^.vInstanceSize2:=-AncestorClass.InstanceSize;
// set vmtParent
{$IFDEF HasVMTParent}
NewVMT^.vParent:=AncestorVMT;
{$ELSE}
GetMem(NewVMT^.vParentRef,SizeOf(Pointer));
NewVMT^.vParentRef^:=AncestorVMT;
{$ENDIF}
// set vmtClassName: create pointer to classname (PShortString)
GetMem(ClassNamePShortString,SizeOf(ShortString));
@ -1584,12 +1576,8 @@ begin
// set TypeData (PropCount is the total number of properties, including ancestors)
NewTypeData^.ClassType:=TClass(NewVMT);
{$IFDEF HasVMTParent}
NewTypeData^.ParentInfo:=AncestorClass.ClassInfo;
{$ELSE}
GetMem(NewTypeData^.ParentInfoRef,SizeOf(Pointer));
NewTypeData^.ParentInfoRef^:=AncestorClass.ClassInfo;
{$ENDIF}
NewTypeData^.PropCount:=GetTypeData(NewTypeData^.ParentInfo)^.PropCount;
NewTypeData^.UnitName:=NewUnitName;
AddedPropCount:=GetTypeDataPropCountAddr(NewTypeData);
@ -1637,9 +1625,7 @@ var
OldFieldTable: PFieldTable;
OldTypeInfo: PTypeInfo;
OldMethodTable: PMethodNameTable;
{$IF FPC_FULLVERSION>=30100}
OldTypeData: PTypeData;
{$ENDIF}
begin
// free TJITMethods
JITMethods.DeleteAllOfClass(AClass);
@ -1654,9 +1640,7 @@ begin
end;
// set vmtParent
{$IFNDEF HasVMTParent}
FreeMem(OldVMT^.vParentRef);
{$ENDIF}
// free classname
ClassNamePShortString:=Pointer(OldVMT^.vClassName);
@ -1669,12 +1653,10 @@ begin
// free typeinfo
OldTypeInfo:=PTypeInfo(OldVMT^.vTypeInfo);
{$IFNDEF HasVMTParent}
// free ParentInfoRef
OldTypeData:=GetTypeData(OldTypeInfo);
FreeMem(OldTypeData^.ParentInfoRef);
OldTypeData^.ParentInfoRef:=nil;
{$ENDIF}
FreeMem(OldTypeInfo);
// free vmt

5
examples/jpeg_more/main.pas
View File

@ -135,9 +135,7 @@ begin
try
jpeg.LoadFromFile(filename);
jpeg.CompressionQuality := SbQuality.Position;
{$IF FPC_FullVersion >= 30004}
jpeg.GrayScale := CbGrayScale.Checked;
{$IFEND}
jpeg.ProgressiveEncoding := CbProgressive.Checked;
jpeg.SaveToFile(newFileName);
finally
@ -171,9 +169,6 @@ begin
LblProgressive.Caption := '';
BtnReadClick(nil);
SbQualityChange(nil);
{$IF FPC_FullVersion < 30004}
CbGrayScale.Enabled := false;
{$ENDIF}
end;
function TForm1.GetFileName: String;

3
ide/buildmodesmanager.pas
View File

@ -31,8 +31,7 @@ unit BuildModesManager;
interface
uses
Classes, SysUtils,
{$IF FPC_FULLVERSION >= 30200}System.{$ENDIF}UITypes,
Classes, SysUtils, System.UITypes,
// LCL
Forms, Dialogs, StdCtrls, Grids, Menus, ComCtrls, ButtonPanel,
// LazUtils

3
ide/compiler.pp
View File

@ -38,8 +38,7 @@ unit Compiler;
interface
uses
Classes, SysUtils, Contnrs, StrUtils,
{$IF FPC_FULLVERSION >= 30200}System.{$ENDIF}UITypes,
Classes, SysUtils, Contnrs, StrUtils, System.UITypes,
// LazUtils
FPCAdds, LazUTF8, LazFileUtils, LazUtilities, LazLoggerBase,
// Codetools

3
ide/compileroptions.pp
View File

@ -42,8 +42,7 @@ unit CompilerOptions;
interface
uses
Classes, SysUtils, Laz_AVL_Tree,
{$IF FPC_FULLVERSION >= 30200}System.{$ENDIF}UITypes,
Classes, SysUtils, Laz_AVL_Tree, System.UITypes,
// LazUtils
FileUtil, LazFileUtils, LazUTF8, Laz2_XMLCfg, Laz2_DOM, LazUtilities, LazTracer,
LazStringUtils, FPCAdds, LazVersion,

2
ide/customformeditor.pp
View File

@ -296,7 +296,7 @@ type
procedure DefineBinaryProperty(const Name: string;
{%H-}ReadData, {%H-}WriteData: TStreamProc;
{%H-}HasData: Boolean); override;
procedure FlushBuffer; {$IF FPC_FULLVERSION >= 30200}override;{$ENDIF}
procedure FlushBuffer; override;
property DefinePropertyNames: TStrings read FDefinePropertyNames;
end;

3
ide/dialogprocs.pas
View File

@ -36,8 +36,7 @@ unit DialogProcs;
interface
uses
Classes, SysUtils,
{$IF FPC_FULLVERSION >= 30200}System.{$ENDIF}UITypes,
Classes, SysUtils, System.UITypes,
// LCL
LResources, Dialogs, ComCtrls,
// LazUtils

3
ide/diskdiffsdialog.pas
View File

@ -29,8 +29,7 @@ interface
uses
// RTL + FCL
Classes, SysUtils,
{$IF FPC_FULLVERSION >= 30200}System.{$ENDIF}UITypes,
Classes, SysUtils, System.UITypes,
// LCL
Forms, StdCtrls, ExtCtrls, CheckLst, ButtonPanel, Buttons,
// CodeTools

3
ide/exttools.pas
View File

@ -35,8 +35,7 @@ interface
uses
// RTL + FCL
Classes, SysUtils, math, process, Pipes, Laz_AVL_Tree,
{$IF FPC_FULLVERSION >= 30200}System.{$ENDIF}UITypes,
Classes, SysUtils, math, process, Pipes, Laz_AVL_Tree, System.UITypes,
// LazUtils
FileUtil, LazFileUtils, LazUtilities, LazLoggerBase, UTF8Process, LazUTF8,
AvgLvlTree,

8
ide/generatefppkgconfigurationdlg.pas
View File

@ -319,17 +319,14 @@ begin
end;
function TGenerateFppkgConfigurationDialog.CheckFpcmkcfgQuality(out Note: string): TSDFilenameQuality;
{$IF FPC_FULLVERSION>30100}
var
FpcmkcfgExecutable: string;
Proc: TProcessUTF8;
S: string;
Ver: TFPVersion;
{$ENDIF}
begin
Result := sddqCompatible;
Note:='';
{$IF FPC_FULLVERSION>30100}
FpcmkcfgExecutable := FindFPCTool('fpcmkcfg'+GetExecutableExt, EnvironmentOptions.GetParsedCompilerFilename);
if FpcmkcfgExecutable = '' then
begin
@ -382,7 +379,6 @@ begin
Proc.Free;
end;
end;
{$ENDIF}
end;
procedure TGenerateFppkgConfigurationDialog.FpcPrefixComboboxChange(Sender: TObject);
@ -417,11 +413,9 @@ end;
procedure TGenerateFppkgConfigurationDialog.FppkgWriteConfigButtonClick(Sender: TObject);
var
Msg: string;
{$IF FPC_FULLVERSION>30100}
FpcmkcfgExecutable, CompConfigFilename: string;
Proc: TProcessUTF8;
Fppkg: TFppkgHelper;
{$ENDIF}
procedure ShowFpcmkcfgError;
begin
@ -434,7 +428,6 @@ var
end;
begin
{$IF FPC_FULLVERSION>30100}
try
FpcmkcfgExecutable := FindFPCTool('fpcmkcfg'+GetExecutableExt, EnvironmentOptions.GetParsedCompilerFilename);
if FpcmkcfgExecutable<>'' then
@ -497,7 +490,6 @@ begin
fLastParsedFpcPrefix := '';
UpdateFppkgNote;
{$ENDIF}
if CheckFppkgConfiguration(FFppkgCfgFilename, Msg)<>sddqCompatible then
begin
IDEMessageDialog(lisFppkgProblem, Format(lisFppkgWriteConfFailed, [Msg]),

7
ide/ideinstances.pas
View File

@ -37,12 +37,7 @@ unit IDEInstances;
interface
uses
Classes, sysutils, crc, Process,
{$IF (FPC_FULLVERSION >= 30101)}
AdvancedIPC,
{$ELSE}
LazAdvancedIPC,
{$ENDIF}
Classes, sysutils, crc, Process, AdvancedIPC,
Controls, Dialogs, ExtCtrls, LCLIntf, LCLType,
LazFileUtils, FileUtil, Laz2_XMLRead, Laz2_XMLWrite, Laz2_DOM, LazUTF8,
UTF8Process, LazLoggerBase,

4
ide/include/ide.inc
View File

@ -52,9 +52,7 @@
{$DEFINE EnableRedirectStdErr}
{$ENDIF}
{$IF FPC_FULLVERSION>30100}
{$warn 6058 off} // cannot inline
{$ENDIF}
{$warn 6058 off} // cannot inline
// end.

3
ide/mainintf.pas
View File

@ -59,8 +59,7 @@ uses
{$IFDEF IDE_MEM_CHECK}
MemCheck,
{$ENDIF}
Classes, TypInfo,
{$IF FPC_FULLVERSION >= 30200}System.{$ENDIF}UITypes,
Classes, TypInfo, System.UITypes,
// LCL
Forms,
// Codetools

2
ide/multipastedlg.pas
View File

@ -92,9 +92,7 @@ var
List: THistoryList;
begin
FContent := TStringList.Create;
{$IF FPC_FULLVERSION >= 30101}
FContent.SkipLastLineBreak := True;
{$ENDIF}
OnShow := @DoWatch;
OnActivate := @DoWatch;

3
ide/packages/ideconfig/environmentopts.pp
View File

@ -37,8 +37,7 @@ uses
{$ifdef Windows}
ShlObj,
{$endif}
Classes, SysUtils, Contnrs,
{$IF FPC_FULLVERSION >= 30200}System.{$ENDIF}UITypes,
Classes, SysUtils, Contnrs, System.UITypes,
// LazUtils
LazFileUtils, FileUtil, LazFileCache, LazConfigStorage, LazUTF8, LazStringUtils,
Laz2_XMLCfg, Laz2_DOM,

3
ide/publishmoduledlg.pas
View File

@ -32,8 +32,7 @@ unit PublishModuleDlg;
interface
uses
Classes, SysUtils, StrUtils, Zipper,
{$IF FPC_FULLVERSION >= 30200}System.{$ENDIF}UITypes,
Classes, SysUtils, StrUtils, Zipper, System.UITypes,
// LCL
LCLType, Forms, StdCtrls, Dialogs, Buttons, ButtonPanel, LCLIntf,
// LazUtils

4
ide/sourcefilemanager.pas
View File

@ -6021,9 +6021,7 @@ var
ARestoreVisible: Boolean;
NestedAncestorClass: TComponentClass;
DsgControl: TCustomDesignControl;
{$IF (FPC_FULLVERSION >= 30003)}
DsgDataModule: TDataModule;
{$ENDIF}
AmbiguousClasses: TFPList;
ResolvedClasses, ResolvedVars: TStringToPointerTree;
begin
@ -6246,7 +6244,6 @@ begin
end;
DsgControl.PixelsPerInch := Screen.PixelsPerInch;
end;
{$IF (FPC_FULLVERSION >= 30003)} // TDataModule.DesignPPI was added in FPC 3.0.3
if NewComponent is TDataModule then
begin
DsgDataModule := TDataModule(NewComponent);
@ -6262,7 +6259,6 @@ begin
DsgDataModule.DesignPPI := Screen.PixelsPerInch;
end;
end;
{$ENDIF}
if NewComponent<>nil then
AnUnitInfo.ResourceBaseClass:=GetComponentBaseClass(NewComponent.ClassType);

111
lcl/controls.pp
View File

@ -34,18 +34,10 @@ interface
// {$DEFINE ASSERT_IS_ON}
{$ENDIF}
{$MACRO ON}
{$IF FPC_FULLVERSION >= 30200}
{$DEFINE SysUITypes:=System.UITypes}
{$ELSE}
{$DEFINE SysUITypes:=UITypes}
{$ENDIF}
{$INTERFACES CORBA}
uses
SysUITypes,
Classes, SysUtils, TypInfo, Types, Laz_AVL_Tree,
System.UITypes, Classes, SysUtils, TypInfo, Types, Laz_AVL_Tree,
// LCL
LCLStrConsts, LCLType, LCLProc, Graphics, LMessages, LCLIntf, InterfaceBase,
ImgList, PropertyStorage, Menus, ActnList, LCLClasses, LResources, LCLPlatformDef,
@ -56,22 +48,22 @@ uses
const
// Used for ModalResult
mrNone = SysUITypes.mrNone;
mrOK = SysUITypes.mrOK;
mrCancel = SysUITypes.mrCancel;
mrAbort = SysUITypes.mrAbort;
mrRetry = SysUITypes.mrRetry;
mrIgnore = SysUITypes.mrIgnore;
mrYes = SysUITypes.mrYes;
mrNo = SysUITypes.mrNo;
mrAll = SysUITypes.mrAll;
mrNoToAll = SysUITypes.mrNoToAll;
mrYesToAll= SysUITypes.mrYesToAll;
mrClose = SysUITypes.mrClose;
mrLast = SysUITypes.mrLast;
mrNone = System.UITypes.mrNone;
mrOK = System.UITypes.mrOK;
mrCancel = System.UITypes.mrCancel;
mrAbort = System.UITypes.mrAbort;
mrRetry = System.UITypes.mrRetry;
mrIgnore = System.UITypes.mrIgnore;
mrYes = System.UITypes.mrYes;
mrNo = System.UITypes.mrNo;
mrAll = System.UITypes.mrAll;
mrNoToAll = System.UITypes.mrNoToAll;
mrYesToAll= System.UITypes.mrYesToAll;
mrClose = System.UITypes.mrClose;
mrLast = System.UITypes.mrLast;
function GetModalResultStr(ModalResult: TModalResult): ShortString;
deprecated 'Use the ModalResultStr array from unit UITypes directly.';
deprecated 'Use the ModalResultStr array from unit System.UITypes directly.';
property ModalResultStr[ModalResult: TModalResult]: shortstring read GetModalResultStr;
const
@ -176,9 +168,9 @@ type
TAlign = (alNone, alTop, alBottom, alLeft, alRight, alClient, alCustom);
TAlignSet = set of TAlign;
{$IF FPC_FULLVERSION >= 30300}
TAnchorKind = SysUITypes.TAnchorKind;
TAnchors = SysUITypes.TAnchors;
TAnchorSideReference = SysUITypes.TAnchorSideReference;
TAnchorKind = System.UITypes.TAnchorKind;
TAnchors = System.UITypes.TAnchors;
TAnchorSideReference = System.UITypes.TAnchorSideReference;
{$ELSE}
TAnchorKind = (akTop, akLeft, akRight, akBottom);
TAnchors = set of TAnchorKind;
@ -187,14 +179,14 @@ type
const
{$IF FPC_FULLVERSION >= 30300}
akLeft = SysUITypes.akLeft;
akTop = SysUITypes.akTop;
akRight = SysUITypes.akRight;
akBottom = SysUITypes.akBottom;
akLeft = System.UITypes.akLeft;
akTop = System.UITypes.akTop;
akRight = System.UITypes.akRight;
akBottom = System.UITypes.akBottom;
asrTop = SysUITypes.asrTop;
asrBottom = SysUITypes.asrBottom;
asrCenter = SysUITypes.asrCenter;
asrTop = System.UITypes.asrTop;
asrBottom = System.UITypes.asrBottom;
asrCenter = System.UITypes.asrCenter;
{$ENDIF}
asrLeft = asrTop;
@ -219,18 +211,18 @@ type
TBevelCut = TGraphicsBevelCut;
{$IF FPC_FULLVERSION >= 30300}
TMouseButton = SysUITypes.TMouseButton;
TMouseButton = System.UITypes.TMouseButton;
{$ELSE}
TMouseButton = (mbLeft, mbRight, mbMiddle, mbExtra1, mbExtra2);
{$ENDIF}
const
{$IF FPC_FULLVERSION >= 30300}
mbLeft = SysUITypes.mbLeft;
mbRight = SysUITypes.mbRight;
mbMiddle = SysUITypes.mbMiddle;
mbExtra1 = SysUITypes.mbExtra1;
mbExtra2 = SysUITypes.mbExtra2;
mbLeft = System.UITypes.mbLeft;
mbRight = System.UITypes.mbRight;
mbMiddle = System.UITypes.mbMiddle;
mbExtra1 = System.UITypes.mbExtra1;
mbExtra2 = System.UITypes.mbExtra2;
{$ENDIF}
fsAllStayOnTop = [fsStayOnTop, fsSystemStayOnTop];
@ -468,10 +460,10 @@ type
TDragObject = class;
{$IF FPC_FULLVERSION >= 30300}
TDragKind = SysUITypes.TDragKind;
TDragMode = SysUITypes.TDragMode;
TDragState = SysUITypes.TDragState;
TDragMessage = SysUITypes.TDragMessage;
TDragKind = System.UITypes.TDragKind;
TDragMode = System.UITypes.TDragMode;
TDragState = System.UITypes.TDragState;
TDragMessage = System.UITypes.TDragMessage;
{$ELSE}
TDragKind = (dkDrag, dkDock);
TDragMode = (dmManual , dmAutomatic);
@ -983,7 +975,7 @@ type
TControlAutoSizePhases = set of TControlAutoSizePhase;
{$IF FPC_FULLVERSION >= 30300}
TTabOrder = SysUITypes.TTabOrder;
TTabOrder = System.UITypes.TTabOrder;
{$ELSE}
TTabOrder = -1..32767;
{$ENDIF}
@ -2786,22 +2778,22 @@ procedure Register;
{$IF FPC_FULLVERSION >= 30300}
const
dkDrag = SysUITypes.dkDrag;
dkDock = SysUITypes.dkDock;
dkDrag = System.UITypes.dkDrag;
dkDock = System.UITypes.dkDock;
dmManual = SysUITypes.dmManual;
dmAutomatic = SysUITypes.dmAutomatic;
dmManual = System.UITypes.dmManual;
dmAutomatic = System.UITypes.dmAutomatic;
dsDragEnter = SysUITypes.dsDragEnter;
dsDragLeave = SysUITypes.dsDragLeave;
dsDragMove = SysUITypes.dsDragMove;
dsDragEnter = System.UITypes.dsDragEnter;
dsDragLeave = System.UITypes.dsDragLeave;
dsDragMove = System.UITypes.dsDragMove;
dmDragEnter = SysUITypes.dmDragEnter;
dmDragLeave = SysUITypes.dmDragLeave;
dmDragMove = SysUITypes.dmDragMove;
dmDragDrop = SysUITypes.dmDragDrop;
dmDragCancel = SysUITypes.dmDragCancel;
dmFindTarget = SysUITypes.dmFindTarget;
dmDragEnter = System.UITypes.dmDragEnter;
dmDragLeave = System.UITypes.dmDragLeave;
dmDragMove = System.UITypes.dmDragMove;
dmDragDrop = System.UITypes.dmDragDrop;
dmDragCancel = System.UITypes.dmDragCancel;
dmFindTarget = System.UITypes.dmFindTarget;
{$ENDIF}
implementation
@ -3050,7 +3042,7 @@ end;
function GetModalResultStr(ModalResult: TModalResult): ShortString;
begin
Result := SysUITypes.ModalResultStr[ModalResult];
Result := System.UITypes.ModalResultStr[ModalResult];
end;
{------------------------------------------------------------------------------
@ -4645,9 +4637,6 @@ end;
initialization
//DebugLn('controls.pp - initialization');
{$IF FPC_FULLVERSION<30003}
RegisterPropertyToSkip(TDataModule, 'PPI', 'PPI was introduced in FPC 3.0.3', '');
{$ENDIF}
Mouse := TMouse.Create;
DefaultDockManagerClass := TDockTree;
DragManager := TDragManagerDefault.Create(nil);

15
lcl/forms.pp
View File

@ -33,20 +33,14 @@ interface
uses
// RTL + FCL
Classes, SysUtils, Types, TypInfo, Math, CustApp,
Classes, SysUtils, Types, TypInfo, Math, CustApp, System.UITypes,
// LCL
LCLStrConsts, LCLType, LCLProc, LCLIntf, LCLVersion, LCLClasses, InterfaceBase,
LResources, Graphics, Menus, LMessages, CustomTimer, ActnList,
ClipBrd, HelpIntfs, Controls, ImgList, Themes,
// LazUtils
LazFileUtils, LazUTF8, Maps, IntegerList, LazMethodList, LazLoggerBase,
LazUtilities, GraphType,
{$IF FPC_FULLVERSION >= 30200}
System.UITypes
{$ELSE}
UITypes
{$ENDIF}
;
LazUtilities, GraphType;
type
TProcedure = procedure;
@ -482,13 +476,8 @@ type
);
TFormState = set of TFormStateType;
{$IF FPC_FULLVERSION >= 30200}
TModalResult = System.UITypes.TModalResult;
PModalResult = ^System.UITypes.TModalResult;
{$ELSE}
TModalResult = UITypes.TModalResult;
PModalResult = ^UITypes.TModalResult;
{$ENDIF}
TFormHandlerType = (
fhtFirstShow,

9
lcl/graphics.pp
View File

@ -28,9 +28,6 @@ interface
{$DEFINE HasFPCanvas1}
{$DEFINE HasFPEndCap}
{$DEFINE HasFPJoinStyle}
{$IF FPC_FULLVERSION>=30203}
{$DEFINE UseSystemUITypes}
{$ENDIF}
uses
// RTL + FCL
@ -50,9 +47,7 @@ uses
{$IFNDEF DisableLCLGIF}
FPReadGif,
{$ENDIF}
{$IFDEF UseSystemUITypes}
System.UITypes,
{$ENDIF}
// LCL
LCLVersion, LCLStrConsts, LCLType, LCLProc, LMessages, LResources, LCLResCache,
IntfGraphics, IcnsTypes, WSReferences,
@ -60,7 +55,7 @@ uses
GraphType, GraphMath, FPCAdds, LazLoggerBase, LazTracer, LazUtilities;
type
PColor = {$IFDEF UseSystemUITypes}System.UITypes.PColor{$ELSE}^TColor{$ENDIF};
PColor = System.UITypes.PColor;
TColor = TGraphicsColor;
{$IF FPC_FULLVERSION>=30300}
@ -1811,7 +1806,7 @@ type
class function GetFileExtensions: string; override;
public
property CompressionQuality: TJPEGQualityRange read FQuality write SetCompressionQuality;
property GrayScale: Boolean read FGrayScale {$IF FPC_FullVersion >= 30004} write SetGrayScale{$IFEND};
property GrayScale: Boolean read FGrayScale write SetGrayScale;
property MinHeight: Integer read FMinHeight write FMinHeight;
property MinWidth: Integer read FMinWidth write FMinWidth;
property ProgressiveEncoding: boolean read FProgressiveEncoding write SetProgressiveEncoding;

4
lcl/include/clipbrd.inc
View File

@ -879,12 +879,8 @@ begin
exit;
{$IFDEF WINDOWS}
{$IF FPC_FULLVERSION >= 30101}
Stream := TStringStream.Create(InsertClipHeader(Html), DefaultSystemCodePage);
{$ELSE}
Stream := TStringStream.Create(InsertClipHeader(Html));
{$ENDIF}
{$ELSE}
Stream := TStringStream.Create(Html);
{$ENDIF}
try

4
lcl/include/icon.inc
View File

@ -870,10 +870,6 @@ begin
if QWord(PNGComn.Signature) = QWord(PNGSig)
then begin
{$if FPC_FULLVERSION < 30200}
//workaround for fpc bug #0034185 (dangling FPalette pointer in TFPReaderPNG.InternalRead causes AV)
if Assigned(PNGReader) then FreeAndNil(PngReader);
{$ENDIF}
if PNGReader = nil
then PNGReader := TLazReaderPNG.Create;
ImgReader := PNGReader;

2
lcl/include/jpegimage.inc
View File

@ -95,9 +95,7 @@ begin
if not(AWriter is TFPWriterJPEG) then Exit;
TFPWriterJPEG(AWriter).ProgressiveEncoding := ProgressiveEncoding;
TFPWriterJPEG(AWriter).CompressionQuality := CompressionQuality;
{$IF FPC_FullVersion >= 30004}
TFPWriterJPEG(AWriter).GrayScale := GrayScale;
{$IFEND}
end;
procedure TJPEGImage.SetCompressionQuality(AValue: TJPEGQualityRange);

Some files were not shown because too many files have changed in this diff Show More