X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fpspell.C;h=f7122650ba6eafa317d065efd8cf8bda9c8f961b;hb=9ee46b846e5e84ad40ceda4f4af94aeb86cd90a2;hp=832b3c1b51effd617a6b9c0978e032558bc70023;hpb=47c34c3afa59b030a4578c82fea46d926e0c0c66;p=lyx.git

diff --git a/src/pspell.C b/src/pspell.C
index 832b3c1b51..f7122650ba 100644
--- a/src/pspell.C
+++ b/src/pspell.C
@@ -1,17 +1,16 @@
 /**
  * \file pspell.C
- * Copyright 2001 the LyX Team
- * Read the file COPYING
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
  * \author Kevin Atkinson
- * \author John Levon <levon@movementarian.org>
+ * \author John Levon
+ *
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
-#ifdef USE_PSPELL
-
-#include "support/LAssert.h"
 #include "debug.h"
 
 #define USE_ORIGINAL_MANAGER_FUNCS 1
@@ -23,7 +22,11 @@ extern "C" {
 #include "pspell.h"
 #include "WordLangTuple.h"
 
+#include <boost/assert.hpp>
+
 using std::endl;
+using std::string;
+
 
 PSpell::PSpell(BufferParams const &, string const & lang)
 	: els(0), spell_error_object(0)
@@ -78,7 +81,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()) {
@@ -92,19 +95,19 @@ enum PSpell::Result PSpell::check(WordLangTuple const & word)
 	PspellManager * m = it->second.manager;
 
 	int word_ok = pspell_manager_check(m, word.word().c_str());
-	lyx::Assert(word_ok != -1);
+	BOOST_ASSERT(word_ok != -1);
 
 	if (word_ok) {
 		res = OK;
 	} else {
 		PspellWordList const * sugs =
 			pspell_manager_suggest(m, word.word().c_str());
-		lyx::Assert(sugs != 0);
+		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;
 }
@@ -150,5 +153,3 @@ string const PSpell::error()
 		return err;
 	return "";
 }
-
-#endif // USE_PSPELL