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

Merged revision(s) 52141 #3d793aeb36 from trunk:

Browse Source 
ide hints: Fixes them with FPC 2.6.4 see bug #29982
........

git-svn-id: branches/fixes_1_6@53090 -
This commit is contained in:
maxim 2016-10-10 21:21:38 +00:00
parent 4766cb2bad
commit aaae993b7d
2 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/turbopower_ipro/ipdefine.inc
View File

@ -47,7 +47,6 @@
{$DEFINE VERSION5}
{$DEFINE Version6OrHigher}
{$DEFINE Version7OrHigher}
{$MODESWITCH NESTEDPROCVARS}
{$ELSE}

46
components/turbopower_ipro/iphtml.pas
View File

@ -2710,7 +2710,7 @@ type
property FlagErrors;
end;
TIdFindNodeCriteria = function(ACurrNode: TIpHtmlNodeCore): Boolean is nested;
TIdFindNodeCriteria = function(ACurrNode: TIpHtmlNodeCore; const AParamStr: string): Boolean;
const
NAnchorChar = #3 ; {character used to represent an Anchor }
@ -2739,7 +2739,7 @@ function dbgs(et: TElementType): string; overload;
function GetNextSiblingNode(ANode: TIpHtmlNode): TIpHtmlNode;
function GetPrevSiblingNode(ANode: TIpHtmlNode): TIpHtmlNode;
function GetParentNodeOfClass(ANode: TIpHtmlNode; AClass: TIpHtmlNodeClass): TIpHtmlNode;
function FindNode(ANode: TIpHtmlNode; ACriteria: TIdFindNodeCriteria): TIpHtmlNodeCore;
function FindNode(ANode: TIpHtmlNode; ACriteria: TIdFindNodeCriteria; const AParamStr: string): TIpHtmlNodeCore;
function FindNodeByElemId(ANode: TIpHtmlNode; const AElemId: string): TIpHtmlNodeCore;
function FindNodeByElemClass(ANode: TIpHtmlNode; const AElemClass: string): TIpHtmlNodeCore;
@ -2935,7 +2935,7 @@ begin
Result := Result.FParentNode;
end;
function FindNode(ANode: TIpHtmlNode; ACriteria: TIdFindNodeCriteria): TIpHtmlNodeCore;
function FindNode(ANode: TIpHtmlNode; ACriteria: TIdFindNodeCriteria; const AParamStr: string): TIpHtmlNodeCore;
var
I: Integer;
VNode: TIpHtmlNodeMulti;
@ -2949,43 +2949,41 @@ begin
for I := 0 to Pred(VNode.ChildCount) do
begin
VPrevNode := VNode.ChildNode[I];
VNextNode := FindNode(VPrevNode, ACriteria);
VNextNode := FindNode(VPrevNode, ACriteria, AParamStr);
if not Assigned(VNextNode) then
VNextNode := VPrevNode;
if VNextNode is TIpHtmlNodeCore then
begin
Result := VNextNode as TIpHtmlNodeCore;
if ACriteria(Result) then
if ACriteria(Result, AParamStr) then
Exit;
end;
end;
Result := nil;
end;
function FindNodeByElemId(ANode: TIpHtmlNode; const AElemId: string): TIpHtmlNodeCore;
function Criteria(ACurrNode: TIpHtmlNodeCore): Boolean;
begin
if ACurrNode.Id = AElemId then
Exit(True);
Result := False;
end;
function Criteria_FindNodeByElemId(ACurrNode: TIpHtmlNodeCore; const AParamStr: string): Boolean;
begin
Result := FindNode(ANode, Criteria);
if ACurrNode.Id = AParamStr then
Exit(True);
Result := False;
end;
function FindNodeByElemId(ANode: TIpHtmlNode; const AElemId: string): TIpHtmlNodeCore;
begin
Result := FindNode(ANode, Criteria_FindNodeByElemId, AElemId);
end;
function Criteria_FindNodeByElemClass(ACurrNode: TIpHtmlNodeCore; const AParamStr: string): Boolean;
begin
if ACurrNode.ClassId = AParamStr then
Exit(True);
Result := False;
end;
function FindNodeByElemClass(ANode: TIpHtmlNode; const AElemClass: string): TIpHtmlNodeCore;
function Criteria(ACurrNode: TIpHtmlNodeCore): Boolean;
begin
if ACurrNode.ClassId = AElemClass then
Exit(True);
Result := False;
end;
begin
Result := FindNode(ANode, Criteria);
Result := FindNode(ANode, Criteria_FindNodeByElemClass, AElemClass);
end;
procedure Register;