Merge pull request #129 from groleo/master

util/patternMatch: don't extract a QCString(QFileInfo) each time we QReg...
doxygen · Feb 28, 2014 · 8eeaae0 · 8eeaae0
2 parents de1a8b9 + 8991d11
commit 8eeaae0
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/util.cpp b/src/util.cpp
@@ -7443,6 +7443,11 @@ bool patternMatch(const QFileInfo &fi,const QStrList *patList)
   { 
     QStrListIterator it(*patList);
     QCString pattern;
+
+    QCString fn = fi.fileName().data();
+    QCString fp = fi.filePath().data();
+    QCString afp= fi.absFilePath().data();
+
     for (it.toFirst();(pattern=it.current());++it)
     {
       if (!pattern.isEmpty())
@@ -7455,9 +7460,9 @@ bool patternMatch(const QFileInfo &fi,const QStrList *patList)
 #else                // unix
         QRegExp re(pattern,TRUE,TRUE);  // case sensitive match
 #endif
-        found = found || re.match(fi.fileName().data())!=-1 || 
-                         re.match(fi.filePath().data())!=-1 ||
-                         re.match(fi.absFilePath().data())!=-1;
+        found = re.match(fn)!=-1 ||
+                re.match(fp)!=-1 ||
+                re.match(afp)!=-1;
         if (found) break;
         //printf("Matching `%s' against pattern `%s' found=%d\n",
         //    fi->fileName().data(),pattern.data(),found);