X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fpspell.C;h=cd03873b4440ae13ca9fd192ba683580608b2013;hb=c4320d24cd2d29c2e77958b4a8fd44f2bd587ca7;hp=047f9d0e14e8026ff2b2faf162ced32a16061b72;hpb=fcdb71906b6f41dd5719608b1e57286037fc5f2c;p=lyx.git

diff --git a/src/pspell.C b/src/pspell.C
index 047f9d0e14..cd03873b44 100644
--- a/src/pspell.C
+++ b/src/pspell.C
@@ -11,8 +11,6 @@
 
 #include <config.h>
 
-#ifdef USE_PSPELL
-
 #include "debug.h"
 
 #define USE_ORIGINAL_MANAGER_FUNCS 1
@@ -24,9 +22,16 @@ extern "C" {
 #include "pspell.h"
 #include "WordLangTuple.h"
 
-using namespace lyx::support;
+#include <boost/assert.hpp>
+
+
+namespace lyx {
+
+using docstring;
 
 using std::endl;
+using std::string;
+
 
 PSpell::PSpell(BufferParams const &, string const & lang)
 	: els(0), spell_error_object(0)
@@ -81,7 +86,7 @@ void PSpell::addManager(string const & lang)
 
 enum PSpell::Result PSpell::check(WordLangTuple const & word)
 {
-	Result res = UNKNOWN;
+	Result res = UNKNOWN_WORD;
 
 	Managers::iterator it = managers_.find(word.lang_code());
 	if (it == managers_.end()) {
@@ -105,9 +110,9 @@ enum PSpell::Result PSpell::check(WordLangTuple const & word)
 		BOOST_ASSERT(sugs != 0);
 		els = pspell_word_list_elements(sugs);
 		if (pspell_word_list_empty(sugs))
-			res = UNKNOWN;
+			res = UNKNOWN_WORD;
 		else
-			res = MISSED;
+			res = SUGGESTED_WORDS;
 	}
 	return res;
 }
@@ -141,7 +146,7 @@ string const PSpell::nextMiss()
 }
 
 
-string const PSpell::error()
+docstring const PSpell::error()
 {
 	char const * err = 0;
 
@@ -154,4 +159,5 @@ string const PSpell::error()
 	return "";
 }
 
-#endif // USE_PSPELL
+
+} // namespace lyx