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

diff --git a/src/pspell.C b/src/pspell.C
index 1285769e5e..cd03873b44 100644
--- a/src/pspell.C
+++ b/src/pspell.C
@@ -1,21 +1,17 @@
 /**
  * \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 __GNUG__
-#pragma implementation
-#endif
-
-#ifdef USE_PSPELL
-
-#include "support/LAssert.h"
+#include "debug.h"
 
 #define USE_ORIGINAL_MANAGER_FUNCS 1
 // new aspell pspell missing extern "C"
@@ -26,38 +22,48 @@ extern "C" {
 #include "pspell.h"
 #include "WordLangTuple.h"
 
+#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)
 {
 	addManager(lang);
+	lyxerr[Debug::GUI] << "created pspell" << endl;
 }
 
 
 PSpell::~PSpell()
 {
-	cleanUp();
-	close();
+	lyxerr[Debug::GUI] << "killed pspell" << endl;
+
+	if (spell_error_object) {
+		delete_pspell_can_have_error(spell_error_object);
+		spell_error_object = 0;
+	}
+
 	if (els)
 		delete_pspell_string_emulation(els);
+
 	Managers::iterator it = managers_.begin();
 	Managers::iterator end = managers_.end();
 
 	for (; it != end; ++it) {
+		pspell_manager_save_all_word_lists(it->second.manager);
 		delete_pspell_manager(it->second.manager);
 		delete_pspell_config(it->second.config);
 	}
 }
 
 
-void PSpell::cleanUp()
-{
-	if (spell_error_object) {
-		delete_pspell_can_have_error(spell_error_object);
-		spell_error_object = 0;
-	}
-}
-
-
 void PSpell::addManager(string const & lang)
 {
 	PspellConfig * config = new_pspell_config();
@@ -80,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()) {
@@ -94,35 +100,24 @@ 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;
 }
 
 
-void PSpell::close()
-{
-	Managers::iterator it = managers_.begin();
-	Managers::iterator end = managers_.end();
-
-	for (; it != end; ++it) {
-		pspell_manager_save_all_word_lists(it->second.manager);
-	}
-}
-
-
 void PSpell::insert(WordLangTuple const & word)
 {
 	Managers::iterator it = managers_.find(word.lang_code());
@@ -151,7 +146,7 @@ string const PSpell::nextMiss()
 }
 
 
-string const PSpell::error()
+docstring const PSpell::error()
 {
 	char const * err = 0;
 
@@ -164,4 +159,5 @@ string const PSpell::error()
 	return "";
 }
 
-#endif // USE_PSPELL
+
+} // namespace lyx