hopefully fix tex2lyx linking.

[lyx.git] / src / ispell.C

diff --git a/src/ispell.C b/src/ispell.C
index 85742611f2266076dcd62110b7e407687fba4010..ab7dfcb89cac694017d7e8c1f1b041f91fa76e28 100644 (file)
--- a/src/ispell.C
+++ b/src/ispell.C
@@ -32,7 +32,8 @@
 # include <sys/time.h>
 #endif
 
-using lyx::docstring;
+
+namespace lyx {
 
 using boost::shared_ptr;
 
@@ -49,8 +50,8 @@ using std::string;
 
 namespace {
 
-class LaunchIspell : public lyx::support::ForkedProcess {
-       typedef lyx::support::ForkedProcess ForkedProcess;
+class LaunchIspell : public support::ForkedProcess {
+       typedef support::ForkedProcess ForkedProcess;
 public:
        ///
        LaunchIspell(BufferParams const & p, string const & l,
@@ -162,7 +163,7 @@ int LaunchIspell::generateChild()
                string enc = (params.inputenc == "auto")
                        ? params.language->encoding()->latexName()
                        : params.inputenc;
-               string::size_type n = enc.length();
+               size_t const n = enc.length();
                tmp = new char[3];
                string("-T").copy(tmp, 2);
                tmp[2] = '\0';
@@ -264,11 +265,11 @@ ISpell::ISpell(BufferParams const & params, string const & lang)
                }
 
                /* must have read something from stderr */
-               error_ =lyx::from_utf8(buf);
+               error_ =from_utf8(buf);
        } else {
                // select returned error
                error_ = _("The ispell process returned an error.\nPerhaps "
-                                       "it has been configured wrongly ?"));
+                          "it has been configured wrongly ?");
        }
 
        close(pipein[0]);
@@ -376,12 +377,12 @@ enum ISpell::Result ISpell::check(WordLangTuple const & word)
        bool error = select(err_read);
 
        if (error) {
-               error_ = _("Could not communicate with the ispell spellchecker process."));
+               error_ = _("Could not communicate with the ispell spellchecker process.");
                return UNKNOWN_WORD;
        }
 
        if (err_read) {
-               error_ = lyx::from_utf8(buf);
+               error_ = from_utf8(buf);
                return UNKNOWN_WORD;
        }
 
@@ -450,3 +451,6 @@ docstring const ISpell::error()
 {
        return error_;
 }
+
+
+} // namespace lyx