From: Enar Väikene Date: Fri, 2 Dec 2011 07:48:42 +0000 (+0200) Subject: The exclude names pattern is now also applied to directory names in recursive searches. X-Git-Url: https://vaikene.ee/gitweb/gitweb.cgi?a=commitdiff_plain;h=ce69c05c43f0c509e7795cfb3a2c93fc70ab51b5;p=evaf The exclude names pattern is now also applied to directory names in recursive searches. --- diff --git a/src/apps/FileFinder/Engine/engine.cpp b/src/apps/FileFinder/Engine/engine.cpp index 8ed0f7c..5c79cfd 100644 --- a/src/apps/FileFinder/Engine/engine.cpp +++ b/src/apps/FileFinder/Engine/engine.cpp @@ -410,6 +410,9 @@ void Internal::Worker::recursiveSearch(QString const & path) return; } + if (mRxExcludeNames.isValid() && !mRxExcludeNames.isEmpty() && mRxExcludeNames.exactMatch(directory)) + continue; + recursiveSearch(l + directory); } } diff --git a/src/apps/FileFinder/Engine/version.h b/src/apps/FileFinder/Engine/version.h index 2a39815..510754b 100644 --- a/src/apps/FileFinder/Engine/version.h +++ b/src/apps/FileFinder/Engine/version.h @@ -25,12 +25,12 @@ /** * Module/library version number in the form major,minor,release,build */ -#define VER_FILE_VERSION 0,1,2,2 +#define VER_FILE_VERSION 0,1,3,3 /** * Module/library version number in the string format (shall end with \0) */ -#define VER_FILE_VERSION_STR "0.1.2.2\0" +#define VER_FILE_VERSION_STR "0.1.3.3\0" /** * Module/library name (shall end with \0)