X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fispell.C;h=ab7dfcb89cac694017d7e8c1f1b041f91fa76e28;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=ffe619e6b4a6b67c208f5e94420e1327d33f7c7b;hpb=aabd481ab63fd50606dd0d984c0b407e4b27e6a7;p=lyx.git

diff --git a/src/ispell.C b/src/ispell.C
index ffe619e6b4..ab7dfcb89c 100644
--- a/src/ispell.C
+++ b/src/ispell.C
@@ -32,6 +32,9 @@
 # include <sys/time.h>
 #endif
 
+
+namespace lyx {
+
 using boost::shared_ptr;
 
 #ifndef CXX_GLOBAL_CSTD
@@ -47,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,
@@ -158,9 +161,9 @@ int LaunchIspell::generateChild()
 	if (lyxrc.isp_use_input_encoding &&
 	    params.inputenc != "default") {
 		string enc = (params.inputenc == "auto")
-			? params.language->encoding()->LatexName()
+			? 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';
@@ -244,7 +247,7 @@ ISpell::ISpell(BufferParams const & params, string const & lang)
 	child_.reset(li);
 	if (li->start() == -1) {
 		error_ = _("Could not create an ispell process.\nYou may not have "
-			"the right languages installed.");
+					"the right languages installed.");
 		child_.reset(0);
 		return;
 	}
@@ -262,11 +265,11 @@ ISpell::ISpell(BufferParams const & params, string const & lang)
 		}
 
 		/* must have read something from stderr */
-		error_ = buf;
+		error_ =from_utf8(buf);
 	} else {
 		// select returned error
-		error_ = _("The spell process returned an error.\nPerhaps "
-				"it has been configured wrongly ?");
+		error_ = _("The ispell process returned an error.\nPerhaps "
+			   "it has been configured wrongly ?");
 	}
 
 	close(pipein[0]);
@@ -374,12 +377,12 @@ enum ISpell::Result ISpell::check(WordLangTuple const & word)
 	bool error = select(err_read);
 
 	if (error) {
-		error_ = _("Could not communicate with the spell-checker program.");
+		error_ = _("Could not communicate with the ispell spellchecker process.");
 		return UNKNOWN_WORD;
 	}
 
 	if (err_read) {
-		error_ = buf;
+		error_ = from_utf8(buf);
 		return UNKNOWN_WORD;
 	}
 
@@ -444,7 +447,10 @@ void ISpell::accept(WordLangTuple const & word)
 }
 
 
-string const ISpell::error()
+docstring const ISpell::error()
 {
 	return error_;
 }
+
+
+} // namespace lyx