1 files changed, 10 insertions, 23 deletions

diff --git a/engines/sword25/kernel/filesystemutil.h b/engines/sword25/kernel/filesystemutil.h
index 43ce7c908e..38a3fdaa12 100644
--- a/engines/sword25/kernel/filesystemutil.h
+++ b/engines/sword25/kernel/filesystemutil.h
@@ -38,7 +38,7 @@
  * operations that do not have equivalents in the C/C++ libraries.
  *
  * Each supported platform must implement this interface, and the method
- * BS_FileSystemUtil Singleton::getInstance()
+ * BS_FileSystemUtil Singleton::instance()
  */
 
 #ifndef SWORD25_FILESYSTEMUTIL_H
@@ -52,7 +52,6 @@
 #include "common/str.h"
 #include "common/str-array.h"
 #include "sword25/kernel/common.h"
-#include "sword25/kernel/bs_stdint.h"
 
 namespace Sword25 {
 
@@ -62,8 +61,6 @@ namespace Sword25 {
 
 class FileSystemUtil {
 public:
-	static FileSystemUtil &GetInstance();
-	virtual ~FileSystemUtil() {};
 
 	/**
 	 * This function returns the name of the directory in which all user data is to be stored.
@@ -71,42 +68,32 @@ public:
 	 * These are for example Screenshots, game saves, configuration files, log files, ...
 	 * @return              Returns the name of the directory for user data.
 	 */
-	virtual Common::String GetUserdataDirectory() = 0;
+	static Common::String getUserdataDirectory();
+
 	/**
 	 * @return              Returns the path seperator
 	 */
-	virtual Common::String  GetPathSeparator() = 0;
+	static Common::String  getPathSeparator();
+
 	/**
 	 * @param Filename      The path to a file.
 	 * @return              Returns the size of the specified file. If the size could not be
 	 * determined, or the file does not exist, returns -1
 	 */
-	virtual int64 GetFileSize(const Common::String &Filename) = 0;
-	/**
-	 * @param Filename      The path to a file.
-	 * @return              Returns the timestamp of the specified file.
-	 */
-	virtual TimeDate GetFileTime(const Common::String &Filename) = 0;
+	static int32 getFileSize(const Common::String &filename);
+
 	/**
 	 * @param Filename      The path to a file.
 	 * @return              Returns true if the file exists.
 	 */
-	virtual bool FileExists(const Common::String &Filename) = 0;
-	/**
-	 * This function creates a directory
-	 *
-	 * If the parameter is "\b\c\d\e" is passed, and "\b\c" already exists, then folder 'd'
-	 * will be created, and subdirectory 'e' under it.
-	 * @param DirectoryName The name of the directory to be created
-	 * @return              Returns true if the folder(s) could be created, otherwise false.
-	 */
-	virtual bool CreateDirectory(const Common::String &DirectoryName) = 0;
+	static bool fileExists(const Common::String &filename);
+
 	/**
 	 * Gets the filename from a path and filename
 	 * @param Filename		The full path and filename
 	 * @return				Returns just the filename
 	 */
-	virtual Common::String GetPathFilename(const Common::String &Path) = 0;
+	static Common::String getPathFilename(const Common::String &path);
 };
 
 } // End of namespace Sword25