Patch #1768757: Merge fsnode-gsoc into trunk (MAJOR change, will break compilation on some ports)

svn-id: r28944

3 files changed, 11 insertions, 11 deletions

diff --git a/engines/agi/detection.cpp b/engines/agi/detection.cpp
index 601b660ad3..afd61ae765 100644
--- a/engines/agi/detection.cpp
+++ b/engines/agi/detection.cpp
@@ -1930,7 +1930,7 @@ Common::EncapsulatedADGameDesc fallbackDetector(const FSList *fslist) {
 			path = ".";
 
 		FilesystemNode fsCurrentDir(path);
-		fsCurrentDir.listDir(fslistCurrentDir, FilesystemNode::kListFilesOnly);
+		fsCurrentDir.getChildren(fslistCurrentDir, FilesystemNode::kListFilesOnly);
 		fslist = &fslistCurrentDir;
 	}
 
@@ -1947,13 +1947,13 @@ Common::EncapsulatedADGameDesc fallbackDetector(const FSList *fslist) {
 	// First grab all filenames and at the same time count the number of *.wag files
 	for (FSList::const_iterator file = fslist->begin(); file != fslist->end(); ++file) {
 		if (file->isDirectory()) continue;
-		Common::String filename = file->name();
+		Common::String filename = file->getName();
 		filename.toLowercase();
 		allFiles[filename] = true; // Save the filename in a hash table
 		
 		if (filename.hasSuffix(".wag")) {
 			// Save latest found *.wag file's path (Can be used to open the file, the name can't)
-			wagFilePath = file->path();
+			wagFilePath = file->getPath();
 			wagFileCount++; // Count found *.wag files
 		}
 	}
diff --git a/engines/agi/loader_v3.cpp b/engines/agi/loader_v3.cpp
index 65b9e6592b..362d778c66 100644
--- a/engines/agi/loader_v3.cpp
+++ b/engines/agi/loader_v3.cpp
@@ -52,14 +52,14 @@ int AgiLoader_v3::detectGame() {
 	FSList fslist;
 	FilesystemNode dir(ConfMan.get("path"));
 
-	if (!dir.listDir(fslist, FilesystemNode::kListFilesOnly)) {
-		warning("AgiEngine: invalid game path '%s'", dir.path().c_str());
+	if (!dir.getChildren(fslist, FilesystemNode::kListFilesOnly)) {
+		warning("AgiEngine: invalid game path '%s'", dir.getPath().c_str());
 		return errInvalidAGIFile;
 	}
 
 	for (FSList::const_iterator file = fslist.begin();
 	    file != fslist.end() && !found; ++file) {
-		Common::String f = file->name();
+		Common::String f = file->getName();
 		f.toLowercase();
 
 		if (f.hasSuffix("vol.0")) {
diff --git a/engines/agi/sound.cpp b/engines/agi/sound.cpp
index 99d29bcc6b..b76ab309a5 100644
--- a/engines/agi/sound.cpp
+++ b/engines/agi/sound.cpp
@@ -989,7 +989,7 @@ struct fsnodeNameEqualsIgnoreCase : public Common::UnaryFunction<const Filesyste
 	fsnodeNameEqualsIgnoreCase(const Common::String str) { _str.push_back(str); }
 	bool operator()(const FilesystemNode &param) const {
 		for (Common::StringList::const_iterator iter = _str.begin(); iter != _str.end(); iter++)
-			if (param.name().equalsIgnoreCase(*iter))
+			if (param.getName().equalsIgnoreCase(*iter))
 				return true;
 		return false;
 	}
@@ -1014,8 +1014,8 @@ bool SoundMgr::loadInstruments() {
 	// List files in the game path
 	FSList fslist;
 	FilesystemNode dir(ConfMan.get("path"));
-	if (!dir.listDir(fslist, FilesystemNode::kListFilesOnly)) {
-		warning("Invalid game path (\"%s\"), not loading Apple IIGS instruments", dir.path().c_str());
+	if (!dir.getChildren(fslist, FilesystemNode::kListFilesOnly)) {
+		warning("Invalid game path (\"%s\"), not loading Apple IIGS instruments", dir.getPath().c_str());
 		return false;
 	}
 
@@ -1050,12 +1050,12 @@ bool SoundMgr::loadInstruments() {
 	// Finally fix the instruments' lengths using the wave file data
 	// (A zero in the wave file data can end the sample prematurely)
 	// and convert the wave file from 8-bit unsigned to 16-bit signed format.
-	Common::MemoryReadStream *uint8Wave = loadWaveFile(waveFsnode->path(), *exeInfo);
+	Common::MemoryReadStream *uint8Wave = loadWaveFile(waveFsnode->getPath(), *exeInfo);
 	// Seek the wave to its
 	if (uint8Wave != NULL)
 		uint8Wave->seek(0);
 
-	bool result = uint8Wave != NULL && loadInstrumentHeaders(exeFsnode->path(), *exeInfo) &&
+	bool result = uint8Wave != NULL && loadInstrumentHeaders(exeFsnode->getPath(), *exeInfo) &&
 		finalizeInstruments(*uint8Wave) && convertWave(*uint8Wave, g_wave, uint8Wave->size());
 
 	delete uint8Wave; // Free the 8-bit unsigned wave file buffer