X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fpspell.C;h=9ca0feaeeec9882301fdbf6d0324c938943158b4;hb=d13d6da879462707cd947cdf00c0cf7c3dfac924;hp=db0e3924eb7d3e9b7851d64286b5f4689fc5e346;hpb=92d522b7f1be6046adcac062c558bbf0bf021612;p=lyx.git diff --git a/src/pspell.C b/src/pspell.C index db0e3924eb..9ca0feaeee 100644 --- a/src/pspell.C +++ b/src/pspell.C @@ -1,17 +1,18 @@ /** * \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 + * \author John Levon + * + * Full author contact details are available in file CREDITS. */ #include #ifdef USE_PSPELL -#include "support/LAssert.h" #include "debug.h" #define USE_ORIGINAL_MANAGER_FUNCS 1 @@ -23,9 +24,11 @@ extern "C" { #include "pspell.h" #include "WordLangTuple.h" -using namespace lyx::support; +#include using std::endl; +using std::string; + PSpell::PSpell(BufferParams const &, string const & lang) : els(0), spell_error_object(0) @@ -80,7 +83,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 +97,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; }