Browse Source

Code style and indentation

Source commit: e4b625c565514accfb471b745d53b8b73ef37313
Martin Prikryl 6 years ago
parent
commit
004fb12597
1 changed files with 53 additions and 59 deletions
  1. 53 59
      source/packages/filemng/DriveView.pas

+ 53 - 59
source/packages/filemng/DriveView.pas

@@ -1758,11 +1758,7 @@ begin
   Application.ProcessMessages;
 end; {ReadSubDirs}
 
-function TDriveView.CallBackValidateDir(Var Node: TTreeNode; Data: Pointer): Boolean;
-
-type
-  PSearchRec = ^TSearchRec;
-
+function TDriveView.CallBackValidateDir(var Node: TTreeNode; Data: Pointer): Boolean;
 var
   WorkNode: TTreeNode;
   DelNode: TTreeNode;
@@ -1776,7 +1772,6 @@ var
   ParentDir: string;
   NodeData: TNodeData;
   ScanDirInfo: PScanDirInfo;
-
 begin {CallBackValidateDir}
   Result := True;
   if (not Assigned(Node)) or (not Assigned(Node.Data)) then
@@ -1808,68 +1803,68 @@ begin {CallBackValidateDir}
   begin
     if DoScanDir(Node) then
     begin
-    ParentDir := IncludeTrailingBackslash(NodePath(Node));
-    {Build list of existing subnodes:}
-    SubDirList := TStringList.Create;
-    while Assigned(WorkNode) do
-    begin
-      SubDirList.Add(TNodeData(WorkNode.Data).DirName);
-      WorkNode := Node.GetNextChild(WorkNode);
-    end;
-    {Sorting not required, because the subnodes are already sorted!}
+      ParentDir := IncludeTrailingBackslash(NodePath(Node));
+      {Build list of existing subnodes:}
+      SubDirList := TStringList.Create;
+      while Assigned(WorkNode) do
+      begin
+        SubDirList.Add(TNodeData(WorkNode.Data).DirName);
+        WorkNode := Node.GetNextChild(WorkNode);
+      end;
+      {Sorting not required, because the subnodes are already sorted!}
 
-    SRecList := TStringList.Create;
-    DosError := FindFirst(ApiPath(ParentDir + '*.*'), DirAttrMask, SRec);
-    while DosError = 0 do
-    begin
-      if (Srec.Name <> '.' ) and
-         (Srec.Name <> '..') and
-         (Srec.Attr and faDirectory <> 0) then
+      SRecList := TStringList.Create;
+      DosError := FindFirst(ApiPath(ParentDir + '*.*'), DirAttrMask, SRec);
+      while DosError = 0 do
       begin
-        SrecList.Add(Srec.Name);
-        if not SubDirList.Find(Srec.Name, Index) then
-        {Subnode does not exists: add it:}
+        if (Srec.Name <> '.' ) and
+           (Srec.Name <> '..') and
+           (Srec.Attr and faDirectory <> 0) then
         begin
-          NewNode := AddChildNode(Node, SRec);
-          NewNode.HasChildren := CheckForSubDirs(ParentDir + Srec.Name);
-          TNodeData(NewNode.Data).Scanned := Not NewNode.HasChildren;
-          NewDirFound  := True;
+          SrecList.Add(Srec.Name);
+          if not SubDirList.Find(Srec.Name, Index) then
+          {Subnode does not exists: add it:}
+          begin
+            NewNode := AddChildNode(Node, SRec);
+            NewNode.HasChildren := CheckForSubDirs(ParentDir + Srec.Name);
+            TNodeData(NewNode.Data).Scanned := Not NewNode.HasChildren;
+            NewDirFound  := True;
+          end;
         end;
+        DosError := FindNext(Srec);
       end;
-      DosError := FindNext(Srec);
-    end;
-    FindClose(Srec);
-    Sreclist.Sort;
+      FindClose(Srec);
+      Sreclist.Sort;
 
-    {Remove not existing subnodes:}
-    WorkNode := Node.GetFirstChild;
-    while Assigned(WorkNode) do
-    begin
-      if not Assigned(WorkNode.Data) or
-         not SrecList.Find(TNodeData(WorkNode.Data).DirName, Index) then
+      {Remove not existing subnodes:}
+      WorkNode := Node.GetFirstChild;
+      while Assigned(WorkNode) do
       begin
-        DelNode := WorkNode;
-        WorkNode := Node.GetNextChild(WorkNode);
-        DelNode.Delete;
-      end
-        else
-      begin
-        if (SrecList[Index] <> TNodeData(WorkNode.Data).DirName) then
+        if not Assigned(WorkNode.Data) or
+           not SrecList.Find(TNodeData(WorkNode.Data).DirName, Index) then
+        begin
+          DelNode := WorkNode;
+          WorkNode := Node.GetNextChild(WorkNode);
+          DelNode.Delete;
+        end
+          else
         begin
-          {Case of directory letters has changed:}
-          TNodeData(WorkNode.Data).DirName := SrecList[Index];
-          TNodeData(WorkNode.Data).ShortName := ExtractShortPathName(NodePathName(WorkNode));
-          WorkNode.Text := SrecList[Index];
+          if (SrecList[Index] <> TNodeData(WorkNode.Data).DirName) then
+          begin
+            {Case of directory letters has changed:}
+            TNodeData(WorkNode.Data).DirName := SrecList[Index];
+            TNodeData(WorkNode.Data).ShortName := ExtractShortPathName(NodePathName(WorkNode));
+            WorkNode.Text := SrecList[Index];
+          end;
+          SrecList.Delete(Index);
+          WorkNode := Node.GetNextChild(WorkNode);
         end;
-        SrecList.Delete(Index);
-        WorkNode := Node.GetNextChild(WorkNode);
       end;
-    end;
-    SrecList.Free;
-    SubDirList.Free;
-    {Sort subnodes:}
-    if NewDirFound then
-      SortChildren(Node, False);
+      SrecList.Free;
+      SubDirList.Free;
+      {Sort subnodes:}
+      if NewDirFound then
+        SortChildren(Node, False);
     end;
   end
     else
@@ -2005,7 +2000,6 @@ begin
       FDirView.StartWatchThread;
       FDirView.Reload2;
     end;
-
   end;
 end; {CreateDirectory}