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

[fingolfin at users.sourceforge.net]

Revision: 34334
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34334&view=rev
Author:   fingolfin
Date:     2008-09-04 20:03:08 +0000 (Thu, 04 Sep 2008)

Log Message:
-----------
Changed FSDirectory::getSubDirectory to return a FSDirectory pointer instead of a SharedPtr

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-04 19:20:51 UTC (rev 34333)
+++ scummvm/trunk/common/archive.cpp	2008-09-04 20:03:08 UTC (rev 34334)
@@ -93,14 +93,13 @@
 	return stream;
 }
 
-SharedPtr<FSDirectory> FSDirectory::getSubDirectory(const String &name) {
+FSDirectory *FSDirectory::getSubDirectory(const String &name) {
 	if (name.empty() || !_node.isDirectory()) {
-		// return a null SharedPtr
-		return SharedPtr<FSDirectory>();
+		return 0;
 	}
 
 	FilesystemNode node = lookupCache(_subDirCache, name);
-	return SharedPtr<FSDirectory>(new FSDirectory(node));
+	return new FSDirectory(node);
 }
 
 void FSDirectory::cacheDirectoryRecursive(FilesystemNode node, int depth, const String& prefix) {

Modified: scummvm/trunk/common/archive.h
===================================================================
--- scummvm/trunk/common/archive.h	2008-09-04 19:20:51 UTC (rev 34333)
+++ scummvm/trunk/common/archive.h	2008-09-04 20:03:08 UTC (rev 34334)
@@ -136,7 +136,7 @@
 	 * Create a new FSDirectory pointing to a sub directory of the instance.
 	 * @return A new FSDirectory instance conveniently wrapped in a SharedPtr.
 	 */
-	SharedPtr<FSDirectory> getSubDirectory(const String &name);
+	FSDirectory *getSubDirectory(const String &name);
 
 	virtual bool hasFile(const String &name);
 	virtual int matchPattern(StringList &list, const String &pattern);


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