libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-03 15:21:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ANDROID: Avoid including translations.h in a header

Browse Source
This commit is contained in:
Eugene Sandulenko 2023-03-17 14:42:55 +01:00
parent 511a77f643
commit 1f49e54599
No known key found for this signature in database
GPG Key ID: 014D387312D34F08
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
backends/fs/android/android-saf-fs.cpp
View File

@ -54,6 +54,7 @@
#include "backends/fs/posix/posix-iostream.h"
#include "common/debug.h"
#include "common/translation.h"
#include "common/util.h"
jmethodID AndroidSAFFilesystemNode::_MID_getTreeId = 0;
@ -685,6 +686,15 @@ AddSAFFakeNode::~AddSAFFakeNode() {
delete _proxied;
}
Common::U32String AddSAFFakeNode::getDisplayName() const {
// I18N: This is displayed in the file browser to let the user choose a new folder for Android Storage Attached Framework
return Common::U32String::format("\x01<%s>", _("Add a new folder").c_str());
}
Common::String AddSAFFakeNode::getName() const {
return Common::String::format("\x01<%s>", _("Add a new folder").encode().c_str());
}
AbstractFSNode *AddSAFFakeNode::getChild(const Common::String &name) const {
if (_fromPath) {
// When starting from /saf try to get the tree node

5
backends/fs/android/android-saf-fs.h
View File

@ -24,7 +24,6 @@
#include <jni.h>
#include "common/translation.h"
#include "backends/fs/abstract-fs.h"
#include "backends/fs/android/android-fs.h"
@ -174,8 +173,8 @@ public:
bool getChildren(AbstractFSList &list, ListMode mode, bool hidden) const override;
// I18N: This is displayed in the file browser to let the user choose a new folder for Android Storage Attached Framework
Common::U32String getDisplayName() const override { return Common::U32String::format("\x01<%s>", _("Add a new folder").c_str()); };
Common::String getName() const override { return Common::String::format("\x01<%s>", _("Add a new folder").encode().c_str()); };
Common::U32String getDisplayName() const override;
Common::String getName() const override;
Common::String getPath() const override;
bool isDirectory() const override { return true; }

1
po/POTFILES
View File

@ -68,7 +68,6 @@ backends/events/gph/gph-events.cpp
backends/events/maemosdl/maemosdl-events.cpp
backends/events/openpandora/op-events.cpp
backends/fs/android/android-saf-fs.cpp
backends/fs/android/android-saf-fs.h
backends/graphics/opengl/opengl-graphics.cpp
backends/graphics/openglsdl/openglsdl-graphics.cpp
backends/graphics/surfacesdl/surfacesdl-graphics.cpp