From 432abc309b61343d6fedb44d661115d134fb5cb5 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Wed, 28 Sep 2011 19:45:07 +0000 Subject: [PATCH] Remove WITH_OLD_HUNSPELL. 1.2.0 is four years old and the configure script doesn't even support older versions that would require WITH_OLD_HUNSPELL Originally committed to SVN as r5618. --- aegisub/src/config/config_windows0.h | 3 --- aegisub/src/spellchecker_hunspell.cpp | 8 -------- 2 files changed, 11 deletions(-) diff --git a/aegisub/src/config/config_windows0.h b/aegisub/src/config/config_windows0.h index be8f75b2b..86994de0a 100644 --- a/aegisub/src/config/config_windows0.h +++ b/aegisub/src/config/config_windows0.h @@ -95,10 +95,7 @@ // Enable Hunspell-based spellchecker // Requires: hunspell (in repository for Win32) -// If you have an old version of Hunspell (that uses Hunspell::put_word() instead of Hunspell::add()), -// uncomment the second line as well. #define WITH_HUNSPELL -//#define WITH_OLD_HUNSPELL // Enable "final release" mode diff --git a/aegisub/src/spellchecker_hunspell.cpp b/aegisub/src/spellchecker_hunspell.cpp index 06b4a1ca9..6fffd7378 100644 --- a/aegisub/src/spellchecker_hunspell.cpp +++ b/aegisub/src/spellchecker_hunspell.cpp @@ -81,11 +81,7 @@ void HunspellSpellChecker::AddWord(wxString word) { std::string sword = STD_STR(word); // Add it to the in-memory dictionary -#ifdef WITH_OLD_HUNSPELL - hunspell->put_word(conv->Convert(sword).c_str()); -#else hunspell->add(conv->Convert(sword).c_str()); -#endif std::list words; @@ -235,11 +231,7 @@ void HunspellSpellChecker::SetLanguage(wxString language) { for (; userDic != end; ++userDic) { if (userDic->empty()) continue; try { -#ifdef WITH_OLD_HUNSPELL - hunspell->put_word(conv->Convert(*userDic).c_str()); -#else hunspell->add(conv->Convert(*userDic).c_str()); -#endif } catch (agi::charset::ConvError const&) { // Normally this shouldn't happen, but some versions of Aegisub