BACKENDS: Avoid #including .cpp files

So far, the various *-fs-factory.cpp files were #including the
corresponding *-fs.cpp files. This is surprising and hence could lead to
all kinds of problems). To fix this, provide proper headers for the
*-fs.cpp files.
This also makes code reuse via subclassing possible.

Since not all ports were tested, this will likely lead to a few
easy to fix compile regressions.

3 files changed, 80 insertions, 50 deletions

diff --git a/backends/fs/wii/wii-fs-factory.cpp b/backends/fs/wii/wii-fs-factory.cpp
index 6a11d7d12e..6b35a43a21 100644
--- a/backends/fs/wii/wii-fs-factory.cpp
+++ b/backends/fs/wii/wii-fs-factory.cpp
@@ -25,7 +25,7 @@
 #include <unistd.h>
 
 #include "backends/fs/wii/wii-fs-factory.h"
-#include "backends/fs/wii/wii-fs.cpp"
+#include "backends/fs/wii/wii-fs.h"
 
 #ifdef USE_WII_DI
 #include <di/di.h>
diff --git a/backends/fs/wii/wii-fs.cpp b/backends/fs/wii/wii-fs.cpp
index e6ba2a4aa0..d94463060c 100644
--- a/backends/fs/wii/wii-fs.cpp
+++ b/backends/fs/wii/wii-fs.cpp
@@ -22,7 +22,7 @@
 
 #if defined(__WII__)
 
-#include "backends/fs/abstract-fs.h"
+#include "backends/fs/wii/wii-fs.h"
 #include "backends/fs/stdiostream.h"
 
 #include <sys/iosupport.h>
@@ -34,52 +34,6 @@
 
 #include <gctypes.h>
 
-/**
- * Implementation of the ScummVM file system API based on Wii.
- *
- * Parts of this class are documented in the base interface class, AbstractFSNode.
- */
-class WiiFilesystemNode : public AbstractFSNode {
-protected:
-	Common::String _displayName;
-	Common::String _path;
-	bool _exists, _isDirectory, _isReadable, _isWritable;
-
-	virtual void initRootNode();
-	virtual bool getDevopChildren(AbstractFSList &list, ListMode mode, bool hidden) const;
-	virtual void setFlags(const struct stat *st);
-	virtual void clearFlags();
-
-public:
-	/**
-	 * Creates a WiiFilesystemNode with the root node as path.
-	 */
-	WiiFilesystemNode();
-
-	/**
-	 * Creates a WiiFilesystemNode for a given path.
-	 *
-	 * @param path Common::String with the path the new node should point to.
-	 */
-	WiiFilesystemNode(const Common::String &path);
-	WiiFilesystemNode(const Common::String &p, const struct stat *st);
-
-	virtual bool exists() const;
-	virtual Common::String getDisplayName() const { return _displayName; }
-	virtual Common::String getName() const { return _displayName; }
-	virtual Common::String getPath() const { return _path; }
-	virtual bool isDirectory() const { return _isDirectory; }
-	virtual bool isReadable() const { return _isReadable; }
-	virtual bool isWritable() const { return _isWritable; }
-
-	virtual AbstractFSNode *getChild(const Common::String &n) const;
-	virtual bool getChildren(AbstractFSList &list, ListMode mode, bool hidden) const;
-	virtual AbstractFSNode *getParent() const;
-
-	virtual Common::SeekableReadStream *createReadStream();
-	virtual Common::WriteStream *createWriteStream();
-};
-
 // gets all registered devoptab devices
 bool WiiFilesystemNode::getDevopChildren(AbstractFSList &list, ListMode mode, bool hidden) const {
 	u8 i;
@@ -234,11 +188,11 @@ AbstractFSNode *WiiFilesystemNode::getParent() const {
 }
 
 Common::SeekableReadStream *WiiFilesystemNode::createReadStream() {
-	return StdioStream::makeFromPath(getPath().c_str(), false);
+	return StdioStream::makeFromPath(getPath(), false);
 }
 
 Common::WriteStream *WiiFilesystemNode::createWriteStream() {
-	return StdioStream::makeFromPath(getPath().c_str(), true);
+	return StdioStream::makeFromPath(getPath(), true);
 }
 
 #endif //#if defined(__WII__)
diff --git a/backends/fs/wii/wii-fs.h b/backends/fs/wii/wii-fs.h
new file mode 100644
index 0000000000..fd160624ca
--- /dev/null
+++ b/backends/fs/wii/wii-fs.h
@@ -0,0 +1,76 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ */
+
+#ifndef WII_FILESYSTEM_H
+#define WII_FILESYSTEM_H
+
+#include "backends/fs/abstract-fs.h"
+
+/**
+ * Implementation of the ScummVM file system API based on Wii.
+ *
+ * Parts of this class are documented in the base interface class, AbstractFSNode.
+ */
+class WiiFilesystemNode : public AbstractFSNode {
+protected:
+	Common::String _displayName;
+	Common::String _path;
+	bool _exists, _isDirectory, _isReadable, _isWritable;
+
+	virtual void initRootNode();
+	virtual bool getDevopChildren(AbstractFSList &list, ListMode mode, bool hidden) const;
+	virtual void setFlags(const struct stat *st);
+	virtual void clearFlags();
+
+public:
+	/**
+	 * Creates a WiiFilesystemNode with the root node as path.
+	 */
+	WiiFilesystemNode();
+
+	/**
+	 * Creates a WiiFilesystemNode for a given path.
+	 *
+	 * @param path Common::String with the path the new node should point to.
+	 */
+	WiiFilesystemNode(const Common::String &path);
+	WiiFilesystemNode(const Common::String &p, const struct stat *st);
+
+	virtual bool exists() const;
+	virtual Common::String getDisplayName() const { return _displayName; }
+	virtual Common::String getName() const { return _displayName; }
+	virtual Common::String getPath() const { return _path; }
+	virtual bool isDirectory() const { return _isDirectory; }
+	virtual bool isReadable() const { return _isReadable; }
+	virtual bool isWritable() const { return _isWritable; }
+
+	virtual AbstractFSNode *getChild(const Common::String &n) const;
+	virtual bool getChildren(AbstractFSList &list, ListMode mode, bool hidden) const;
+	virtual AbstractFSNode *getParent() const;
+
+	virtual Common::SeekableReadStream *createReadStream();
+	virtual Common::WriteStream *createWriteStream();
+};
+
+#endif