X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FWordLangTuple.h;h=6459c46f8faa18eaba2d3540863d9fa5235fbd16;hb=8f43f83ddfbe6adbb04a2ba86e62797c0a313324;hp=e0a1d8eed4c3670afc93e449dfeeb81e236a5ef8;hpb=236ea81bc5c0ce7101c9460d1ee97b8f3c9be9df;p=lyx.git

diff --git a/src/WordLangTuple.h b/src/WordLangTuple.h
index e0a1d8eed4..6459c46f8f 100644
--- a/src/WordLangTuple.h
+++ b/src/WordLangTuple.h
@@ -12,35 +12,50 @@
 #ifndef WORD_LANG_TUPLE_H
 #define WORD_LANG_TUPLE_H
 
-#include "support/std_string.h"
+#include "Language.h"
+
+#include "support/docstring.h"
+
+#include <vector>
+
+
+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(string const & w, string const & c)
-		: word_(w), code_(c)
+	WordLangTuple(docstring const & w, Language const * l)
+		: word_(w), lang_(l)
 	{}
 
 	/// return the word
-	string const & word() const {
+	docstring const & word() const {
 		return word_;
 	}
 
 	/// return its language code
-	string const & lang_code() const {
-		return code_;
+	Language const * lang() const {
+		return lang_;
 	}
 
 private:
 	/// the word
-	string word_;
-	/// language code of word
-	string code_;
+	docstring word_;
+	/// language of word
+	Language const * lang_;
 };
 
+
+typedef std::vector<WordLangTuple> WordLangTable;
+
+
+} // namespace lyx
+
 #endif // WORD_LANG_TUPLE_H