Ticket #8729: 1_rename_filename.patch

common/fs.h

@@ -225 +225 @@
          * 
          * @param results List to put the matches in.
          * @param fslist List of directories to search within.
-         * @param filename Name of the file to look for.
+         * @param pattern Pattern of the files to look for.
          * @param hidden Whether to search hidden files or not.
          * @param exhaustive Whether to continue searching after one match has been found.
          * 
          * @return true if matches could be found, false otherwise.
          */
-        virtual bool lookupFile(FSList &results, FSList &fslist, Common::String &filename, bool hidden, bool exhaustive) const;
+        virtual bool lookupFile(FSList &results, FSList &fslist, Common::String &pattern, bool hidden, bool exhaustive) const;
         
         /**
          * Searches recursively for a filename inside the given directory.
@@ -240 +240 @@
          * are scanned before going into subdirectories.
          * 
          * @param results List to put the matches in.
-         * @param FilesystemNode Directory to search within.
-         * @param filename Name of the file to look for.
+         * @param dir Directory to search within.
+         * @param pattern Pattern of the files to look for.
          * @param hidden Whether to search hidden files or not.
          * @param exhaustive Whether to continue searching after one match has been found.
          * 
          * @return true if matches could be found, false otherwise.
          */
-        virtual bool lookupFile(FSList &results, FilesystemNode &dir, Common::String &filename, bool hidden, bool exhaustive) const;
+        virtual bool lookupFile(FSList &results, FilesystemNode &dir, Common::String &pattern, bool hidden, bool exhaustive) const;
 
 protected:
         /**
@@ -263 +263 @@
          * are scanned before going into subdirectories.
          * 
          * @param results List to put the matches in.
-         * @param FilesystemNode Directory to search within.
-         * @param filename Name of the file to look for.
+         * @param dir Directory to search within.
+         * @param pattern Pattern of the files to look for.
          * @param hidden Whether to search hidden files or not.
          * @param exhaustive Whether to continue searching after one match has been found.
          * 
          * @return The number of matches found.
          */
-        int lookupFileRec(FSList &results, FilesystemNode &dir, Common::String &filename, bool hidden, bool exhaustive) const;
+        int lookupFileRec(FSList &results, FilesystemNode &dir, Common::String &pattern, bool hidden, bool exhaustive) const;
 };
 
 //} // End of namespace Common

common/fs.cpp

@@ -171 +171 @@
         return _realNode->isWritable();
 }
 
-bool FilesystemNode::lookupFile(FSList &results, FSList &fslist, Common::String &filename, bool hidden, bool exhaustive) const
-{
+bool FilesystemNode::lookupFile(FSList &results, FSList &fslist, Common::String &pattern, bool hidden, bool exhaustive) const {
         int matches = 0;
 
         for (FSList::iterator entry = fslist.begin(); entry != fslist.end(); ++entry) {
                 if (entry->isDirectory()) {
-                        matches += lookupFileRec(results, *entry, filename, hidden, exhaustive);
+                        matches += lookupFileRec(results, *entry, pattern, hidden, exhaustive);
                 }
         }
 
         return ((matches > 0) ? true : false);
 }
 
-bool FilesystemNode::lookupFile(FSList &results, FilesystemNode &dir, Common::String &filename, bool hidden, bool exhaustive) const
-{
+bool FilesystemNode::lookupFile(FSList &results, FilesystemNode &dir, Common::String &pattern, bool hidden, bool exhaustive) const {
         int matches;
 
         if (!dir.isDirectory())
                 return false;
 
-        matches = lookupFileRec(results, dir, filename, hidden, exhaustive);
+        matches = lookupFileRec(results, dir, pattern, hidden, exhaustive);
 
         return ((matches > 0) ? true : false);
 }
 
-int FilesystemNode::lookupFileRec(FSList &results, FilesystemNode &dir, Common::String &filename, bool hidden, bool exhaustive) const
-{
+int FilesystemNode::lookupFileRec(FSList &results, FilesystemNode &dir, Common::String &pattern, bool hidden, bool exhaustive) const {
         FSList entries;
         FSList children;
         int matches = 0;
@@ -208 +205 @@
                 if (entry->isDirectory()) {
                         children.push_back(*entry);
                 } else {
-                        if (Common::matchString(entry->getName().c_str(), filename.c_str())) {
+                        if (Common::matchString(entry->getName().c_str(), pattern.c_str())) {
                                 results.push_back(*entry);
                                 matches++;
 
@@ -220 +217 @@
 
         //Depth search (entries in lower levels)
         for (FSList::iterator child = children.begin(); child != children.end(); ++child) {
-                matches += lookupFileRec(results, *child, filename, hidden, exhaustive);
+                matches += lookupFileRec(results, *child, pattern, hidden, exhaustive);
         }
 
         return matches;