From 51b74b6f56b7177c6ba174f3d649fe600ee26890 Mon Sep 17 00:00:00 2001
From: juha <juha@lazarus-ide.org>
Date: Thu, 31 Oct 2013 00:16:45 +0000
Subject: [PATCH] TreeFilterEdit: change visibility of FreeNodeData and remove
 a hack-accessor class.

git-svn-id: trunk@43345 -
---
 components/lazcontrols/treefilteredit.pas | 8 +++-----
 packager/packageeditor.pas                | 9 +++------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/components/lazcontrols/treefilteredit.pas b/components/lazcontrols/treefilteredit.pas
index c3baa75b9a..7cbbdecfb7 100644
--- a/components/lazcontrols/treefilteredit.pas
+++ b/components/lazcontrols/treefilteredit.pas
@@ -45,14 +45,12 @@ type
     procedure ApplyFilter;
     procedure TVDeleteUnneededNodes(p: integer);
     procedure TVClearUnneededAndCreateHierachy(Filename: string);
-  protected
-    procedure FreeNodeData(ANode : TTreeNode);
-  private
     procedure RemoveChildrenData(ARootNode : TTreeNode);
   public
     constructor Create(AOwner: TTreeFilterEdit; ARootNode: TTreeNode);
     destructor Destroy; override;
     procedure AddNodeData(ANodeText: string; AData: TObject; AFullFilename: string = '');
+    procedure FreeNodeData(ANode: TTreeNode);
     function GetData(AIndex: integer): TObject;
     procedure Clear;
   end;
@@ -106,8 +104,8 @@ type
 
   TTFENodeData = class
   public
-    Node,
-    Branch : TObject;
+    Node: TTreeNode;
+    Branch: TTreeFilterBranch;
   end;
 
   { TFileNameItem }
diff --git a/packager/packageeditor.pas b/packager/packageeditor.pas
index 0ce0f6ffc7..9b2d24a674 100644
--- a/packager/packageeditor.pas
+++ b/packager/packageeditor.pas
@@ -1083,9 +1083,6 @@ begin
   PackageEditors.ViewPkgToDos(LazPackage);
 end;
 
-Type
-  TTreeFilterBranchAccess = class(TTreeFilterBranch);
-
 procedure TPackageEditorForm.FreeNodeData(Typ: TPENodeType);
 var
   NodeData: TPENodeData;
@@ -1096,7 +1093,7 @@ begin
     n:=NodeData;
     NodeData:=NodeData.Next;
     if Assigned(n.Branch) Then
-      TTreeFilterBranchAccess(n.Branch).FreeNodeData(TTreeNode(n.Node));
+      n.Branch.FreeNodeData(n.Node);
     n.Free;
   end;
   FFirstNodeData[Typ]:=nil;
@@ -2052,9 +2049,9 @@ begin
   Result:=nil;
   if (TVNode=nil) then exit;
   o:=TObject(TVNode.Data);
-  if Assigned(o) and (o is TFileNameItem) then
+  if o is TFileNameItem then
     o:=TObject(TFileNameItem(o).Data);
-  if Assigned(o) and (o is TPENodeData) then
+  if o is TPENodeData then
     Result:=TPENodeData(o);
 end;