aboutsummaryrefslogtreecommitdiff
path: root/backends/fs/n64
diff options
context:
space:
mode:
authorMax Horn2011-05-03 10:33:03 +0200
committerMax Horn2011-05-03 13:22:00 +0200
commitf62fd4f25f5fcc237d59054af0d6182da8d8eff8 (patch)
tree05fd53a36cd791f91419e261a547c7c2406daa98 /backends/fs/n64
parent5ea9e14c2fcd3c1054ce95867ca7df7c8498a2d8 (diff)
downloadscummvm-rg350-f62fd4f25f5fcc237d59054af0d6182da8d8eff8.tar.gz
scummvm-rg350-f62fd4f25f5fcc237d59054af0d6182da8d8eff8.tar.bz2
scummvm-rg350-f62fd4f25f5fcc237d59054af0d6182da8d8eff8.zip
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.
Diffstat (limited to 'backends/fs/n64')
-rw-r--r--backends/fs/n64/n64-fs-factory.cpp2
-rw-r--r--backends/fs/n64/n64-fs.cpp52
-rw-r--r--backends/fs/n64/n64-fs.h80
3 files changed, 82 insertions, 52 deletions
diff --git a/backends/fs/n64/n64-fs-factory.cpp b/backends/fs/n64/n64-fs-factory.cpp
index 7e314693b8..fff0f7804b 100644
--- a/backends/fs/n64/n64-fs-factory.cpp
+++ b/backends/fs/n64/n64-fs-factory.cpp
@@ -27,7 +27,7 @@
#include <n64utils.h>
#include "backends/fs/n64/n64-fs-factory.h"
-#include "backends/fs/n64/n64-fs.cpp"
+#include "backends/fs/n64/n64-fs.h"
AbstractFSNode *N64FilesystemFactory::makeRootFileNode() const {
return new N64FilesystemNode();
diff --git a/backends/fs/n64/n64-fs.cpp b/backends/fs/n64/n64-fs.cpp
index 4def84afcd..75c1e0bea0 100644
--- a/backends/fs/n64/n64-fs.cpp
+++ b/backends/fs/n64/n64-fs.cpp
@@ -22,7 +22,7 @@
#ifdef __N64__
-#include "backends/fs/abstract-fs.h"
+#include "backends/fs/n64/n64-fs.h"
#include "backends/fs/n64/romfsstream.h"
#include <sys/param.h>
@@ -31,56 +31,6 @@
#define ROOT_PATH "/"
-/**
- * Implementation of the ScummVM file system API based on N64 Hkz romfs.
- *
- * Parts of this class are documented in the base interface class, AbstractFSNode.
- */
-class N64FilesystemNode : public AbstractFSNode {
-protected:
- Common::String _displayName;
- Common::String _path;
- bool _isDirectory;
- bool _isValid;
-
-public:
- /**
- * Creates a N64FilesystemNode with the root node as path.
- */
- N64FilesystemNode();
-
- /**
- * Creates a N64FilesystemNode for a given path.
- *
- * @param path Common::String with the path the new node should point to.
- * @param verify true if the isValid and isDirectory flags should be verified during the construction.
- */
- N64FilesystemNode(const Common::String &p, bool verify = true);
-
- 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;
- 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();
-};
-
N64FilesystemNode::N64FilesystemNode() {
_isDirectory = true;
_displayName = "Root";
diff --git a/backends/fs/n64/n64-fs.h b/backends/fs/n64/n64-fs.h
new file mode 100644
index 0000000000..3a5dd375b9
--- /dev/null
+++ b/backends/fs/n64/n64-fs.h
@@ -0,0 +1,80 @@
+/* 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 N64_FILESYSTEM_H
+#define N64_FILESYSTEM_H
+
+#include "backends/fs/abstract-fs.h"
+
+/**
+ * Implementation of the ScummVM file system API based on N64 Hkz romfs.
+ *
+ * Parts of this class are documented in the base interface class, AbstractFSNode.
+ */
+class N64FilesystemNode : public AbstractFSNode {
+protected:
+ Common::String _displayName;
+ Common::String _path;
+ bool _isDirectory;
+ bool _isValid;
+
+public:
+ /**
+ * Creates a N64FilesystemNode with the root node as path.
+ */
+ N64FilesystemNode();
+
+ /**
+ * Creates a N64FilesystemNode for a given path.
+ *
+ * @param path Common::String with the path the new node should point to.
+ * @param verify true if the isValid and isDirectory flags should be verified during the construction.
+ */
+ N64FilesystemNode(const Common::String &p, bool verify = true);
+
+ 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;
+ 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();
+};
+
+#endif