diff options
Diffstat (limited to 'src/utils/translation')
-rw-r--r-- | src/utils/translation/podict.cpp | 2 | ||||
-rw-r--r-- | src/utils/translation/podict.h | 4 | ||||
-rw-r--r-- | src/utils/translation/poparser_unittest.cc | 5 | ||||
-rw-r--r-- | src/utils/translation/translationmanager.cpp | 2 | ||||
-rw-r--r-- | src/utils/translation/translationmanager.h | 2 |
5 files changed, 8 insertions, 7 deletions
diff --git a/src/utils/translation/podict.cpp b/src/utils/translation/podict.cpp index ba199a6d6..400583e80 100644 --- a/src/utils/translation/podict.cpp +++ b/src/utils/translation/podict.cpp @@ -27,7 +27,7 @@ std::string empty; PoDict *translator = nullptr; #ifdef ENABLE_CUSTOMNLS PoDict *mainTranslator = nullptr; -#endif +#endif // ENABLE_CUSTOMNLS PoDict::PoDict(std::string lang) : mPoLines(), diff --git a/src/utils/translation/podict.h b/src/utils/translation/podict.h index 73948aeb4..b9a63258e 100644 --- a/src/utils/translation/podict.h +++ b/src/utils/translation/podict.h @@ -43,7 +43,7 @@ class PoDict final #ifndef UNITTESTS protected: -#endif +#endif // UNITTESTS friend class PoParser; PoMap *getMap() @@ -63,6 +63,6 @@ class PoDict final extern PoDict *translator; #ifdef ENABLE_CUSTOMNLS extern PoDict *mainTranslator; -#endif +#endif // ENABLE_CUSTOMNLS #endif // UTILS_TRANSLATION_PODICT_H diff --git a/src/utils/translation/poparser_unittest.cc b/src/utils/translation/poparser_unittest.cc index d75088ee2..a016c7a86 100644 --- a/src/utils/translation/poparser_unittest.cc +++ b/src/utils/translation/poparser_unittest.cc @@ -55,9 +55,10 @@ TEST_CASE("PoParser tests", "PoParser") SDLImageHelper::setRenderer(graphicsManager.createRenderer( graphicsManager.createWindow(640, 480, 0, SDL_WINDOW_SHOWN | SDL_SWSURFACE), SDL_RENDERER_SOFTWARE)); -#else +#else // USE_SDL2 + graphicsManager.createWindow(640, 480, 0, SDL_ANYFORMAT | SDL_SWSURFACE); -#endif +#endif // USE_SDL2 ActorSprite::load(); diff --git a/src/utils/translation/translationmanager.cpp b/src/utils/translation/translationmanager.cpp index 4fa233990..022397401 100644 --- a/src/utils/translation/translationmanager.cpp +++ b/src/utils/translation/translationmanager.cpp @@ -50,7 +50,7 @@ void TranslationManager::loadGettextLang() delete mainTranslator; mainTranslator = loadLang(getLang(), "manaplus/"); } -#endif +#endif // ENABLE_CUSTOMNLS void TranslationManager::close() { diff --git a/src/utils/translation/translationmanager.h b/src/utils/translation/translationmanager.h index e228b1e75..29cb5d2d7 100644 --- a/src/utils/translation/translationmanager.h +++ b/src/utils/translation/translationmanager.h @@ -43,7 +43,7 @@ class TranslationManager final #ifdef ENABLE_CUSTOMNLS static void loadGettextLang(); -#endif +#endif // ENABLE_CUSTOMNLS static bool translateFile(const std::string &fileName, PoDict *const dict, |