X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FAspellChecker.cpp;h=8e41765e3d70bb302adc14504a4582935f17466c;hb=0a89b08f687dfeb7b687b54eab98ae18cc889883;hp=96a8f8e73c5d76f625490afd2309a0bf871cb1da;hpb=e30f3d76d2bee0011ceaeb5f0cc221156458cbad;p=lyx.git diff --git a/src/AspellChecker.cpp b/src/AspellChecker.cpp index 96a8f8e73c..8e41765e3d 100644 --- a/src/AspellChecker.cpp +++ b/src/AspellChecker.cpp @@ -124,7 +124,6 @@ struct AspellChecker::Private { return "/lib/aspell-0.60"; } - }; @@ -146,7 +145,7 @@ AspellChecker::Private::~Private() LangPersonalWordList::const_iterator pdet = personal_.end(); for (; pdit != pdet; ++pdit) { - if ( 0 == pdit->second) + if (0 == pdit->second) continue; PersonalWordList * pd = pdit->second; pd->save(); @@ -186,7 +185,7 @@ bool AspellChecker::Private::checkAspellData(AspellConfig * config, string const & lang, string const & variety) { FileName base(basepath); - bool have_dict = base.isDirectory() ; + bool have_dict = base.isDirectory(); if (have_dict) { FileName data(addPath(base.absFileName(), datapath)); @@ -200,7 +199,7 @@ bool AspellChecker::Private::checkAspellData(AspellConfig * config, have_dict = isValidDictionary(config, lang, variety); } } - return have_dict ; + return have_dict; } @@ -208,8 +207,8 @@ AspellConfig * AspellChecker::Private::getConfig(string const & lang, string con { AspellConfig * config = new_aspell_config(); bool have_dict = false; - string const sysdir = lyx::support::package().system_support().absFileName() ; - string const userdir = lyx::support::package().user_support().absFileName() ; + string const sysdir = lyx::support::package().system_support().absFileName(); + string const userdir = lyx::support::package().user_support().absFileName(); LYXERR(Debug::FILES, "aspell user dir: " << userdir); have_dict = checkAspellData(config, userdir, dataDirectory(), dictDirectory(), lang, variety); @@ -221,14 +220,14 @@ AspellConfig * AspellChecker::Private::getConfig(string const & lang, string con // check for package data of OS installation checkAspellData(config, osPackageBase(), osPackageDataDirectory(), osPackageDictDirectory(), lang, variety); } - return config ; + return config; } void AspellChecker::Private::addToSession(AspellCanHaveError * speller, docstring const & word) { string const word_to_add = toAspellWord(word); - if(1 != aspell_speller_add_to_session(to_aspell_speller(speller), word_to_add.c_str(), -1)) + if (1 != aspell_speller_add_to_session(to_aspell_speller(speller), word_to_add.c_str(), -1)) LYXERR(Debug::GUI, "aspell add to session: " << aspell_error_message(speller)); } @@ -367,7 +366,7 @@ SpellChecker::Result AspellChecker::Private::check( result = (word_ok) ? WORD_OK : UNKNOWN_WORD; if (rest.empty()) break; - rest = split(rest,w1,'-'); + rest = split(rest, w1, '-'); } if (result == WORD_OK) return result; @@ -431,7 +430,6 @@ AspellChecker::~AspellChecker() SpellChecker::Result AspellChecker::check(WordLangTuple const & word) { - AspellSpeller * m = d->speller(word.lang()); if (!m)