enable building of shared libraries. reduces final linktime. also combine boost stuff...

[lyx.git] / src / WordLangTuple.h

diff --git a/src/WordLangTuple.h b/src/WordLangTuple.h
index 22ac67aec2deb4fec75069010c6142f4c600cedd..b1a31bd90d27509345d2168604cd7239f49f1857 100644 (file)
--- a/src/WordLangTuple.h
+++ b/src/WordLangTuple.h
@@ -12,7 +12,11 @@
 #ifndef WORD_LANG_TUPLE_H
 #define WORD_LANG_TUPLE_H
 
-#include "LString.h"
+#include "support/docstring.h"
+
+
+namespace lyx {
+
 
 /**
  * A word and its given language code ("en_US").
@@ -22,25 +26,28 @@ class WordLangTuple {
 public:
        WordLangTuple() {}
 
-       WordLangTuple(string const & w, string const & c)
+       WordLangTuple(docstring const & w, std::string const & c)
                : word_(w), code_(c)
        {}
 
        /// return the word
-       string const & word() const {
+       docstring const & word() const {
                return word_;
        }
 
        /// return its language code
-       string const & lang_code() const {
+       std::string const & lang_code() const {
                return code_;
        }
 
 private:
        /// the word
-       string word_;
+       docstring word_;
        /// language code of word
-       string code_;
+       std::string code_;
 };
 
+
+} // namespace lyx
+
 #endif // WORD_LANG_TUPLE_H