aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorMax Horn2007-02-03 21:37:52 +0000
committerMax Horn2007-02-03 21:37:52 +0000
commit73c3625f1f171212d0c2f8e112994f3ee7c6294e (patch)
tree939e5d78844c6a4bba66bf40cfdf67bfd5d4ce60 /common
parenta2b1ff0de842d800ad311dc2e1b2638722cbdda9 (diff)
downloadscummvm-rg350-73c3625f1f171212d0c2f8e112994f3ee7c6294e.tar.gz
scummvm-rg350-73c3625f1f171212d0c2f8e112994f3ee7c6294e.tar.bz2
scummvm-rg350-73c3625f1f171212d0c2f8e112994f3ee7c6294e.zip
Fixing various doxygen warnings
svn-id: r25362
Diffstat (limited to 'common')
-rw-r--r--common/fs.cpp2
-rw-r--r--common/fs.h11
2 files changed, 6 insertions, 7 deletions
diff --git a/common/fs.cpp b/common/fs.cpp
index 11d580436f..10087cd91c 100644
--- a/common/fs.cpp
+++ b/common/fs.cpp
@@ -95,7 +95,7 @@ FilesystemNode FilesystemNode::getParent() const {
}
}
-FilesystemNode FilesystemNode::getChild(const String &n) const {
+FilesystemNode FilesystemNode::getChild(const Common::String &n) const {
if (_realNode == 0)
return *this;
diff --git a/common/fs.h b/common/fs.h
index 5d35c2581b..43b52b4391 100644
--- a/common/fs.h
+++ b/common/fs.h
@@ -63,7 +63,6 @@ class FSList : public Common::Array<FilesystemNode> {};
* we can build upon this.
*/
class FilesystemNode {
- typedef Common::String String;
private:
AbstractFilesystemNode *_realNode;
int *_refCount;
@@ -96,7 +95,7 @@ public:
* operating system doesn't support the concept), some other directory is
* used (usually the root directory).
*/
- FilesystemNode(const String &path);
+ FilesystemNode(const Common::String &path);
/**
* Copy constructor.
@@ -129,7 +128,7 @@ public:
* directory nodes (an assertion is triggered otherwise). If no no child
* node with the given name exists, an invalid node is returned.
*/
- FilesystemNode getChild(const String &name) const;
+ FilesystemNode getChild(const Common::String &name) const;
/**
* Return a list of child nodes of this directory node. If called on a node
@@ -155,7 +154,7 @@ public:
* like constructing paths!
* @return the display name
*/
- virtual String displayName() const;
+ virtual Common::String displayName() const;
/**
* Return a string representation of the name of the file. This is can be
@@ -165,7 +164,7 @@ public:
*
* @return the file name
*/
- virtual String name() const;
+ virtual Common::String name() const;
/**
* Return a string representation of the file which can be passed to fopen(),
@@ -178,7 +177,7 @@ public:
*
* @return the 'path' represented by this filesystem node
*/
- virtual String path() const;
+ virtual Common::String path() const;
/**
* Compare the name of this node to the name of another. Directories