thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

BACKENDS: Use U32String for FSNode::getDisplayName

Browse source
This commit is contained in:
SupSuper 2021-07-01 10:11:51 +01:00 • committed by Daniel
parent 61f7390b32
commit 8c86319923
16 changed files with 19 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backends/fs/abstract-fs.h
View file

@ -124,7 +124,7 @@ public:
*
* @note By default, this method returns the value of getName().
*/
virtual Common::String getDisplayName() const { return getName(); }
virtual Common::U32String getDisplayName() const = 0;
/**
* Returns the last component of the path pointed by this FSNode.

2
backends/fs/amigaos/amigaos-fs.h
View file

@ -103,7 +103,7 @@ public:
virtual ~AmigaOSFilesystemNode() override;
virtual bool exists() const override;
virtual Common::String getDisplayName() const override { return _sDisplayName; }
virtual Common::U32String getDisplayName() const override { return _sDisplayName; }
virtual Common::String getName() const override { return _sDisplayName; }
virtual Common::String getPath() const override { return _sPath; }
virtual bool isDirectory() const override { return _bIsDirectory; }

6
backends/fs/chroot/chroot-fs.cpp
View file

@ -42,12 +42,12 @@ bool ChRootFilesystemNode::exists() const {
return _realNode->exists();
}
Common::String ChRootFilesystemNode::getDisplayName() const {
return getName();
Common::U32String ChRootFilesystemNode::getDisplayName() const {
return _realNode->getDisplayName();
}
Common::String ChRootFilesystemNode::getName() const {
return _realNode->AbstractFSNode::getDisplayName();
return _realNode->getName();
}
Common::String ChRootFilesystemNode::getPath() const {

2
backends/fs/chroot/chroot-fs.h
View file

@ -36,7 +36,7 @@ public:
virtual ~ChRootFilesystemNode() override;
virtual bool exists() const override;
virtual Common::String getDisplayName() const override;
virtual Common::U32String getDisplayName() const override;
virtual Common::String getName() const override;
virtual Common::String getPath() const override;
virtual bool isDirectory() const override;

2
backends/fs/morphos/morphos-fs.h
View file

@ -103,7 +103,7 @@ public:
virtual ~MorphOSFilesystemNode() override;
virtual bool exists() const override;
virtual Common::String getDisplayName() const override { return _sDisplayName; }
virtual Common::U32String getDisplayName() const override { return _sDisplayName; }
virtual Common::String getName() const override { return _sDisplayName; }
virtual Common::String getPath() const override { return _sPath; }
virtual bool isDirectory() const override { return _bIsDirectory; }

2
backends/fs/n64/n64-fs.h
View file

@ -52,7 +52,7 @@ public:
N64FilesystemNode(const Common::String &p, bool verify = true);
virtual bool exists() const override;
virtual Common::String getDisplayName() const override {
virtual Common::U32String getDisplayName() const override {
return _displayName;
}
virtual Common::String getName() const override {

2
backends/fs/posix/posix-fs.h
View file

@ -55,7 +55,7 @@ public:
POSIXFilesystemNode(const Common::String &path);
virtual bool exists() const override;
virtual Common::String getDisplayName() const override { return _displayName; }
virtual Common::U32String getDisplayName() const override { return _displayName; }
virtual Common::String getName() const override { return _displayName; }
virtual Common::String getPath() const override { return _path; }
virtual bool isDirectory() const override { return _isDirectory; }

2
backends/fs/psp/psp-fs.h
View file

@ -52,7 +52,7 @@ public:
PSPFilesystemNode(const Common::String &p, bool verify = true);
virtual bool exists() const;
virtual Common::String getDisplayName() const { return _displayName; }
virtual Common::U32String getDisplayName() const { return _displayName; }
virtual Common::String getName() const { return _displayName; }
virtual Common::String getPath() const { return _path; }
virtual bool isDirectory() const { return _isDirectory; }

2
backends/fs/riscos/riscos-fs.h
View file

@ -55,7 +55,7 @@ public:
RISCOSFilesystemNode(const Common::String &path);
virtual bool exists() const override;
virtual Common::String getDisplayName() const override { return _displayName; }
virtual Common::U32String getDisplayName() const override { return _displayName; }
virtual Common::String getName() const override { return _displayName; }
virtual Common::String getPath() const override { return _path; }
virtual bool isDirectory() const override { return _isDirectory; }

2
backends/fs/symbian/symbian-fs.h
View file

@ -53,7 +53,7 @@ public:
SymbianFilesystemNode(const Common::String &path);
virtual bool exists() const override;
virtual Common::String getDisplayName() const override { return _displayName; }
virtual Common::U32String getDisplayName() const override { return _displayName; }
virtual Common::String getName() const override { return _displayName; }
virtual Common::String getPath() const override { return _path; }
virtual bool isDirectory() const override { return _isDirectory; }

2
backends/fs/wii/wii-fs.h
View file

@ -56,7 +56,7 @@ public:
WiiFilesystemNode(const Common::String &p, const struct stat *st);
virtual bool exists() const override;
virtual Common::String getDisplayName() const override { return _displayName; }
virtual Common::U32String getDisplayName() const override { return _displayName; }
virtual Common::String getName() const override { return _displayName; }
virtual Common::String getPath() const override { return _path; }
virtual bool isDirectory() const override { return _isDirectory; }

2
backends/fs/windows/windows-fs.h
View file

@ -67,7 +67,7 @@ public:
WindowsFilesystemNode(const Common::String &path, const bool currentDir);
virtual bool exists() const override;
virtual Common::String getDisplayName() const override { return _displayName; }
virtual Common::U32String getDisplayName() const override { return _displayName; }
virtual Common::String getName() const override { return _displayName; }
virtual Common::String getPath() const override { return _path; }
virtual bool isDirectory() const override { return _isDirectory; }

2
common/archive.h
View file

@ -58,7 +58,7 @@ public:
virtual ~ArchiveMember() { }
virtual SeekableReadStream *createReadStream() const = 0; /*!< Create a read stream. */
virtual String getName() const = 0; /*!< Get the name of the archive member. */
virtual String getDisplayName() const { return getName(); } /*!< Get the display name of the archive member. */
virtual U32String getDisplayName() const { return getName(); } /*!< Get the display name of the archive member. */
};
typedef SharedPtr<ArchiveMember> ArchiveMemberPtr; /*!< Shared pointer to an archive member. */

2
common/fs.cpp
View file

@ -87,7 +87,7 @@ bool FSNode::getChildren(FSList &fslist, ListMode mode, bool hidden) const {
return true;
}
String FSNode::getDisplayName() const {
U32String FSNode::getDisplayName() const {
assert(_realNode);
return _realNode->getDisplayName();
}

3
common/fs.h
View file

@ -29,6 +29,7 @@
#include "common/hashmap.h"
#include "common/ptr.h"
#include "common/str.h"
#include "common/ustr.h"
class AbstractFSNode;
@ -154,7 +155,7 @@ public:
*
* @return The display name.
*/
virtual String getDisplayName() const;
virtual U32String getDisplayName() const;
/**
* Return a string representation of the name of the file. This can be

2
engines/ultima/shared/engine/data_archive.cpp
View file

@ -50,7 +50,7 @@ public:
assert(name.hasPrefixIgnoreCase(_innerfolder));
return _publicFolder + Common::String(name.c_str() + _innerfolder.size());
}
Common::String getDisplayName() const override {
Common::U32String getDisplayName() const override {
return _member->getDisplayName();
}
};