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.

1 files changed, 4 insertions, 85 deletions

diff --git a/backends/fs/amigaos4/amigaos4-fs.cpp b/backends/fs/amigaos4/amigaos4-fs.cpp
index 8a57a3cf1c..4f763ef9e8 100644
--- a/backends/fs/amigaos4/amigaos4-fs.cpp
+++ b/backends/fs/amigaos4/amigaos4-fs.cpp
@@ -23,97 +23,16 @@
  */
 
 #if defined(__amigaos4__)
-#ifdef __USE_INLINE__
-#undef __USE_INLINE__
-#endif
-
-#include <proto/exec.h>
-#include <proto/dos.h>
-#include <stdio.h>
-
-#ifndef USE_NEWLIB
-#include <strings.h>
-#endif
 
+#include "backends/fs/amigaos4/amigaos4-fs.h"
+#include "backends/fs/stdiostream.h"
 #include "common/debug.h"
 #include "common/util.h"
-#include "backends/fs/abstract-fs.h"
-#include "backends/fs/stdiostream.h"
 
 #define ENTER() /* debug(6, "Enter") */
 #define LEAVE() /* debug(6, "Leave") */
 
 /**
- * Implementation of the ScummVM file system API.
- *
- * Parts of this class are documented in the base interface class, AbstractFSNode.
- */
-class AmigaOSFilesystemNode : public AbstractFSNode {
-protected:
-	BPTR _pFileLock;
-	Common::String _sDisplayName;
-	Common::String _sPath;
-	bool _bIsDirectory;
-	bool _bIsValid;
-	uint32 _nProt;
-
-	/**
-	 * Creates a list with all the volumes present in the root node.
-	 */
-	virtual AbstractFSList listVolumes() const;
-
-public:
-	/**
-	 * Creates an AmigaOSFilesystemNode with the root node as path.
-	 */
-	AmigaOSFilesystemNode();
-
-	/**
-	 * Creates an AmigaOSFilesystemNode for a given path.
-	 *
-	 * @param path Common::String with the path the new node should point to.
-	 */
-	AmigaOSFilesystemNode(const Common::String &p);
-
-	/**
-	 * Creates an AmigaOSFilesystemNode given its lock and display name
-	 *
-	 * @param pLock BPTR to the lock.
-	 * @param pDisplayName name to be used for display, in case not supplied the FilePart() of the filename will be used.
-	 *
-	 * @note This shouldn't even be public as it's only internally, at best it should have been protected if not private
-	 */
-	AmigaOSFilesystemNode(BPTR pLock, const char *pDisplayName = 0);
-
-	/**
-	 * Copy constructor.
-	 *
-	 * @note Needed because it duplicates the file lock
-	 */
-	AmigaOSFilesystemNode(const AmigaOSFilesystemNode &node);
-
-	/**
-	 * Destructor.
-	 */
-	virtual ~AmigaOSFilesystemNode();
-
-	virtual bool exists() const;
-	virtual Common::String getDisplayName() const { return _sDisplayName; };
-	virtual Common::String getName() const { return _sDisplayName; };
-	virtual Common::String getPath() const { return _sPath; };
-	virtual bool isDirectory() const { return _bIsDirectory; };
-	virtual bool isReadable() const;
-	virtual bool isWritable() const;
-
-	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();
-};
-
-/**
  * Returns the last component of a given path.
  *
  * @param str Common::String containing the path.
@@ -497,11 +416,11 @@ AbstractFSList AmigaOSFilesystemNode::listVolumes() const {
 }
 
 Common::SeekableReadStream *AmigaOSFilesystemNode::createReadStream() {
-	return StdioStream::makeFromPath(getPath().c_str(), false);
+	return StdioStream::makeFromPath(getPath(), false);
 }
 
 Common::WriteStream *AmigaOSFilesystemNode::createWriteStream() {
-	return StdioStream::makeFromPath(getPath().c_str(), true);
+	return StdioStream::makeFromPath(getPath(), true);
 }
 
 #endif //defined(__amigaos4__)