More 'standard conformant blurb' nonsense.

[lyx.git] / src / pspell.C

diff --git a/src/pspell.C b/src/pspell.C
index 1285769e5eb383a93f284483f8d432f5b3cd40af..db0e3924eb7d3e9b7851d64286b5f4689fc5e346 100644 (file)
--- a/src/pspell.C
+++ b/src/pspell.C
@@ -9,13 +9,10 @@
 
 #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 +23,41 @@ extern "C" {
 #include "pspell.h"
 #include "WordLangTuple.h"
 
+using namespace lyx::support;
+
+using std::endl;
+
 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();
@@ -94,14 +94,14 @@ 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);
+       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);
+               Assert(sugs != 0);
                els = pspell_word_list_elements(sugs);
                if (pspell_word_list_empty(sugs))
                        res = UNKNOWN;
@@ -112,17 +112,6 @@ enum PSpell::Result PSpell::check(WordLangTuple const & word)
 }
 
 
-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());