Browse Source

Removing unused fields of TFileFilter structure

Source commit: a115559224827ff2881e68fee09c3032c8f8866c
Martin Prikryl 8 years ago
parent
commit
d79b4f8d63

+ 0 - 7
source/components/UnixDirView.cpp

@@ -251,15 +251,8 @@ bool __fastcall TUnixDirView::ItemMatchesFilter(TListItem * Item,
 #ifndef DESIGN_ONLY
   ASSERT_VALID_ITEM;
   TRemoteFile *File = ITEMFILE;
-  int Attr = File->Attr;
 
   return
-    ((Attr & Filter.IncludeAttr) == Filter.IncludeAttr) &&
-    ((Attr & Filter.ExcludeAttr) == 0) &&
-    ((Filter.FileSizeFrom == 0) || (File->Size >= Filter.FileSizeFrom)) &&
-    ((Filter.FileSizeTo == 0) || (File->Size <= Filter.FileSizeTo)) &&
-    ((!(int)Filter.ModificationFrom) || (File->Modification >= Filter.ModificationFrom)) &&
-    ((!(int)Filter.ModificationTo) || (File->Modification <= Filter.ModificationTo)) &&
     ((Filter.Masks.IsEmpty()) ||
      FileNameMatchesMasks(File->FileName, File->IsDirectory, File->Size, File->Modification, Filter.Masks, false) ||
      (File->IsDirectory && Filter.Directories &&

+ 0 - 12
source/packages/filemng/CustomDirView.pas

@@ -77,13 +77,7 @@ type
   TSelAttr = (selDontCare, selYes, selNo);
   TFileFilter = record
     Masks: string;
-    IncludeAttr: Word; { see TSearchRec.Attr }
-    ExcludeAttr: Word;
     Directories: Boolean;
-    FileSizeFrom: Int64;
-    FileSizeTo: Int64;
-    ModificationFrom: TDateTime;
-    ModificationTo: TDateTime;
   end;
   TDirViewNotifyEvent = procedure(Sender: TCustomDirView) of object;
   TDVGetFilterEvent = procedure(Sender: TCustomDirView; Select: Boolean;
@@ -625,13 +619,7 @@ begin
   with Filter do
   begin
     SetLength(Masks, 0);
-    IncludeAttr := 0;
-    ExcludeAttr := 0;
     Directories := False;
-    FileSizeFrom := 0;
-    FileSizeTo := 0;
-    ModificationFrom := 0;
-    ModificationTo := 0;
   end;
 end;
 

+ 0 - 11
source/packages/filemng/DirView.pas

@@ -1097,22 +1097,11 @@ end;
 function TDirView.ItemMatchesFilter(Item: TListItem; const Filter: TFileFilter): Boolean;
 var
   FileRec: PFileRec;
-  Modification: TDateTime;
 begin
   Assert(Assigned(Item) and Assigned(Item.Data));
   FileRec := PFileRec(Item.Data);
-  if (Filter.ModificationFrom > 0) or (Filter.ModificationTo > 0) then
-    Modification := FileTimeToDateTime(FileRec^.FileTime)
-  else
-    Modification := 0;
 
   Result :=
-    ((FileRec^.Attr and Filter.IncludeAttr) = Filter.IncludeAttr) and
-    ((FileRec^.Attr and Filter.ExcludeAttr) = 0) and
-    ((Filter.FileSizeFrom = 0) or (FileRec^.Size >= Filter.FileSizeFrom)) and
-    ((Filter.FileSizeTo = 0) or (FileRec^.Size <= Filter.FileSizeTo)) and
-    ((Filter.ModificationFrom = 0) or (Modification >= Filter.ModificationFrom)) and
-    ((Filter.ModificationTo = 0) or (Modification <= Filter.ModificationTo)) and
     ((Filter.Masks = '') or
      FileNameMatchesMasks(FileRec^.FileName, FileRec^.IsDirectory,
        FileRec^.Size, FileTimeToDateTime(FileRec^.FileTime), Filter.Masks, False) or