[Scummvm-cvs-logs] SF.net SVN: scummvm: [22265] scummvm/trunk/common
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Mon May 1 14:07:08 CEST 2006
Revision: 22265
Author: fingolfin
Date: 2006-05-01 14:06:34 -0700 (Mon, 01 May 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=22265&view=rev
Log Message:
-----------
Add a variant of File::addDefaultDirectory(Recursive) which takes a FilesystemNode instead of a string object
Modified Paths:
--------------
scummvm/trunk/common/file.cpp
scummvm/trunk/common/file.h
Modified: scummvm/trunk/common/file.cpp
===================================================================
--- scummvm/trunk/common/file.cpp 2006-05-01 20:10:29 UTC (rev 22264)
+++ scummvm/trunk/common/file.cpp 2006-05-01 21:06:34 UTC (rev 22265)
@@ -107,13 +107,29 @@
}
void File::addDefaultDirectory(const String &directory) {
+ FilesystemNode dir(directory);
+ addDefaultDirectoryRecursive(dir, 1);
+}
+
+void File::addDefaultDirectoryRecursive(const String &directory, int level) {
+ FilesystemNode dir(directory);
+ addDefaultDirectoryRecursive(dir, level);
+}
+
+void File::addDefaultDirectory(const FilesystemNode &directory) {
addDefaultDirectoryRecursive(directory, 1);
}
-void File::addDefaultDirectoryRecursive(const String &directory, int level) {
+void File::addDefaultDirectoryRecursive(const FilesystemNode &dir, int level) {
if (level <= 0)
return;
+ // Abort if this isn't a directory!
+ if (!dir.isDirectory())
+ return;
+
+ const String &directory(dir.path());
+
if (!_defaultDirectories)
_defaultDirectories = new StringIntMap;
@@ -122,12 +138,6 @@
if (_defaultDirectories->contains(directory) && (*_defaultDirectories)[directory] >= level)
return;
- FilesystemNode dir(directory.c_str());
-
- // ... and abort if this isn't a directory!
- if (!dir.isDirectory())
- return;
-
(*_defaultDirectories)[directory] = level;
if (!_filesMap)
Modified: scummvm/trunk/common/file.h
===================================================================
--- scummvm/trunk/common/file.h 2006-05-01 20:10:29 UTC (rev 22264)
+++ scummvm/trunk/common/file.h 2006-05-01 21:06:34 UTC (rev 22265)
@@ -54,7 +54,12 @@
static void addDefaultDirectory(const String &directory);
static void addDefaultDirectoryRecursive(const String &directory, int level = 4);
+
+ static void addDefaultDirectory(const FilesystemNode &directory);
+ static void addDefaultDirectoryRecursive(const FilesystemNode &directory, int level = 4);
+
static void resetDefaultDirectories();
+
File();
virtual ~File();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list