hopefully fix tex2lyx linking.

[lyx.git] / src / pspell.C

diff --git a/src/pspell.C b/src/pspell.C
index db0e3924eb7d3e9b7851d64286b5f4689fc5e346..cd03873b4440ae13ca9fd192ba683580608b2013 100644 (file)
--- 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,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)
@@ -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,19 +100,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());
-       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());
-               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;
 }
@@ -140,7 +146,7 @@ string const PSpell::nextMiss()
 }
 
 
-string const PSpell::error()
+docstring const PSpell::error()
 {
        char const * err = 0;
 
@@ -153,4 +159,5 @@ string const PSpell::error()
        return "";
 }
 
-#endif // USE_PSPELL
+
+} // namespace lyx