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

Cleanup.

Browse Source 
git-svn-id: trunk@64189 -
This commit is contained in:
juha 2020-12-09 11:48:28 +00:00
parent 62849be37a
commit f34f7f4c56
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
components/ideintf/componenteditors.pas
View File

@ -1459,16 +1459,13 @@ var
I: Integer;
P: PComponentClassReqRec;
begin
if not Assigned(ComponentClass) or not Assigned(ComponentClassReqList) then
if (ComponentClass=Nil) or (ComponentClassReqList=Nil) then
Exit(Nil);
for I := 0 to ComponentClassReqList.Count - 1 do
begin
P := PComponentClassReqRec(ComponentClassReqList[i]);
if P^.ComponentClass = ComponentClass then
begin
Result := P^.RequirementsClass.Create(ComponentClass);
Exit;
end;
Exit(P^.RequirementsClass.Create(ComponentClass));
end;
Result := Nil;
end;

7
packager/pkgmanager.pas
View File

@ -4526,11 +4526,11 @@ begin
CurUnitName:=CurRegComp.ComponentClass.UnitName;
CurCompReq:=GetComponentRequirements(CurRegComp.ComponentClass);
end;
//DebugLn(['TPkgManager.GetUnitsAndDependenciesForComponents CurUnitName=',CurUnitName]);
//DebugLn(['TPkgManager.GetUnitsAndDepsForComps: CurUnitName=',CurUnitName]);
if CurUnitName='' then
CurUnitName:=CurRegComp.GetUnitName;
Assert(CurUnitNames.IndexOf(CurUnitName)<0,
'TPkgManager.GetUnitsAndDependenciesForComponents: Name already in CurUnitNames.');
'TPkgManager.GetUnitsAndDepsForComps: Name already in CurUnitNames.');
CurUnitNames.Add(CurUnitName);
if CurCompReq<>nil then
CurCompReq.RequiredUnits(CurUnitNames);
@ -4539,7 +4539,8 @@ begin
CurUnitName:=CurUnitNames[CurUnitIdx];
UnitList.Add(CurUnitName);
PkgFile:=PackageGraph.FindUnitInAllPackages(CurUnitName,true);
//DebugLn(['TPkgManager.GetUnitsAndDependenciesForComponents PkgFile=',PkgFile<>nil]);
//DebugLn([' GetUnitsAndDepsForComps: CurUnitName=',CurUnitName,
// ', PkgFile=', PkgFile.Unit_Name]);
if PkgFile=nil then
PkgFile:=TPkgComponent(CurRegComp).PkgFile;
if PkgFile<>nil then