From 5936026209d289ef725c06b9f6253b8d7ac5d8b4 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Tue, 10 Nov 2020 02:57:47 +0100 Subject: [PATCH] ALL: Clarify POTFILES, remove redundant common/translations.h includes --- audio/musicplugin.cpp | 1 - backends/dialogs/morphos/morphos-dialogs.cpp | 31 +++++++++---------- .../graphics/psp2sdl/psp2sdl-graphics.cpp | 5 ++- backends/platform/android/jni-android.cpp | 1 - backends/platform/ios7/ios7_osys_misc.mm | 1 - .../platform/sdl/macosx/macosx_wrapper.mm | 1 - backends/platform/sdl/sdl.cpp | 1 - backends/platform/sdl/win32/win32_wrapper.cpp | 1 - backends/platform/symbian/src/SymbianOS.cpp | 3 +- backends/updates/win32/win32-updates.cpp | 1 - engines/bladerunner/metaengine.cpp | 1 - engines/cine/POTFILES | 1 + engines/dragons/POTFILES | 3 +- engines/glk/comprehend/comprehend.cpp | 1 - engines/glk/metaengine.cpp | 1 - engines/griffon/POTFILES | 2 +- engines/groovie/metaengine.cpp | 1 - engines/hdb/POTFILES | 1 + engines/hopkins/metaengine.cpp | 1 - engines/kyra/metaengine.cpp | 1 - engines/mads/metaengine.cpp | 1 - engines/neverhood/metaengine.cpp | 1 - engines/sci/POTFILES | 1 + engines/scumm/POTFILES | 1 + engines/sherlock/metaengine.cpp | 1 - engines/sky/POTFILES | 1 + engines/supernova/metaengine.cpp | 1 - engines/sword2/POTFILES | 1 + engines/toltecs/metaengine.cpp | 2 -- engines/twine/POTFILES | 1 + engines/twine/twine.cpp | 1 - engines/xeen/metaengine.cpp | 1 - engines/zvision/POTFILES | 1 + po/POTFILES | 4 +++ 34 files changed, 32 insertions(+), 45 deletions(-) create mode 100644 engines/twine/POTFILES diff --git a/audio/musicplugin.cpp b/audio/musicplugin.cpp index 50d6d1af1cf..bb6db07e223 100644 --- a/audio/musicplugin.cpp +++ b/audio/musicplugin.cpp @@ -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()), diff --git a/backends/dialogs/morphos/morphos-dialogs.cpp b/backends/dialogs/morphos/morphos-dialogs.cpp index 4ba308f0244..096b5ff5549 100644 --- a/backends/dialogs/morphos/morphos-dialogs.cpp +++ b/backends/dialogs/morphos/morphos-dialogs.cpp @@ -32,7 +32,6 @@ #include "common/config-manager.h" #include "common/encoding.h" -#include "common/translation.h" #include #include @@ -41,28 +40,28 @@ #include 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); diff --git a/backends/graphics/psp2sdl/psp2sdl-graphics.cpp b/backends/graphics/psp2sdl/psp2sdl-graphics.cpp index afe371ebf76..f0abc02e687 100644 --- a/backends/graphics/psp2sdl/psp2sdl-graphics.cpp +++ b/backends/graphics/psp2sdl/psp2sdl-graphics.cpp @@ -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); diff --git a/backends/platform/android/jni-android.cpp b/backends/platform/android/jni-android.cpp index 0855f7fb10a..352aae00602 100644 --- a/backends/platform/android/jni-android.cpp +++ b/backends/platform/android/jni-android.cpp @@ -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" diff --git a/backends/platform/ios7/ios7_osys_misc.mm b/backends/platform/ios7/ios7_osys_misc.mm index 6693715f158..f0e6067ec24 100644 --- a/backends/platform/ios7/ios7_osys_misc.mm +++ b/backends/platform/ios7/ios7_osys_misc.mm @@ -27,7 +27,6 @@ #include #include -#include "common/translation.h" #include "backends/platform/ios7/ios7_app_delegate.h" #include "backends/platform/ios7/ios7_video.h" diff --git a/backends/platform/sdl/macosx/macosx_wrapper.mm b/backends/platform/sdl/macosx/macosx_wrapper.mm index 353af498941..0b328848b41 100644 --- a/backends/platform/sdl/macosx/macosx_wrapper.mm +++ b/backends/platform/sdl/macosx/macosx_wrapper.mm @@ -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 diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp index 170d1daa802..8a2601fa6fc 100644 --- a/backends/platform/sdl/sdl.cpp +++ b/backends/platform/sdl/sdl.cpp @@ -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 diff --git a/backends/platform/sdl/win32/win32_wrapper.cpp b/backends/platform/sdl/win32/win32_wrapper.cpp index 2764453dc18..5629fd9be61 100644 --- a/backends/platform/sdl/win32/win32_wrapper.cpp +++ b/backends/platform/sdl/win32/win32_wrapper.cpp @@ -29,7 +29,6 @@ #include #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, diff --git a/backends/platform/symbian/src/SymbianOS.cpp b/backends/platform/symbian/src/SymbianOS.cpp index a5d74debec5..023567ecbee 100644 --- a/backends/platform/symbian/src/SymbianOS.cpp +++ b/backends/platform/symbian/src/SymbianOS.cpp @@ -31,7 +31,7 @@ #include // 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" diff --git a/backends/updates/win32/win32-updates.cpp b/backends/updates/win32/win32-updates.cpp index 868f5d886b2..74964319510 100644 --- a/backends/updates/win32/win32-updates.cpp +++ b/backends/updates/win32/win32-updates.cpp @@ -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 diff --git a/engines/bladerunner/metaengine.cpp b/engines/bladerunner/metaengine.cpp index 00be0f73c22..1a358b48c1d 100644 --- a/engines/bladerunner/metaengine.cpp +++ b/engines/bladerunner/metaengine.cpp @@ -28,7 +28,6 @@ #include "common/system.h" #include "common/savefile.h" #include "common/serializer.h" -#include "common/translation.h" #include "engines/advancedDetector.h" diff --git a/engines/cine/POTFILES b/engines/cine/POTFILES index e4c1365baae..9343ecdba40 100644 --- a/engines/cine/POTFILES +++ b/engines/cine/POTFILES @@ -1,3 +1,4 @@ engines/cine/detection.cpp +engines/cine/metaengine.cpp engines/cine/saveload.cpp engines/cine/various.cpp diff --git a/engines/dragons/POTFILES b/engines/dragons/POTFILES index 40153966183..52f00f1ce11 100644 --- a/engines/dragons/POTFILES +++ b/engines/dragons/POTFILES @@ -1,3 +1,2 @@ -engines/dragons/detection.cpp engines/dragons/dragons.cpp -engines/dragons/detection.cpp +engines/dragons/metaengine.cpp diff --git a/engines/glk/comprehend/comprehend.cpp b/engines/glk/comprehend/comprehend.cpp index 882587a29db..0f143de6fa0 100644 --- a/engines/glk/comprehend/comprehend.cpp +++ b/engines/glk/comprehend/comprehend.cpp @@ -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" diff --git a/engines/glk/metaengine.cpp b/engines/glk/metaengine.cpp index 9017e224dd1..9a379670727 100644 --- a/engines/glk/metaengine.cpp +++ b/engines/glk/metaengine.cpp @@ -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 diff --git a/engines/griffon/POTFILES b/engines/griffon/POTFILES index 9d37047ac48..946a5619b63 100644 --- a/engines/griffon/POTFILES +++ b/engines/griffon/POTFILES @@ -1,2 +1,2 @@ engines/griffon/griffon.cpp -engines/griffon/detection.cpp +engines/griffon/metaengine.cpp diff --git a/engines/groovie/metaengine.cpp b/engines/groovie/metaengine.cpp index 1361d04a661..ad457c0d543 100644 --- a/engines/groovie/metaengine.cpp +++ b/engines/groovie/metaengine.cpp @@ -24,7 +24,6 @@ #include "groovie/saveload.h" #include "common/system.h" -#include "common/translation.h" #include "engines/advancedDetector.h" #include "groovie/detection.h" diff --git a/engines/hdb/POTFILES b/engines/hdb/POTFILES index 5b8afe7d370..e3c185bd1f8 100644 --- a/engines/hdb/POTFILES +++ b/engines/hdb/POTFILES @@ -1 +1,2 @@ engines/hdb/detection.cpp +engines/hdb/metaengine.cpp diff --git a/engines/hopkins/metaengine.cpp b/engines/hopkins/metaengine.cpp index fdd0d09f582..d3f9d8a50de 100644 --- a/engines/hopkins/metaengine.cpp +++ b/engines/hopkins/metaengine.cpp @@ -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" diff --git a/engines/kyra/metaengine.cpp b/engines/kyra/metaengine.cpp index 4813f796238..2b2885c6793 100644 --- a/engines/kyra/metaengine.cpp +++ b/engines/kyra/metaengine.cpp @@ -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" diff --git a/engines/mads/metaengine.cpp b/engines/mads/metaengine.cpp index 227708c555f..aef4e838c5f 100644 --- a/engines/mads/metaengine.cpp +++ b/engines/mads/metaengine.cpp @@ -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" diff --git a/engines/neverhood/metaengine.cpp b/engines/neverhood/metaengine.cpp index 28992aedc34..ffdb77914e1 100644 --- a/engines/neverhood/metaengine.cpp +++ b/engines/neverhood/metaengine.cpp @@ -24,7 +24,6 @@ #include "engines/advancedDetector.h" #include "common/file.h" -#include "common/translation.h" #include "neverhood/neverhood.h" #include "neverhood/detection.h" diff --git a/engines/sci/POTFILES b/engines/sci/POTFILES index 801ddffe6d0..e6fe9845c79 100644 --- a/engines/sci/POTFILES +++ b/engines/sci/POTFILES @@ -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 diff --git a/engines/scumm/POTFILES b/engines/scumm/POTFILES index bdd18b65fad..15437d11f74 100644 --- a/engines/scumm/POTFILES +++ b/engines/scumm/POTFILES @@ -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 diff --git a/engines/sherlock/metaengine.cpp b/engines/sherlock/metaengine.cpp index 6ce20297359..7838cc5a06e 100644 --- a/engines/sherlock/metaengine.cpp +++ b/engines/sherlock/metaengine.cpp @@ -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" diff --git a/engines/sky/POTFILES b/engines/sky/POTFILES index 6c39f82e754..d6b59779216 100644 --- a/engines/sky/POTFILES +++ b/engines/sky/POTFILES @@ -1,2 +1,3 @@ engines/sky/compact.cpp engines/sky/detection.cpp +engines/sky/metaengine.cpp diff --git a/engines/supernova/metaengine.cpp b/engines/supernova/metaengine.cpp index 855a92d7691..ba63e096fe4 100644 --- a/engines/supernova/metaengine.cpp +++ b/engines/supernova/metaengine.cpp @@ -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" diff --git a/engines/sword2/POTFILES b/engines/sword2/POTFILES index 94ad7209899..e08c96b4c73 100644 --- a/engines/sword2/POTFILES +++ b/engines/sword2/POTFILES @@ -1,2 +1,3 @@ engines/sword2/animation.cpp +engines/sword2/detection.cpp engines/sword2/sword2.cpp diff --git a/engines/toltecs/metaengine.cpp b/engines/toltecs/metaengine.cpp index d47df0d1295..788323f0f85 100644 --- a/engines/toltecs/metaengine.cpp +++ b/engines/toltecs/metaengine.cpp @@ -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 - diff --git a/engines/twine/POTFILES b/engines/twine/POTFILES new file mode 100644 index 00000000000..58e35e612f0 --- /dev/null +++ b/engines/twine/POTFILES @@ -0,0 +1 @@ +engines/twine/metaengine.cpp diff --git a/engines/twine/twine.cpp b/engines/twine/twine.cpp index 4b71e487079..c56f295f8a5 100644 --- a/engines/twine/twine.cpp +++ b/engines/twine/twine.cpp @@ -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" diff --git a/engines/xeen/metaengine.cpp b/engines/xeen/metaengine.cpp index 44119b3bf4c..77e38a282db 100644 --- a/engines/xeen/metaengine.cpp +++ b/engines/xeen/metaengine.cpp @@ -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 diff --git a/engines/zvision/POTFILES b/engines/zvision/POTFILES index 48188f0322d..cbac3ad2df0 100644 --- a/engines/zvision/POTFILES +++ b/engines/zvision/POTFILES @@ -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 diff --git a/po/POTFILES b/po/POTFILES index 75036dfa722..1eb00963711 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -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