diff options
| author | OBATA Akio <obache@wizdas.com> | 2020-08-19 16:51:24 +0900 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2021-02-03 22:46:07 +0100 |
| commit | 2779387ef138410ef0e0db26ebe5af31b0719a45 (patch) | |
| tree | 3a02b0cecf61825c218fb14f2d46e3f6c7da3487 | |
| parent | 431ab46758091ea3b8aa133f161a35b312e627b7 (diff) | |
| download | tdelibs-2779387ef138410ef0e0db26ebe5af31b0719a45.tar.gz tdelibs-2779387ef138410ef0e0db26ebe5af31b0719a45.zip | |
Add an ability to specify default spell checker
There is no reason to determine it with operating system basis.
Change to use build configuration instead. "ispell" by default,
and you can override it.
Signed-off-by: OBATA Akio <obache@wizdas.com>
(cherry picked from commit 70d26004f065c5fd18be00cab17fc93ed231d849)
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | config.h.cmake | 3 | ||||
| -rw-r--r-- | kdeui/ksconfig.cpp | 6 |
3 files changed, 8 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9955a2a10..cfe804329 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1125,6 +1125,10 @@ if( WITH_HSPELL ) endif( WITH_HSPELL ) +####" default spell checker ##################### +set( DEFAULT_SPELL_CHECKER "ISPELL" CACHE STRING "default spell checker" ) + + ##### find tools path ########################### if( NOT WIN32 AND NOT ICEAUTH_PATH ) diff --git a/config.h.cmake b/config.h.cmake index 5104a9b15..ccec3aeb4 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -6,6 +6,9 @@ /* Define where aspell data dir is */ #define ASPELL_DATADIR "@ASPELL_DATADIR@" +/* Define default spell checker */ +#define DEFAULT_SPELL_CHECKER KS_CLIENT_@DEFAULT_SPELL_CHECKER@ + /* Avahi API 0.6 */ #cmakedefine HAVE_DNSSD 1 #cmakedefine AVAHI_API_0_6 1 diff --git a/kdeui/ksconfig.cpp b/kdeui/ksconfig.cpp index 7b58d5c33..7a5f77dfd 100644 --- a/kdeui/ksconfig.cpp +++ b/kdeui/ksconfig.cpp @@ -188,11 +188,7 @@ KSpellConfig::readGlobalSettings() setDictionary ( kc->readEntry("KSpell_Dictionary") ); setDictFromList ( kc->readNumEntry("KSpell_DictFromList", false) ); setEncoding ( kc->readNumEntry ("KSpell_Encoding", KS_E_UTF8) ); -#if defined(__OpenBSD__) || defined(__FreeBSD__) - setClient ( kc->readNumEntry ("KSpell_Client", KS_CLIENT_ASPELL) ); -#else - setClient ( kc->readNumEntry ("KSpell_Client", KS_CLIENT_ISPELL) ); -#endif + setClient ( kc->readNumEntry ("KSpell_Client", DEFAULT_SPELL_CHECKER) ); return true; } |