X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FWordLangTuple.h;h=baf93385788f46486f57d2b4e617ee94bd6df407;hb=0a89b08f687dfeb7b687b54eab98ae18cc889883;hp=4802c2fb5560ed3d56cc051c94293b65dfba4c22;hpb=4506ec88ab5b0d6160b16f7329aab88c139b3c88;p=lyx.git diff --git a/src/WordLangTuple.h b/src/WordLangTuple.h index 4802c2fb55..baf9338578 100644 --- a/src/WordLangTuple.h +++ b/src/WordLangTuple.h @@ -12,6 +12,8 @@ #ifndef WORD_LANG_TUPLE_H #define WORD_LANG_TUPLE_H +#include "Language.h" + #include "support/docstring.h" @@ -19,17 +21,16 @@ namespace lyx { /** - * A word and its given language code ("en_US") - * plus a variety if needed. - * This is used for spellchecking. + * A word and its given language. + * This is used for spellchecking + * and thesaurus. */ class WordLangTuple { public: - WordLangTuple() {} + WordLangTuple() : lang_(0) {} - WordLangTuple(docstring const & w, std::string const & c, - std::string const & v = std::string()) - : word_(w), code_(c), variety_(v) + WordLangTuple(docstring const & w, Language const * l) + : word_(w), lang_(l) {} /// return the word @@ -38,22 +39,15 @@ public: } /// return its language code - std::string const & lang_code() const { - return code_; - } - - /// return the language variety - std::string const & lang_variety() const { - return variety_; + Language const * lang() const { + return lang_; } private: /// the word docstring word_; - /// language code of word - std::string code_; - /// language variety of word - std::string variety_; + /// language of word + Language const * lang_; };