move definition of variables to the main cmake file

[lyx.git] / src / aspell.C

diff --git a/src/aspell.C b/src/aspell.C
index 4541ea01eba6576bda65f1153d75758b4130dd9a..1d711a3bf40e9e92add4fb09534f89ef8c142419 100644 (file)
--- a/src/aspell.C
+++ b/src/aspell.C
@@ -11,8 +11,6 @@
 
 #include <config.h>
 
-#ifdef USE_ASPELL
-
 #include "debug.h"
 
 #include <aspell.h>
@@ -22,6 +20,8 @@
 
 #include <boost/assert.hpp>
 
+using lyx::docstring;
+
 using std::string;
 
 
@@ -73,9 +73,9 @@ void ASpell::addSpeller(string const & lang)
 }
 
 
-enum ASpell::Result ASpell::check(WordLangTuple const & word)
+ASpell::Result ASpell::check(WordLangTuple const & word)
 {
-       Result res = UNKNOWN;
+       Result res = UNKNOWN_WORD;
 
        Spellers::iterator it = spellers_.find(word.lang_code());
        if (it == spellers_.end()) {
@@ -88,7 +88,7 @@ enum ASpell::Result ASpell::check(WordLangTuple const & word)
 
        AspellSpeller * m = it->second.speller;
 
-       int word_ok = aspell_speller_check(m, word.word().c_str(), -1);
+       int const word_ok = aspell_speller_check(m, word.word().c_str(), -1);
        BOOST_ASSERT(word_ok != -1);
 
        if (word_ok) {
@@ -99,9 +99,9 @@ enum ASpell::Result ASpell::check(WordLangTuple const & word)
                BOOST_ASSERT(sugs != 0);
                els = aspell_word_list_elements(sugs);
                if (aspell_word_list_empty(sugs))
-                       res = UNKNOWN;
+                       res = UNKNOWN_WORD;
                else
-                       res = MISSED;
+                       res = SUGGESTED_WORDS;
        }
        return res;
 }
@@ -129,23 +129,18 @@ string const ASpell::nextMiss()
 
        if (els)
                str = aspell_string_enumeration_next(els);
-       if (str)
-               return str;
-       return "";
+
+       return (str ? str : "");
 }
 
 
-string const ASpell::error()
+docstring const ASpell::error()
 {
        char const * err = 0;
-
+       
        if (spell_error_object && aspell_error_number(spell_error_object) != 0) {
                err = aspell_error_message(spell_error_object);
        }
 
-       if (err)
-               return err;
-       return "";
+       return (err ? lyx::from_utf8(err) : docstring());
 }
-
-#endif // USE_ASPELL