aboutsummaryrefslogtreecommitdiff
path: root/base
diff options
context:
space:
mode:
authorMax Horn2008-10-02 16:58:59 +0000
committerMax Horn2008-10-02 16:58:59 +0000
commitc7fde102e325b423b1b153a78f7544697c052b72 (patch)
tree051aa4e66c66a20fa52fbb771328df5ea8d4790a /base
parent31be8a6b3f22880378db870600b29906135c8ef5 (diff)
downloadscummvm-rg350-c7fde102e325b423b1b153a78f7544697c052b72.tar.gz
scummvm-rg350-c7fde102e325b423b1b153a78f7544697c052b72.tar.bz2
scummvm-rg350-c7fde102e325b423b1b153a78f7544697c052b72.zip
Renamed FilesystemNode -> FSNode
svn-id: r34716
Diffstat (limited to 'base')
-rw-r--r--base/commandLine.cpp16
-rw-r--r--base/plugins.cpp12
-rw-r--r--base/plugins.h6
3 files changed, 17 insertions, 17 deletions
diff --git a/base/commandLine.cpp b/base/commandLine.cpp
index 410777209f..7c4de7b0cc 100644
--- a/base/commandLine.cpp
+++ b/base/commandLine.cpp
@@ -365,7 +365,7 @@ Common::String parseCommandLine(Common::StringMap &settings, int argc, char **ar
END_OPTION
DO_OPTION('p', "path")
- Common::FilesystemNode path(option);
+ Common::FSNode path(option);
if (!path.exists()) {
usage("Non-existent game path '%s'", option);
} else if (!path.isReadable()) {
@@ -408,7 +408,7 @@ Common::String parseCommandLine(Common::StringMap &settings, int argc, char **ar
END_OPTION
DO_LONG_OPTION("soundfont")
- Common::FilesystemNode path(option);
+ Common::FSNode path(option);
if (!path.exists()) {
usage("Non-existent soundfont path '%s'", option);
} else if (!path.isReadable()) {
@@ -438,7 +438,7 @@ Common::String parseCommandLine(Common::StringMap &settings, int argc, char **ar
END_OPTION
DO_LONG_OPTION("savepath")
- Common::FilesystemNode path(option);
+ Common::FSNode path(option);
if (!path.exists()) {
usage("Non-existent savegames path '%s'", option);
} else if (!path.isWritable()) {
@@ -447,7 +447,7 @@ Common::String parseCommandLine(Common::StringMap &settings, int argc, char **ar
END_OPTION
DO_LONG_OPTION("extrapath")
- Common::FilesystemNode path(option);
+ Common::FSNode path(option);
if (!path.exists()) {
usage("Non-existent extra path '%s'", option);
} else if (!path.isReadable()) {
@@ -465,7 +465,7 @@ Common::String parseCommandLine(Common::StringMap &settings, int argc, char **ar
END_OPTION
DO_LONG_OPTION("themepath")
- Common::FilesystemNode path(option);
+ Common::FSNode path(option);
if (!path.exists()) {
usage("Non-existent theme path '%s'", option);
} else if (!path.isReadable()) {
@@ -623,9 +623,9 @@ static void runDetectorTest() {
gameid = name;
}
- Common::FilesystemNode dir(path);
+ Common::FSNode dir(path);
Common::FSList files;
- if (!dir.getChildren(files, Common::FilesystemNode::kListAll)) {
+ if (!dir.getChildren(files, Common::FSNode::kListAll)) {
printf(" ... invalid path, skipping\n");
continue;
}
@@ -736,7 +736,7 @@ bool processSettings(Common::String &command, Common::StringMap &settings) {
if (!settings.contains("savepath")) {
const char *dir = getenv("SCUMMVM_SAVEPATH");
if (dir && *dir && strlen(dir) < MAXPATHLEN) {
- Common::FilesystemNode saveDir(dir);
+ Common::FSNode saveDir(dir);
if (!saveDir.exists()) {
warning("Non-existent SCUMMVM_SAVEPATH save path. It will be ignored.");
} else if (!saveDir.isWritable()) {
diff --git a/base/plugins.cpp b/base/plugins.cpp
index 7af758754b..5429359658 100644
--- a/base/plugins.cpp
+++ b/base/plugins.cpp
@@ -207,8 +207,8 @@ PluginList FilePluginProvider::getPlugins() {
Common::FSList pluginDirs;
// Add the default directories
- pluginDirs.push_back(Common::FilesystemNode("."));
- pluginDirs.push_back(Common::FilesystemNode("plugins"));
+ pluginDirs.push_back(Common::FSNode("."));
+ pluginDirs.push_back(Common::FSNode("plugins"));
// Add the provider's custom directories
addCustomDirectories(pluginDirs);
@@ -216,14 +216,14 @@ PluginList FilePluginProvider::getPlugins() {
// Add the user specified directory
Common::String pluginsPath(ConfMan.get("pluginspath"));
if (!pluginsPath.empty())
- pluginDirs.push_back(Common::FilesystemNode(pluginsPath));
+ pluginDirs.push_back(Common::FSNode(pluginsPath));
Common::FSList::const_iterator dir;
for (dir = pluginDirs.begin(); dir != pluginDirs.end(); dir++) {
// Load all plugins.
// Scan for all plugins in this directory
Common::FSList files;
- if (!dir->getChildren(files, Common::FilesystemNode::kListFilesOnly)) {
+ if (!dir->getChildren(files, Common::FSNode::kListFilesOnly)) {
debug(1, "Couldn't open plugin directory '%s'", dir->getPath().c_str());
continue;
} else {
@@ -240,7 +240,7 @@ PluginList FilePluginProvider::getPlugins() {
return pl;
}
-bool FilePluginProvider::isPluginFilename(const Common::FilesystemNode &node) const {
+bool FilePluginProvider::isPluginFilename(const Common::FSNode &node) const {
Common::String filename = node.getName();
#ifdef PLUGIN_PREFIX
@@ -260,7 +260,7 @@ bool FilePluginProvider::isPluginFilename(const Common::FilesystemNode &node) co
void FilePluginProvider::addCustomDirectories(Common::FSList &dirs) const {
#ifdef PLUGIN_DIRECTORY
- dirs.push_back(Common::FilesystemNode(PLUGIN_DIRECTORY));
+ dirs.push_back(Common::FSNode(PLUGIN_DIRECTORY));
#endif
}
diff --git a/base/plugins.h b/base/plugins.h
index 10fbc7d5e0..bb99818648 100644
--- a/base/plugins.h
+++ b/base/plugins.h
@@ -32,7 +32,7 @@
namespace Common {
class FSList;
- class FilesystemNode;
+ class FSNode;
}
@@ -242,7 +242,7 @@ protected:
* @param node the FSNode of the loadable code module
* @return a pointer to a Plugin instance, or 0 if an error occurred.
*/
- virtual Plugin *createPlugin(const Common::FilesystemNode &node) const = 0;
+ virtual Plugin *createPlugin(const Common::FSNode &node) const = 0;
/**
* Check if the supplied file corresponds to a loadable plugin file in
@@ -251,7 +251,7 @@ protected:
* @param node the FSNode of the file to check
* @return true if the filename corresponds to a plugin, false otherwise
*/
- virtual bool isPluginFilename(const Common::FilesystemNode &node) const;
+ virtual bool isPluginFilename(const Common::FSNode &node) const;
/**
* Optionally add to the list of directories to be searched for