From e25982fd40e5553748ea63e9245235f1dcaf307b Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Mon, 10 Dec 2007 12:14:14 +0000
Subject: [PATCH] LCL: added TFileSearcher.Search AMaskSeparator parameter

git-svn-id: trunk@13261 -
---
 ide/searchfrm.pas        | 5 +++--
 ide/uniteditor.pp        | 1 -
 lcl/fileutil.pas         | 2 +-
 lcl/include/fileutil.inc | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ide/searchfrm.pas b/ide/searchfrm.pas
index 323d164534..9c02a65f1d 100644
--- a/ide/searchfrm.pas
+++ b/ide/searchfrm.pas
@@ -764,9 +764,10 @@ var
   F: String;
 begin
   F := FileName;
+  //DebugLn(['TLazFileSearcher.DoFileFound ',Filename]);
   if FileIsReadable(F) and FileIsText(F) then
   begin
-    //DebugLn('TLazFileSearcher.DoFileFound ' + F);
+    //DebugLn('TLazFileSearcher.DoFileFound text file: ' + F);
     FParent.UpdateProgress(F);
     FParent.SearchFile(F);
   end;
@@ -792,7 +793,7 @@ begin
   begin
     Searcher := TLazFileSearcher.Create(Self);
     try
-      Searcher.Search(TheFileName, FMask, FRecursive);
+      Searcher.Search(TheFileName, FMask, FRecursive,';');
     finally
       Searcher.Free;
     end;
diff --git a/ide/uniteditor.pp b/ide/uniteditor.pp
index 99985332fc..a899333148 100644
--- a/ide/uniteditor.pp
+++ b/ide/uniteditor.pp
@@ -4686,7 +4686,6 @@ begin
       end;
     end;
   end;
-  IDEDialogLayoutList.SaveLayout(FindInFilesDialog);
 end;
 
 procedure TSourceNotebook.ShowSearchResultsView;
diff --git a/lcl/fileutil.pas b/lcl/fileutil.pas
index 1c4fe45b34..5434fa5243 100644
--- a/lcl/fileutil.pas
+++ b/lcl/fileutil.pas
@@ -150,7 +150,7 @@ type
     constructor Create;
 
     procedure Search(const ASearchPath: String; ASearchMask: String = '';
-      ASearchSubDirs: Boolean = True);
+      ASearchSubDirs: Boolean = True; AMaskSeparator: char = PathSeparator);
   public
     property OnDirectoryFound: TDirectoryFoundEvent read FOnDirectoryFound write FOnDirectoryFound;
     property OnFileFound: TFileFoundEvent read FOnFileFound write FOnFileFound;
diff --git a/lcl/include/fileutil.inc b/lcl/include/fileutil.inc
index 2e5360f81a..5c69111d27 100644
--- a/lcl/include/fileutil.inc
+++ b/lcl/include/fileutil.inc
@@ -1434,8 +1434,8 @@ begin
   FSearching := False;
 end;
 
-procedure TFileSearcher.Search(const ASearchPath: String; ASearchMask: String = '';
-  ASearchSubDirs: Boolean = True);
+procedure TFileSearcher.Search(const ASearchPath: String; ASearchMask: String;
+  ASearchSubDirs: Boolean; AMaskSeparator: char);
 var
   MaskList: TMaskList;
 
@@ -1504,7 +1504,7 @@ var
 begin
   if FSearching then RaiseSearchingError;
 
-  MaskList := TMaskList.Create(ASearchMask);
+  MaskList := TMaskList.Create(ASearchMask,AMaskSeparator);
   // empty mask = all files mask
   if MaskList.Count = 0 then FreeAndNil(MaskList);