libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-17 23:44:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ALL: Clarify POTFILES, remove redundant common/translations.h includes

Browse Source
This commit is contained in:
Eugene Sandulenko 2020-11-10 02:57:47 +01:00
parent 942c19336f
commit 5936026209
34 changed files with 32 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
audio/musicplugin.cpp
View File

@ -22,7 +22,6 @@
#include "audio/musicplugin.h"
#include "common/hash-str.h"
#include "common/translation.h"
MusicDevice::MusicDevice(MusicPluginObject const *musicPlugin, Common::String name, MusicType mt) :
_musicDriverName(musicPlugin->getName()), _musicDriverId(musicPlugin->getId()),

31
backends/dialogs/morphos/morphos-dialogs.cpp
View File

@ -32,7 +32,6 @@
#include "common/config-manager.h"
#include "common/encoding.h"
#include "common/translation.h"
#include <proto/exec.h>
#include <proto/dos.h>
@ -41,28 +40,28 @@
#include <proto/charsets.h>
char *MorphosDialogManager::utf8ToLocal(char *in) {
if (!in) {
return strdup("");
}
struct Library *CharsetsBase = OpenLibrary("charsets.library", 0);
if (CharsetsBase) {
LONG dstmib = GetSystemCharset(NULL, 0);
if (dstmib != MIBENUM_INVALID) {
LONG dstlen = GetByteSize((APTR)in, -1, MIBENUM_UTF_8, dstmib);
char *out = (char *)malloc(dstlen + 1);
if (out) {
if (ConvertTagList((APTR)in, -1, (APTR)out, -1, MIBENUM_UTF_8, dstmib, NULL) != -1) {
if (ConvertTagList((APTR)in, -1, (APTR)out, -1, MIBENUM_UTF_8, dstmib, NULL) != -1) {
return out;
}
free(out);
}
}
CloseLibrary(CharsetsBase);
CloseLibrary(CharsetsBase);
}
return strdup(in);
}
@ -74,22 +73,22 @@ Common::DialogManager::DialogResult MorphosDialogManager::showFileBrowser(const
struct Library *AslBase = OpenLibrary(AslName, 39);
if (AslBase) {
struct FileRequester *fr = NULL;
if (ConfMan.hasKey("browser_lastpath")) {
strncpy(pathBuffer, ConfMan.get("browser_lastpath").c_str(), sizeof(pathBuffer) - 1);
}
fr = (struct FileRequester *)AllocAslRequestTags(ASL_FileRequest, TAG_DONE);
if (!fr)
if (!fr)
return result;
char *newTitle = utf8ToLocal((char *)utf8Title.c_str());
if (AslRequestTags(fr, ASLFR_TitleText, (IPTR)newTitle, ASLFR_RejectIcons, TRUE, ASLFR_InitialDrawer, (IPTR)pathBuffer, ASLFR_DrawersOnly, (isDirBrowser ? TRUE : FALSE), TAG_DONE)) {
if (strlen(fr->fr_Drawer) < sizeof(pathBuffer)) {
strncpy(pathBuffer, fr->fr_Drawer, sizeof(pathBuffer));
if (!isDirBrowser) {
@ -99,7 +98,7 @@ Common::DialogManager::DialogResult MorphosDialogManager::showFileBrowser(const
ConfMan.set("browser_lastpath", pathBuffer);
result = kDialogOk;
}
}
}
free(newTitle);
FreeAslRequest((APTR)fr);

5
backends/graphics/psp2sdl/psp2sdl-graphics.cpp
View File

@ -29,7 +29,6 @@
#include "common/config-manager.h"
#include "common/mutex.h"
#include "common/textconsole.h"
#include "common/translation.h"
#include "common/util.h"
#include "common/frac.h"
#ifdef USE_RGB_COLOR
@ -82,7 +81,7 @@ PSP2SdlGraphicsManager::PSP2SdlGraphicsManager(SdlEventSource *sdlEventSource, S
// shader number 0 is the entry NONE (no shader)
const OSystem::GraphicsMode *p = s_supportedShadersPSP2;
_numShaders = 0;
while (p->name) {
while (p->name) {
_numShaders++;
p++;
}
@ -203,7 +202,7 @@ void PSP2SdlGraphicsManager::updateShader() {
// scanline masks, overlays, but could also serve for
// hardware-based up-scaling (sharp-bilinear-simple, etc.)
if (_vitatex_hwscreen) {
if (_shaders[0] == NULL) {
if (_shaders[0] == NULL) {
// load shaders
_shaders[GFX_SHADER_NONE] = vita2d_create_shader((const SceGxmProgram *)texture_v, (const SceGxmProgram *)texture_f);
_shaders[GFX_SHADER_LCD3X] = vita2d_create_shader((const SceGxmProgram *)lcd3x_v, (const SceGxmProgram *)lcd3x_f);

1
backends/platform/android/jni-android.cpp
View File

@ -45,7 +45,6 @@
#include "common/config-manager.h"
#include "common/error.h"
#include "common/textconsole.h"
#include "common/translation.h"
#include "common/encoding.h"
#include "engines/engine.h"

1
backends/platform/ios7/ios7_osys_misc.mm
View File

@ -27,7 +27,6 @@
#include <UIKit/UIKit.h>
#include <SystemConfiguration/SCNetworkReachability.h>
#include "common/translation.h"
#include "backends/platform/ios7/ios7_app_delegate.h"
#include "backends/platform/ios7/ios7_video.h"

1
backends/platform/sdl/macosx/macosx_wrapper.mm
View File

@ -24,7 +24,6 @@
#define FORBIDDEN_SYMBOL_ALLOW_ALL
#include "backends/platform/sdl/macosx/macosx_wrapper.h"
#include "common/translation.h"
#include "backends/platform/sdl/macosx/macosx-compat.h"
#include <AppKit/NSPasteboard.h>

1
backends/platform/sdl/sdl.cpp
View File

@ -27,7 +27,6 @@
#include "gui/EventRecorder.h"
#include "common/taskbar.h"
#include "common/textconsole.h"
#include "common/translation.h"
#include "common/encoding.h"
#ifdef USE_DISCORD

1
backends/platform/sdl/win32/win32_wrapper.cpp
View File

@ -29,7 +29,6 @@
#include <shlobj.h>
#include "common/scummsys.h"
#include "common/translation.h"
#include "backends/platform/sdl/win32/win32_wrapper.h"
// VerSetConditionMask, VerifyVersionInfo and SHGetFolderPath didn't appear until Windows 2000,

3
backends/platform/symbian/src/SymbianOS.cpp
View File

@ -31,7 +31,7 @@
#include <eikenv.h> // for CEikonEnv::Static()
#if (__GNUC__ && __cplusplus)
//If a pop has no matching push, the command-line options are restored.
//If a pop has no matching push, the command-line options are restored.
#pragma GCC diagnostic pop
#endif
@ -41,7 +41,6 @@
#include "backends/platform/symbian/src/SymbianOS.h"
#include "common/config-manager.h"
#include "common/scummsys.h"
#include "common/translation.h"
#include "gui/message.h"

1
backends/updates/win32/win32-updates.cpp
View File

@ -28,7 +28,6 @@
#ifdef USE_SPARKLE
#include "backends/platform/sdl/win32/win32-window.h"
#include "common/translation.h"
#include "common/config-manager.h"
#include <time.h>

1
engines/bladerunner/metaengine.cpp
View File

@ -28,7 +28,6 @@
#include "common/system.h"
#include "common/savefile.h"
#include "common/serializer.h"
#include "common/translation.h"
#include "engines/advancedDetector.h"

1
engines/cine/POTFILES
View File

@ -1,3 +1,4 @@
engines/cine/detection.cpp
engines/cine/metaengine.cpp
engines/cine/saveload.cpp
engines/cine/various.cpp

3
engines/dragons/POTFILES
View File

@ -1,3 +1,2 @@
engines/dragons/detection.cpp
engines/dragons/dragons.cpp
engines/dragons/detection.cpp
engines/dragons/metaengine.cpp

1
engines/glk/comprehend/comprehend.cpp
View File

@ -32,7 +32,6 @@
#include "glk/comprehend/pics.h"
#include "glk/quetzal.h"
#include "common/config-manager.h"
#include "common/translation.h"
#include "common/ustr.h"
#include "engines/util.h"

1
engines/glk/metaengine.cpp
View File

@ -69,7 +69,6 @@
#include "graphics/surface.h"
#include "common/config-manager.h"
#include "common/file.h"
#include "common/translation.h"
#define MAX_SAVES 99

2
engines/griffon/POTFILES
View File

@ -1,2 +1,2 @@
engines/griffon/griffon.cpp
engines/griffon/detection.cpp
engines/griffon/metaengine.cpp

1
engines/groovie/metaengine.cpp
View File

@ -24,7 +24,6 @@
#include "groovie/saveload.h"
#include "common/system.h"
#include "common/translation.h"
#include "engines/advancedDetector.h"
#include "groovie/detection.h"

1
engines/hdb/POTFILES
View File

@ -1 +1,2 @@
engines/hdb/detection.cpp
engines/hdb/metaengine.cpp

1
engines/hopkins/metaengine.cpp
View File

@ -28,7 +28,6 @@
#include "common/memstream.h"
#include "engines/advancedDetector.h"
#include "common/system.h"
#include "common/translation.h"
#include "graphics/surface.h"
#include "hopkins/detection.h"

1
engines/kyra/metaengine.cpp
View File

@ -30,7 +30,6 @@
#include "common/config-manager.h"
#include "common/system.h"
#include "common/savefile.h"
#include "common/translation.h"
#include "engines/advancedDetector.h"

1
engines/mads/metaengine.cpp
View File

@ -30,7 +30,6 @@
#include "common/str-array.h"
#include "common/memstream.h"
#include "common/system.h"
#include "common/translation.h"
#include "graphics/surface.h"
#include "mads/events.h"

1
engines/neverhood/metaengine.cpp
View File

@ -24,7 +24,6 @@
#include "engines/advancedDetector.h"
#include "common/file.h"
#include "common/translation.h"
#include "neverhood/neverhood.h"
#include "neverhood/detection.h"

1
engines/sci/POTFILES
View File

@ -7,6 +7,7 @@ engines/sci/engine/kmisc.cpp
engines/sci/engine/savegame.cpp
engines/sci/graphics/controls32.cpp
engines/sci/graphics/video32.cpp
engines/sci/metaengine.cpp
engines/sci/resource.cpp
engines/sci/sci.cpp
engines/sci/sound/music.cpp

1
engines/scumm/POTFILES
View File

@ -2,6 +2,7 @@ engines/scumm/detection.cpp
engines/scumm/dialogs.cpp
engines/scumm/help.cpp
engines/scumm/input.cpp
engines/scumm/metaengine.cpp
engines/scumm/scumm.cpp
engines/scumm/players/player_v3m.cpp
engines/scumm/players/player_v5m.cpp

1
engines/sherlock/metaengine.cpp
View File

@ -26,7 +26,6 @@
#include "sherlock/tattoo/tattoo.h"
#include "common/system.h"
#include "common/translation.h"
#include "engines/advancedDetector.h"
#include "sherlock/detection.h"

1
engines/sky/POTFILES
View File

@ -1,2 +1,3 @@
engines/sky/compact.cpp
engines/sky/detection.cpp
engines/sky/metaengine.cpp

1
engines/supernova/metaengine.cpp
View File

@ -24,7 +24,6 @@
#include "common/file.h"
#include "common/gui_options.h"
#include "common/savefile.h"
#include "common/translation.h"
#include "common/system.h"
#include "graphics/thumbnail.h"
#include "engines/advancedDetector.h"

1
engines/sword2/POTFILES
View File

@ -1,2 +1,3 @@
engines/sword2/animation.cpp
engines/sword2/detection.cpp
engines/sword2/sword2.cpp

2
engines/toltecs/metaengine.cpp
View File

@ -24,7 +24,6 @@
#include "engines/advancedDetector.h"
#include "common/translation.h"
#include "common/savefile.h"
#include "common/str-array.h"
#include "common/system.h"
@ -187,4 +186,3 @@ SaveStateDescriptor ToltecsMetaEngine::querySaveMetaInfos(const char *target, in
#else
REGISTER_PLUGIN_STATIC(TOLTECS, PLUGIN_TYPE_ENGINE, ToltecsMetaEngine);
#endif

1
engines/twine/POTFILES Normal file
View File

@ -0,0 +1 @@
engines/twine/metaengine.cpp

1
engines/twine/twine.cpp
View File

@ -32,7 +32,6 @@
#include "common/stream.h"
#include "common/system.h"
#include "common/textconsole.h"
#include "common/translation.h"
#include "engines/metaengine.h"
#include "engines/util.h"
#include "graphics/colormasks.h"

1
engines/xeen/metaengine.cpp
View File

@ -28,7 +28,6 @@
#include "common/savefile.h"
#include "engines/advancedDetector.h"
#include "common/system.h"
#include "common/translation.h"
#include "xeen/detection.h"
#define MAX_SAVES 99

1
engines/zvision/POTFILES
View File

@ -1,4 +1,5 @@
engines/zvision/detection_tables.h
engines/zvision/detection.cpp
engines/zvision/file/save_manager.cpp
engines/zvision/metaengine.cpp
engines/zvision/zvision.cpp

4
po/POTFILES
View File

@ -40,6 +40,8 @@ engines/game.cpp
engines/metaengine.cpp
engines/savestate.cpp
graphics/renderer.cpp
audio/adlib.cpp
audio/fmopl.cpp
audio/mididrv.cpp
@ -68,6 +70,7 @@ backends/graphics/opengl/opengl-graphics.cpp
backends/graphics/openglsdl/openglsdl-graphics.cpp
backends/graphics/surfacesdl/surfacesdl-graphics.cpp
backends/graphics/sdl/sdl-graphics.cpp
backends/graphics3d/sdl/sdl-graphics3d.cpp
backends/keymapper/hardware-input.cpp
backends/keymapper/remap-widget.cpp
backends/keymapper/virtual-mouse.cpp
@ -87,6 +90,7 @@ backends/platform/3ds/osystem-events.cpp
backends/platform/ds/arm9/source/dsoptions.cpp
backends/platform/ds/arm9/source/scummhelp.cpp
backends/platform/ios7/ios7_osys_events.cpp
backends/platform/ios7/ios7_osys_main.cpp
backends/platform/iphone/osys_events.cpp
backends/platform/maemo/maemo.cpp
backends/platform/sdl/macosx/appmenu_osx.mm