X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FWordLangTuple.h;h=6459c46f8faa18eaba2d3540863d9fa5235fbd16;hb=fbc64ea7ee115bdc4a55c214f28de2166d71f6a2;hp=4802c2fb5560ed3d56cc051c94293b65dfba4c22;hpb=4506ec88ab5b0d6160b16f7329aab88c139b3c88;p=lyx.git

diff --git a/src/WordLangTuple.h b/src/WordLangTuple.h
index 4802c2fb55..6459c46f8f 100644
--- a/src/WordLangTuple.h
+++ b/src/WordLangTuple.h
@@ -12,24 +12,27 @@
 #ifndef WORD_LANG_TUPLE_H
 #define WORD_LANG_TUPLE_H
 
+#include "Language.h"
+
 #include "support/docstring.h"
 
+#include <vector>
+
 
 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,25 +41,21 @@ 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_;
 };
 
 
+typedef std::vector<WordLangTuple> WordLangTable;
+
+
 } // namespace lyx
 
 #endif // WORD_LANG_TUPLE_H