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

[fingolfin at users.sourceforge.net]

Revision: 35139
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35139&view=rev
Author:   fingolfin
Date:     2008-11-21 12:17:35 +0000 (Fri, 21 Nov 2008)

Log Message:
-----------
Added ArchiveMember::getDisplayName() method; changed ArchiveMember::getName() to always return a name compatible with Archive::openFile()

Modified Paths:
--------------
    scummvm/trunk/common/archive.cpp
    scummvm/trunk/common/archive.h
    scummvm/trunk/engines/kyra/resource_intern.cpp
    scummvm/trunk/gui/ThemeEngine.cpp

Modified: scummvm/trunk/common/archive.cpp
===================================================================
--- scummvm/trunk/common/archive.cpp	2008-11-21 08:22:33 UTC (rev 35138)
+++ scummvm/trunk/common/archive.cpp	2008-11-21 12:17:35 UTC (rev 35139)
@@ -76,14 +76,11 @@
 	FSDirectoryMember(FSNode &node) : _node(node) {
 	}
 
-	/*
-		NOTE/FIXME: since I assume that the only use case for getName()
-		is for error messages, I am returning the full path of the node
-		here. This seems better than we did before, when matchPattern
-		and getAllNames used to work with StringList, and we used to
-		put the relative path of the file to the list instead.
-	*/
 	String getName() const {
+		return _node.getName();
+	}
+
+	String getDisplayName() const {
 		return _node.getPath();
 	}
 
@@ -92,8 +89,6 @@
 	}
 };
 
-typedef SharedPtr<FSDirectoryMember> FSDirectoryMemberPtr;
-
 FSDirectory::FSDirectory(const FSNode &node, int depth)
   : _node(node), _cached(false), _depth(depth) {
 }
@@ -259,7 +254,7 @@
 	NodeCache::iterator it = _fileCache.begin();
 	for ( ; it != _fileCache.end(); it++) {
 		if ((*it)._key.matchString(lowercasePattern)) {
-			list.push_back(FSDirectoryMemberPtr(new FSDirectoryMember((*it)._value)));
+			list.push_back(ArchiveMemberPtr(new FSDirectoryMember((*it)._value)));
 			matches++;
 		}
 	}

Modified: scummvm/trunk/common/archive.h
===================================================================
--- scummvm/trunk/common/archive.h	2008-11-21 08:22:33 UTC (rev 35138)
+++ scummvm/trunk/common/archive.h	2008-11-21 12:17:35 UTC (rev 35139)
@@ -47,8 +47,9 @@
 class ArchiveMember {
 public:
 	virtual ~ArchiveMember() { }
+	virtual SeekableReadStream *open() = 0;
 	virtual String getName() const = 0;
-	virtual SeekableReadStream *open() = 0;
+	virtual String getDisplayName() const { return getName(); }
 };
 
 typedef SharedPtr<ArchiveMember> ArchiveMemberPtr;

Modified: scummvm/trunk/engines/kyra/resource_intern.cpp
===================================================================
--- scummvm/trunk/engines/kyra/resource_intern.cpp	2008-11-21 08:22:33 UTC (rev 35138)
+++ scummvm/trunk/engines/kyra/resource_intern.cpp	2008-11-21 12:17:35 UTC (rev 35139)
@@ -229,7 +229,7 @@
 	while (!stream.eos()) {
 		// The start offset of a file should never be in the filelist
 		if (startoffset < stream.pos() || startoffset > filesize) {
-			warning("PAK file '%s' is corrupted", memberFile->getName().c_str());
+			warning("PAK file '%s' is corrupted", memberFile->getDisplayName().c_str());
 			return false;
 		}
 
@@ -240,14 +240,14 @@
 			file += c;
 
 		if (stream.eos()) {
-			warning("PAK file '%s' is corrupted", memberFile->getName().c_str());
+			warning("PAK file '%s' is corrupted", memberFile->getDisplayName().c_str());
 			return false;
 		}
 
 		// Quit now if we encounter an empty string
 		if (file.empty()) {
 			if (firstFile) {
-				warning("PAK file '%s' is corrupted", memberFile->getName().c_str());
+				warning("PAK file '%s' is corrupted", memberFile->getDisplayName().c_str());
 				return false;
 			} else {
 				break;

Modified: scummvm/trunk/gui/ThemeEngine.cpp
===================================================================
--- scummvm/trunk/gui/ThemeEngine.cpp	2008-11-21 08:22:33 UTC (rev 35138)
+++ scummvm/trunk/gui/ThemeEngine.cpp	2008-11-21 12:17:35 UTC (rev 35139)
@@ -550,14 +550,14 @@
 
 		if (_parser->loadStream((*i)->open()) == false) {
 			delete archive;
-			warning("Failed to load STX file '%s'", (*i)->getName().c_str());
+			warning("Failed to load STX file '%s'", (*i)->getDisplayName().c_str());
 			_parser->close();
 			return false;
 		}
 
 		if (_parser->parse() == false) {
 			delete archive;
-			warning("Failed to parse STX file '%s'", (*i)->getName().c_str());
+			warning("Failed to parse STX file '%s'", (*i)->getDisplayName().c_str());
 			_parser->close();
 			return false;
 		}


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