diff options
author | Johannes Schickel | 2010-06-26 18:07:41 +0000 |
---|---|---|
committer | Johannes Schickel | 2010-06-26 18:07:41 +0000 |
commit | 58fcda82f33e3ba8f813eeac412612ae09a34c9f (patch) | |
tree | 12d706da8a48a7a937e4dc2b5221010ba6613726 /common/translation.h | |
parent | 9a0e2e9c461547b1a2d8bf32a3e7ba52853358f5 (diff) | |
download | scummvm-rg350-58fcda82f33e3ba8f813eeac412612ae09a34c9f.tar.gz scummvm-rg350-58fcda82f33e3ba8f813eeac412612ae09a34c9f.tar.bz2 scummvm-rg350-58fcda82f33e3ba8f813eeac412612ae09a34c9f.zip |
Remove support for translation of console messages.
In recent discussions on -devel it turned out, that this
feature is rather superfluous and instead we should rather
implement a proper error reporting in our GUI.
I also removed the dependency on iconv along with this.
svn-id: r50335
Diffstat (limited to 'common/translation.h')
-rw-r--r-- | common/translation.h | 28 |
1 files changed, 4 insertions, 24 deletions
diff --git a/common/translation.h b/common/translation.h index c264eadfd9..0722ae44ae 100644 --- a/common/translation.h +++ b/common/translation.h @@ -28,10 +28,6 @@ #include "common/singleton.h" #include "common/str-array.h" -#ifdef USE_TERMCONV -#include <iconv.h> -#endif - namespace Common { enum TranslationIDs { @@ -60,17 +56,6 @@ typedef Array<TLanguage> TLangArray; * Message translation manager. */ class TranslationManager : public Singleton<TranslationManager> { -private: - Common::String _syslang; - -#ifdef USE_TERMCONV - iconv_t _conversion; - char *_convmsg; - int _sizeconv; - - bool convert(const char *message); -#endif // USE_TERMCONV - public: /** * The constructor detects the system language and sets default @@ -130,29 +115,24 @@ public: String getTranslation(const String &message); /** - * Converts the message into the terminal character set (which may be - * different than the GUI's "native" one). - */ - const char *convertTerm(const char *message); - - /** * Returns a list of supported languages. * * @return The list of supported languages. */ const TLangArray getSupportedLanguages() const; + +private: + Common::String _syslang; }; -} // End of namespace Common +} // End of namespace Common #define TransMan Common::TranslationManager::instance() #ifdef USE_TRANSLATION #define _(str) TransMan.getTranslation(str) -#define _t(str) TransMan.convertTerm(_(str)) #else #define _(str) str -#define _t(str) str #endif #define _s(str) str |