Renamed FilesystemNode -> FSNode

svn-id: r34716

15 files changed, 77 insertions, 77 deletions

diff --git a/engines/agi/detection.cpp b/engines/agi/detection.cpp
index f05621e875..94cc4caf85 100644
--- a/engines/agi/detection.cpp
+++ b/engines/agi/detection.cpp
@@ -2207,7 +2207,7 @@ const Common::ADGameDescription *AgiMetaEngine::fallbackDetect(const Common::FSL
 	bool matchedUsingWag = false;
 	int wagFileCount = 0;
 	WagFileParser wagFileParser;
-	Common::FilesystemNode wagFileNode;
+	Common::FSNode wagFileNode;
 	Common::String description;
 	Common::FSList fslistCurrentDir; // Only used if fslist == NULL
 
@@ -2222,8 +2222,8 @@ const Common::ADGameDescription *AgiMetaEngine::fallbackDetect(const Common::FSL
 		if (path.empty())
 			path = ".";
 
-		Common::FilesystemNode fsCurrentDir(path);
-		fsCurrentDir.getChildren(fslistCurrentDir, Common::FilesystemNode::kListFilesOnly);
+		Common::FSNode fsCurrentDir(path);
+		fsCurrentDir.getChildren(fslistCurrentDir, Common::FSNode::kListFilesOnly);
 		fslist = &fslistCurrentDir;
 	}
 
diff --git a/engines/agi/loader_v3.cpp b/engines/agi/loader_v3.cpp
index 656ae232ec..bea57069c0 100644
--- a/engines/agi/loader_v3.cpp
+++ b/engines/agi/loader_v3.cpp
@@ -48,9 +48,9 @@ int AgiLoader_v3::detectGame() {
 	bool found = false;
 
 	Common::FSList fslist;
-	Common::FilesystemNode dir(ConfMan.get("path"));
+	Common::FSNode dir(ConfMan.get("path"));
 
-	if (!dir.getChildren(fslist, Common::FilesystemNode::kListFilesOnly)) {
+	if (!dir.getChildren(fslist, Common::FSNode::kListFilesOnly)) {
 		warning("AgiEngine: invalid game path '%s'", dir.getPath().c_str());
 		return errInvalidAGIFile;
 	}
diff --git a/engines/agi/sound.cpp b/engines/agi/sound.cpp
index 37896dc241..7138a3adad 100644
--- a/engines/agi/sound.cpp
+++ b/engines/agi/sound.cpp
@@ -1007,7 +1007,7 @@ const IIgsExeInfo *SoundMgr::getIIgsExeInfo(enum AgiGameID gameid) const {
 	return NULL;
 }
 
-bool IIgsSoundMgr::loadInstrumentHeaders(const Common::FilesystemNode &exePath, const IIgsExeInfo &exeInfo) {
+bool IIgsSoundMgr::loadInstrumentHeaders(const Common::FSNode &exePath, const IIgsExeInfo &exeInfo) {
 	bool loadedOk = false; // Was loading successful?
 	Common::File file;
 
@@ -1078,7 +1078,7 @@ bool SoundMgr::convertWave(Common::SeekableReadStream &source, int8 *dest, uint
 	return !source.ioFailed();
 }
 
-bool IIgsSoundMgr::loadWaveFile(const Common::FilesystemNode &wavePath, const IIgsExeInfo &exeInfo) {
+bool IIgsSoundMgr::loadWaveFile(const Common::FSNode &wavePath, const IIgsExeInfo &exeInfo) {
 	Common::File file;
 
 	// Open the wave file and read it into memory
@@ -1107,14 +1107,14 @@ bool IIgsSoundMgr::loadWaveFile(const Common::FilesystemNode &wavePath, const II
 }
 
 /**
- * A function object (i.e. a functor) for testing if a Common::FilesystemNode
+ * A function object (i.e. a functor) for testing if a Common::FSNode
  * object's name is equal (Ignoring case) to a string or to at least
  * one of the strings in a list of strings. Can be used e.g. with find_if().
  */
-struct fsnodeNameEqualsIgnoreCase : public Common::UnaryFunction<const Common::FilesystemNode&, bool> {
+struct fsnodeNameEqualsIgnoreCase : public Common::UnaryFunction<const Common::FSNode&, bool> {
 	fsnodeNameEqualsIgnoreCase(const Common::StringList &str) : _str(str) {}
 	fsnodeNameEqualsIgnoreCase(const Common::String str) { _str.push_back(str); }
-	bool operator()(const Common::FilesystemNode &param) const {
+	bool operator()(const Common::FSNode &param) const {
 		for (Common::StringList::const_iterator iter = _str.begin(); iter != _str.end(); iter++)
 			if (param.getName().equalsIgnoreCase(*iter))
 				return true;
@@ -1140,8 +1140,8 @@ bool SoundMgr::loadInstruments() {
 
 	// List files in the game path
 	Common::FSList fslist;
-	Common::FilesystemNode dir(ConfMan.get("path"));
-	if (!dir.getChildren(fslist, Common::FilesystemNode::kListFilesOnly)) {
+	Common::FSNode dir(ConfMan.get("path"));
+	if (!dir.getChildren(fslist, Common::FSNode::kListFilesOnly)) {
 		warning("Invalid game path (\"%s\"), not loading Apple IIGS instruments", dir.getPath().c_str());
 		return false;
 	}
diff --git a/engines/agi/sound.h b/engines/agi/sound.h
index c0448952c3..0a6f5e302d 100644
--- a/engines/agi/sound.h
+++ b/engines/agi/sound.h
@@ -402,8 +402,8 @@ public:
 	// For initializing
 	IIgsSoundMgr();
 	void setProgramChangeMapping(const MidiProgramChangeMapping *mapping);
-	bool loadInstrumentHeaders(const Common::FilesystemNode &exePath, const IIgsExeInfo &exeInfo);
-	bool loadWaveFile(const Common::FilesystemNode &wavePath, const IIgsExeInfo &exeInfo);
+	bool loadInstrumentHeaders(const Common::FSNode &exePath, const IIgsExeInfo &exeInfo);
+	bool loadWaveFile(const Common::FSNode &wavePath, const IIgsExeInfo &exeInfo);
 	// Miscellaneous methods
 	uint activeSounds() const; ///< How many active sounds are playing?
 	void stopSounds(); ///< Stops all sounds
diff --git a/engines/agi/wagparser.cpp b/engines/agi/wagparser.cpp
index b0cc400e4e..ea3893d957 100644
--- a/engines/agi/wagparser.cpp
+++ b/engines/agi/wagparser.cpp
@@ -173,7 +173,7 @@ bool WagFileParser::checkWagVersion(Common::SeekableReadStream &stream) {
 	}
 }
 
-bool WagFileParser::parse(const Common::FilesystemNode &node) {
+bool WagFileParser::parse(const Common::FSNode &node) {
 	WagProperty property; // Temporary property used for reading
 	Common::SeekableReadStream *stream = NULL; // The file stream
 
diff --git a/engines/agi/wagparser.h b/engines/agi/wagparser.h
index 89349a8ee2..c10be541cb 100644
--- a/engines/agi/wagparser.h
+++ b/engines/agi/wagparser.h
@@ -223,7 +223,7 @@ public:
 	 * @param filename Name of the file to be parsed.
 	 * @return True if parsed successfully, false otherwise.
 	 */
-	bool parse(const Common::FilesystemNode &node);
+	bool parse(const Common::FSNode &node);
 
 	/**
 	 * Get list of the loaded properties.
diff --git a/engines/engine.h b/engines/engine.h
index d6954193c5..20147e5bbd 100644
--- a/engines/engine.h
+++ b/engines/engine.h
@@ -62,7 +62,7 @@ protected:
 
 	const Common::String _targetName; // target name for saves
 	
-	const Common::FilesystemNode _gameDataDir;
+	const Common::FSNode _gameDataDir;
 
 private:
 	/**
diff --git a/engines/kyra/resource.cpp b/engines/kyra/resource.cpp
index 0f0a643017..9a789a9eb1 100644
--- a/engines/kyra/resource.cpp
+++ b/engines/kyra/resource.cpp
@@ -57,7 +57,7 @@ Resource::~Resource() {
 bool Resource::reset() {
 	unloadAllPakFiles();
 
-	Common::FilesystemNode dir(ConfMan.get("path"));
+	Common::FSNode dir(ConfMan.get("path"));
 
 	if (!dir.exists() || !dir.isDirectory())
 		error("invalid game path '%s'", dir.getPath().c_str());
@@ -103,7 +103,7 @@ bool Resource::reset() {
 	}
 
 	Common::FSList fslist;
-	if (!dir.getChildren(fslist, Common::FilesystemNode::kListFilesOnly))
+	if (!dir.getChildren(fslist, Common::FSNode::kListFilesOnly))
 		error("can't list files inside game path '%s'", dir.getPath().c_str());
 
 	if (_vm->game() == GI_KYRA1 && _vm->gameFlags().isTalkie) {
diff --git a/engines/parallaction/disk.h b/engines/parallaction/disk.h
index 30d820c6d2..3fe8014f94 100644
--- a/engines/parallaction/disk.h
+++ b/engines/parallaction/disk.h
@@ -211,21 +211,21 @@ protected:
 
 	Parallaction	*_vm;
 
-	Common::FilesystemNode	_baseDir;
-	Common::FilesystemNode	_partDir;
-
-	Common::FilesystemNode	_aniDir;
-	Common::FilesystemNode	_bkgDir;
-	Common::FilesystemNode	_mscDir;
-	Common::FilesystemNode	_mskDir;
-	Common::FilesystemNode	_pthDir;
-	Common::FilesystemNode	_rasDir;
-	Common::FilesystemNode	_scrDir;
-	Common::FilesystemNode	_sfxDir;
-	Common::FilesystemNode	_talDir;
+	Common::FSNode	_baseDir;
+	Common::FSNode	_partDir;
+
+	Common::FSNode	_aniDir;
+	Common::FSNode	_bkgDir;
+	Common::FSNode	_mscDir;
+	Common::FSNode	_mskDir;
+	Common::FSNode	_pthDir;
+	Common::FSNode	_rasDir;
+	Common::FSNode	_scrDir;
+	Common::FSNode	_sfxDir;
+	Common::FSNode	_talDir;
 
 protected:
-	void errorFileNotFound(const Common::FilesystemNode &dir, const Common::String &filename);
+	void errorFileNotFound(const Common::FSNode &dir, const Common::String &filename);
 	Font *createFont(const char *name, Common::ReadStream &stream);
 	Sprites*	createSprites(Common::ReadStream &stream);
 	void loadBitmap(Common::SeekableReadStream &stream, Graphics::Surface &surf, byte *palette);
@@ -273,14 +273,14 @@ protected:
 	Font *createFont(const char *name, Common::SeekableReadStream &stream);
 	void loadBackground(BackgroundInfo& info, Common::SeekableReadStream &stream);
 
-	Common::FilesystemNode	_baseBkgDir;
-	Common::FilesystemNode	_fntDir;
-	Common::FilesystemNode	_commonAniDir;
-	Common::FilesystemNode	_commonBkgDir;
-	Common::FilesystemNode	_commonMscDir;
-	Common::FilesystemNode	_commonMskDir;
-	Common::FilesystemNode	_commonPthDir;
-	Common::FilesystemNode	_commonTalDir;
+	Common::FSNode	_baseBkgDir;
+	Common::FSNode	_fntDir;
+	Common::FSNode	_commonAniDir;
+	Common::FSNode	_commonBkgDir;
+	Common::FSNode	_commonMscDir;
+	Common::FSNode	_commonMskDir;
+	Common::FSNode	_commonPthDir;
+	Common::FSNode	_commonTalDir;
 
 public:
 	AmigaDisk_br(Parallaction *vm);
diff --git a/engines/parallaction/disk_br.cpp b/engines/parallaction/disk_br.cpp
index 24893b7b05..0009b48a3a 100644
--- a/engines/parallaction/disk_br.cpp
+++ b/engines/parallaction/disk_br.cpp
@@ -91,7 +91,7 @@ struct Sprites : public Frames {
 
 
 
-void DosDisk_br::errorFileNotFound(const Common::FilesystemNode &dir, const Common::String &filename) {
+void DosDisk_br::errorFileNotFound(const Common::FSNode &dir, const Common::String &filename) {
 	error("File '%s' not found in directory '%s'", filename.c_str(), dir.getDisplayName().c_str());
 }
 
@@ -134,7 +134,7 @@ GfxObj* DosDisk_br::loadTalk(const char *name) {
 	debugC(5, kDebugDisk, "DosDisk_br::loadTalk(%s)", name);
 
 	Common::String path(name);
-	Common::FilesystemNode node = _talDir.getChild(path);
+	Common::FSNode node = _talDir.getChild(path);
 	if (!node.exists()) {
 		path += ".tal";
 		node = _talDir.getChild(path);
@@ -160,11 +160,11 @@ Script* DosDisk_br::loadLocation(const char *name) {
 	debugC(5, kDebugDisk, "DosDisk_br::loadLocation");
 
 	Common::String langs[4] = { "it", "fr", "en", "ge" };
-	Common::FilesystemNode locDir = _partDir.getChild(langs[_language]);
+	Common::FSNode locDir = _partDir.getChild(langs[_language]);
 
 	Common::String path(name);
 	path += ".slf";
-	Common::FilesystemNode node = locDir.getChild(path);
+	Common::FSNode node = locDir.getChild(path);
 	if (!node.exists()) {
 		path = Common::String(name) + ".loc";
 		node = locDir.getChild(path);
@@ -183,7 +183,7 @@ Script* DosDisk_br::loadScript(const char* name) {
 
 	Common::String path(name);
 	path += ".scr";
-	Common::FilesystemNode node = _scrDir.getChild(path);
+	Common::FSNode node = _scrDir.getChild(path);
 	if (!node.exists()) {
 		errorFileNotFound(_scrDir, path);
 	}
@@ -221,7 +221,7 @@ Frames* DosDisk_br::loadPointer(const char *name) {
 
 	Common::String path(name);
 	path += ".ras";
-	Common::FilesystemNode node = _baseDir.getChild(path);
+	Common::FSNode node = _baseDir.getChild(path);
 	if (!node.exists()) {
 		errorFileNotFound(_baseDir, path);
 	}
@@ -240,7 +240,7 @@ Font* DosDisk_br::loadFont(const char* name) {
 
 	Common::String path(name);
 	path += ".fnt";
-	Common::FilesystemNode node = _baseDir.getChild(path);
+	Common::FSNode node = _baseDir.getChild(path);
 	if (!node.exists()) {
 		errorFileNotFound(_baseDir, path);
 	}
@@ -255,7 +255,7 @@ GfxObj* DosDisk_br::loadObjects(const char *name) {
 	debugC(5, kDebugDisk, "DosDisk_br::loadObjects");
 
 	Common::String path(name);
-	Common::FilesystemNode node = _partDir.getChild(path);
+	Common::FSNode node = _partDir.getChild(path);
 	if (!node.exists()) {
 		errorFileNotFound(_partDir, path);
 	}
@@ -274,7 +274,7 @@ GfxObj* DosDisk_br::loadStatic(const char* name) {
 	debugC(5, kDebugDisk, "DosDisk_br::loadStatic");
 
 	Common::String path(name);
-	Common::FilesystemNode node = _rasDir.getChild(path);
+	Common::FSNode node = _rasDir.getChild(path);
 	if (!node.exists()) {
 		errorFileNotFound(_rasDir, path);
 	}
@@ -312,7 +312,7 @@ Frames* DosDisk_br::loadFrames(const char* name) {
 	debugC(5, kDebugDisk, "DosDisk_br::loadFrames");
 
 	Common::String path(name);
-	Common::FilesystemNode node = _aniDir.getChild(path);
+	Common::FSNode node = _aniDir.getChild(path);
 	if (!node.exists()) {
 		path += ".ani";
 		node = _aniDir.getChild(path);
@@ -336,7 +336,7 @@ void DosDisk_br::loadSlide(BackgroundInfo& info, const char *name) {
 
 	Common::String path(name);
 	path += ".bmp";
-	Common::FilesystemNode node = _baseDir.getChild(path);
+	Common::FSNode node = _baseDir.getChild(path);
 	if (!node.exists()) {
 		errorFileNotFound(_baseDir, path);
 	}
@@ -363,7 +363,7 @@ void DosDisk_br::loadMask(const char *name, MaskBuffer &buffer) {
 	}
 
 	Common::String filepath;
-	Common::FilesystemNode node;
+	Common::FSNode node;
 	Common::File stream;
 
 	filepath = Common::String(name) + ".msk";
@@ -384,7 +384,7 @@ void DosDisk_br::loadScenery(BackgroundInfo& info, const char *name, const char
 	debugC(5, kDebugDisk, "DosDisk_br::loadScenery");
 
 	Common::String filepath;
-	Common::FilesystemNode node;
+	Common::FSNode node;
 	Common::File stream;
 
 	if (name) {
@@ -447,7 +447,7 @@ Table* DosDisk_br::loadTable(const char* name) {
 
 	Common::String path(name);
 	path += ".tab";
-	Common::FilesystemNode node = _partDir.getChild(path);
+	Common::FSNode node = _partDir.getChild(path);
 	if (!node.exists()) {
 		errorFileNotFound(_partDir, path);
 	}
@@ -518,7 +518,7 @@ AmigaDisk_br::AmigaDisk_br(Parallaction *vm) : DosDisk_br(vm) {
 
 	_baseBkgDir = _baseDir.getChild("backs");
 
-	Common::FilesystemNode commonDir = _baseDir.getChild("common");
+	Common::FSNode commonDir = _baseDir.getChild("common");
 	_commonAniDir = commonDir.getChild("anims");
 	_commonBkgDir = commonDir.getChild("backs");
 	_commonMscDir = commonDir.getChild("msc");
@@ -566,7 +566,7 @@ void AmigaDisk_br::loadScenery(BackgroundInfo& info, const char* name, const cha
 	debugC(1, kDebugDisk, "AmigaDisk_br::loadScenery '%s', '%s' '%s'", name, mask, path);
 
 	Common::String filepath;
-	Common::FilesystemNode node;
+	Common::FSNode node;
 	Common::File stream;
 
 	if (name) {
@@ -630,7 +630,7 @@ void AmigaDisk_br::loadSlide(BackgroundInfo& info, const char *name) {
 
 	Common::String path(name);
 	path += ".bkg";
-	Common::FilesystemNode node = _baseBkgDir.getChild(path);
+	Common::FSNode node = _baseBkgDir.getChild(path);
 	if (!node.exists()) {
 		errorFileNotFound(_baseBkgDir, path);
 	}
@@ -644,7 +644,7 @@ GfxObj* AmigaDisk_br::loadStatic(const char* name) {
 	debugC(1, kDebugDisk, "AmigaDisk_br::loadStatic '%s'", name);
 
 	Common::String path(name);
-	Common::FilesystemNode node = _rasDir.getChild(path);
+	Common::FSNode node = _rasDir.getChild(path);
 	if (!node.exists()) {
 		errorFileNotFound(_rasDir, path);
 	}
@@ -687,7 +687,7 @@ Frames* AmigaDisk_br::loadFrames(const char* name) {
 	debugC(1, kDebugDisk, "AmigaDisk_br::loadFrames '%s'", name);
 
 	Common::String path(name);
-	Common::FilesystemNode node = _aniDir.getChild(path);
+	Common::FSNode node = _aniDir.getChild(path);
 	if (!node.exists()) {
 		path += ".ani";
 		node = _aniDir.getChild(path);
@@ -713,7 +713,7 @@ GfxObj* AmigaDisk_br::loadTalk(const char *name) {
 	debugC(1, kDebugDisk, "AmigaDisk_br::loadTalk '%s'", name);
 
 	Common::String path(name);
-	Common::FilesystemNode node = _talDir.getChild(path);
+	Common::FSNode node = _talDir.getChild(path);
 	if (!node.exists()) {
 		path += ".tal";
 		node = _talDir.getChild(path);
@@ -740,7 +740,7 @@ Font* AmigaDisk_br::loadFont(const char* name) {
 
 	Common::String path(name);
 	path += ".font";
-	Common::FilesystemNode node = _fntDir.getChild(path);
+	Common::FSNode node = _fntDir.getChild(path);
 	if (!node.exists()) {
 		errorFileNotFound(_fntDir, path);
 	}
@@ -773,7 +773,7 @@ Common::SeekableReadStream* AmigaDisk_br::loadMusic(const char* name) {
 	debugC(5, kDebugDisk, "AmigaDisk_br::loadMusic");
 
 	Common::String path(name);
-	Common::FilesystemNode node = _mscDir.getChild(path);
+	Common::FSNode node = _mscDir.getChild(path);
 	if (!node.exists()) {
 		// TODO (Kirben): error out when music file is not found?
 		return 0;
@@ -789,7 +789,7 @@ Common::ReadStream* AmigaDisk_br::loadSound(const char* name) {
 	debugC(5, kDebugDisk, "AmigaDisk_br::loadSound");
 
 	Common::String path(name);
-	Common::FilesystemNode node = _sfxDir.getChild(path);
+	Common::FSNode node = _sfxDir.getChild(path);
 	if (!node.exists()) {
 		errorFileNotFound(_sfxDir, path);
 	}
@@ -803,7 +803,7 @@ GfxObj* AmigaDisk_br::loadObjects(const char *name) {
 	debugC(5, kDebugDisk, "AmigaDisk_br::loadObjects");
 
 	Common::String path(name);
-	Common::FilesystemNode node = _partDir.getChild(path);
+	Common::FSNode node = _partDir.getChild(path);
 	if (!node.exists()) {
 		errorFileNotFound(_partDir, path);
 	}
diff --git a/engines/scumm/detection.cpp b/engines/scumm/detection.cpp
index b14f51cb14..0a54f2d29b 100644
--- a/engines/scumm/detection.cpp
+++ b/engines/scumm/detection.cpp
@@ -178,7 +178,7 @@ static Common::String generateFilenameForDetection(const char *pattern, Filename
 }
 
 struct DetectorDesc {
-	Common::FilesystemNode node;
+	Common::FSNode node;
 	Common::String md5;
 	const MD5Table *md5Entry;	// Entry of the md5 table corresponding to this file, if any.
 };
@@ -192,7 +192,7 @@ static bool testGame(const GameSettings *g, const DescMap &fileMD5Map, const Com
 // when performing the matching. The first match is returned, so if you
 // search for "resource" and two nodes "RESOURE and "resource" are present,
 // the first match is used.
-static bool searchFSNode(const Common::FSList &fslist, const Common::String &name, Common::FilesystemNode &result) {
+static bool searchFSNode(const Common::FSList &fslist, const Common::String &name, Common::FSNode &result) {
 	for (Common::FSList::const_iterator file = fslist.begin(); file != fslist.end(); ++file) {
 		if (!scumm_stricmp(file->getName().c_str(), name.c_str())) {
 			result = *file;
@@ -213,16 +213,16 @@ static Common::Language detectLanguage(const Common::FSList &fslist, byte id) {
 	// switch to MD5 based detection).
 	const char *filename = (id == GID_CMI) ? "LANGUAGE.TAB" : "LANGUAGE.BND";
 	Common::FilePtr tmp;
-	Common::FilesystemNode langFile;
+	Common::FSNode langFile;
 	if (searchFSNode(fslist, filename, langFile))
 		tmp = Common::FilePtr(langFile.openForReading());
 	if (!tmp) {
 		// try loading in RESOURCE sub dir...
-		Common::FilesystemNode resDir;
+		Common::FSNode resDir;
 		Common::FSList tmpList;
 		if (searchFSNode(fslist, "RESOURCE", resDir)
 			&& resDir.isDirectory()
-			&& resDir.getChildren(tmpList, Common::FilesystemNode::kListFilesOnly)
+			&& resDir.getChildren(tmpList, Common::FSNode::kListFilesOnly)
 			&& searchFSNode(tmpList, filename, langFile)) {
 			tmp = Common::FilePtr(langFile.openForReading());
 		}
@@ -787,8 +787,8 @@ PluginError ScummMetaEngine::createInstance(OSystem *syst, Engine **engine) cons
 
 	// Fetch the list of files in the current directory
 	Common::FSList fslist;
-	Common::FilesystemNode dir(ConfMan.get("path"));
-	if (!dir.getChildren(fslist, Common::FilesystemNode::kListFilesOnly)) {
+	Common::FSNode dir(ConfMan.get("path"));
+	if (!dir.getChildren(fslist, Common::FSNode::kListFilesOnly)) {
 		return kInvalidPathError;
 	}
 
diff --git a/engines/scumm/he/resource_he.cpp b/engines/scumm/he/resource_he.cpp
index ece2b9d7f3..9858206209 100644
--- a/engines/scumm/he/resource_he.cpp
+++ b/engines/scumm/he/resource_he.cpp
@@ -166,7 +166,7 @@ int Win32ResExtractor::extractResource_(const char *resType, char *resName, byte
 	}
 
 	/* get file size */
-	Common::FilesystemNode node(_fileName);
+	Common::FSNode node(_fileName);
 	fi.file = node.openForReading();
 	if (!fi.file) {
 		error("Cannot open file %s", _fileName.c_str());
diff --git a/engines/scumm/he/script_v60he.cpp b/engines/scumm/he/script_v60he.cpp
index 4af2138cad..f60bbdd84b 100644
--- a/engines/scumm/he/script_v60he.cpp
+++ b/engines/scumm/he/script_v60he.cpp
@@ -1010,7 +1010,7 @@ void ScummEngine_v60he::o60_openFile() {
 			// TODO / FIXME: Consider using listSavefiles to avoid unneccessary openForLoading calls
 			_hInFileTable[slot] = _saveFileMan->openForLoading(filename);
 			if (_hInFileTable[slot] == 0) {
-				Common::FilesystemNode node(filename);
+				Common::FSNode node(filename);
 				_hInFileTable[slot] = node.openForReading();
 			}
 			break;
diff --git a/engines/sword1/sword1.cpp b/engines/sword1/sword1.cpp
index 35fe58e819..4b402ffe97 100644
--- a/engines/sword1/sword1.cpp
+++ b/engines/sword1/sword1.cpp
@@ -143,7 +143,7 @@ void Sword1CheckDirectory(const Common::FSList &fslist, bool *filesFound) {
 			for (int cnt = 0; cnt < ARRAYSIZE(g_dirNames); cnt++)
 				if (scumm_stricmp(file->getName().c_str(), g_dirNames[cnt]) == 0) {
 					Common::FSList fslist2;
-					if (file->getChildren(fslist2, Common::FilesystemNode::kListFilesOnly))
+					if (file->getChildren(fslist2, Common::FSNode::kListFilesOnly))
 						Sword1CheckDirectory(fslist2, filesFound);
 				}
 		}
diff --git a/engines/sword2/sword2.cpp b/engines/sword2/sword2.cpp
index b6ee7cfcd0..73e7c49a0d 100644
--- a/engines/sword2/sword2.cpp
+++ b/engines/sword2/sword2.cpp
@@ -152,7 +152,7 @@ GameList Sword2MetaEngine::detectGames(const Common::FSList &fslist) const {
 
 				if (0 == scumm_stricmp("clusters", fileName)) {
 					Common::FSList recList;
-					if (file->getChildren(recList, Common::FilesystemNode::kListAll)) {
+					if (file->getChildren(recList, Common::FSNode::kListAll)) {
 						GameList recGames(detectGames(recList));
 						if (!recGames.empty()) {
 							detectedGames.push_back(recGames);
@@ -212,8 +212,8 @@ PluginError Sword2MetaEngine::createInstance(OSystem *syst, Engine **engine) con
 	assert(engine);
 
 	Common::FSList fslist;
-	Common::FilesystemNode dir(ConfMan.get("path"));
-	if (!dir.getChildren(fslist, Common::FilesystemNode::kListAll)) {
+	Common::FSNode dir(ConfMan.get("path"));
+	if (!dir.getChildren(fslist, Common::FSNode::kListAll)) {
 		return kInvalidPathError;
 	}