Remove all uses of Q_WS_* macros

[lyx.git] / src / WordLangTuple.h

diff --git a/src/WordLangTuple.h b/src/WordLangTuple.h
index b1a31bd90d27509345d2168604cd7239f49f1857..6459c46f8faa18eaba2d3540863d9fa5235fbd16 100644 (file)
--- a/src/WordLangTuple.h
+++ b/src/WordLangTuple.h
@@ -12,22 +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").
- * 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)
-               : word_(w), code_(c)
+       WordLangTuple(docstring const & w, Language const * l)
+               : word_(w), lang_(l)
        {}
 
        /// return the word
@@ -36,18 +41,21 @@ public:
        }
 
        /// return its language code
-       std::string const & lang_code() const {
-               return code_;
+       Language const * lang() const {
+               return lang_;
        }
 
 private:
        /// the word
        docstring word_;
-       /// language code of word
-       std::string code_;
+       /// language of word
+       Language const * lang_;
 };
 
 
+typedef std::vector<WordLangTuple> WordLangTable;
+
+
 } // namespace lyx
 
 #endif // WORD_LANG_TUPLE_H