Fix PDF output of clipped graphics with recent graphics package

[lyx.git] / src / WordLangTuple.h

diff --git a/src/WordLangTuple.h b/src/WordLangTuple.h
index 9e2232bd3d1b199c1c0e63b22a7f23ba8300dd77..baf93385788f46486f57d2b4e617ee94bd6df407 100644 (file)
--- a/src/WordLangTuple.h
+++ b/src/WordLangTuple.h
@@ -12,39 +12,42 @@
 #ifndef WORD_LANG_TUPLE_H
 #define WORD_LANG_TUPLE_H
 
-#include <string>
+#include "Language.h"
+
+#include "support/docstring.h"
 
 
 namespace lyx {
 
 
 /**
- * A word and its given language code ("en_US").
- * 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(std::string const & w, std::string const & c)
-               : word_(w), code_(c)
+       WordLangTuple(docstring const & w, Language const * l)
+               : word_(w), lang_(l)
        {}
 
        /// return the word
-       std::string const & word() const {
+       docstring const & word() const {
                return word_;
        }
 
        /// return its language code
-       std::string const & lang_code() const {
-               return code_;
+       Language const * lang() const {
+               return lang_;
        }
 
 private:
        /// the word
-       std::string word_;
-       /// language code of word
-       std::string code_;
+       docstring word_;
+       /// language of word
+       Language const * lang_;
 };