[Scummvm-cvs-logs] SF.net SVN: scummvm:[34679] scummvm/trunk/common

[fingolfin at users.sourceforge.net]

Revision: 34679
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34679&view=rev
Author:   fingolfin
Date:     2008-09-29 10:30:31 +0000 (Mon, 29 Sep 2008)

Log Message:
-----------
Add priority parameter to the SearchMan API

Modified Paths:
--------------
    scummvm/trunk/common/archive.cpp
    scummvm/trunk/common/archive.h

Modified: scummvm/trunk/common/archive.cpp
===================================================================
--- scummvm/trunk/common/archive.cpp	2008-09-29 10:29:01 UTC (rev 34678)
+++ scummvm/trunk/common/archive.cpp	2008-09-29 10:30:31 UTC (rev 34679)
@@ -333,16 +333,16 @@
 	clear();	// Force a reset
 }
 
-void SearchManager::addArchive(const String &name, ArchivePtr archive) {
-	add(name, archive);
+void SearchManager::addArchive(const String &name, ArchivePtr archive, int priority) {
+	add(name, archive, priority);
 }
 
-void SearchManager::addDirectory(const String &name, const String &directory) {
-	addDirectoryRecursive(name, directory, 1);
+void SearchManager::addDirectory(const String &name, const String &directory, int priority) {
+	addDirectoryRecursive(name, directory, 1, priority);
 }
 
-void SearchManager::addDirectoryRecursive(const String &name, const String &directory, int depth) {
-	add(name, ArchivePtr(new FSDirectory(directory, depth)));
+void SearchManager::addDirectoryRecursive(const String &name, const String &directory, int depth, int priority) {
+	add(name, ArchivePtr(new FSDirectory(directory, depth)), priority);
 }
 
 void SearchManager::clear() {

Modified: scummvm/trunk/common/archive.h
===================================================================
--- scummvm/trunk/common/archive.h	2008-09-29 10:29:01 UTC (rev 34678)
+++ scummvm/trunk/common/archive.h	2008-09-29 10:30:31 UTC (rev 34679)
@@ -211,17 +211,17 @@
 	 * Add an existing Archive. This is meant to support searching in system-specific
 	 * archives, namely the MACOSX/IPHONE bundles.
 	 */
-	void addArchive(const String &name, ArchivePtr archive);
+	void addArchive(const String &name, ArchivePtr archive, int priority = 0);
 
 	/**
 	 * Create and add a FSDirectory by name
 	 */
-	void addDirectory(const String &name, const String &directory);
+	void addDirectory(const String &name, const String &directory, int priority = 0);
 
 	/**
 	 * Create and add a FSDirectory and its subdirectories by name
 	 */
-	void addDirectoryRecursive(const String &name, const String &directory, int depth = 4);
+	void addDirectoryRecursive(const String &name, const String &directory, int depth = 4, int priority = 0);
 
 	/**
 	 * TODO


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.