diff options
| author | Slávek Banko <[email protected]> | 2019-01-12 15:46:13 +0100 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2019-01-12 17:36:42 +0100 |
| commit | fed195cae2cb376b3205e176f7a61c401bf00ace (patch) | |
| tree | 85a78fcd94d1dd6dd1a20a23da466bc4dd5a62ab | |
| parent | f938ddefb96507d85e76252b1824772172ee0a19 (diff) | |
| download | tdeio-sword-fed195cae2cb376b3205e176f7a61c401bf00ace.tar.gz tdeio-sword-fed195cae2cb376b3205e176f7a61c401bf00ace.zip | |
Added controlled conversions to char* instead of automatic ascii conversions.
The definition of -UTQT_NO_ASCII_CAST is no longer needed.
Signed-off-by: Slávek Banko <[email protected]>
(cherry picked from commit 374417024147717d195e1830bb72d057995b0aa8)
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/ks_gbfhtml.cpp | 2 | ||||
| -rw-r--r-- | src/renderer.cpp | 4 | ||||
| -rw-r--r-- | src/tdeio_sword.cpp | 16 |
4 files changed, 12 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 946da7a..159c47c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,7 +58,7 @@ include( ConfigureChecks.cmake ) ###### global compiler settings -add_definitions( -DHAVE_CONFIG_H -UQT_NO_ASCII_CAST ) +add_definitions( -DHAVE_CONFIG_H ) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" ) set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" ) diff --git a/src/ks_gbfhtml.cpp b/src/ks_gbfhtml.cpp index 6342ba4..f8f2a8d 100644 --- a/src/ks_gbfhtml.cpp +++ b/src/ks_gbfhtml.cpp @@ -159,7 +159,7 @@ namespace KioSword { else if (!strcmp(tag.getName(), "RX")) { buf += "<a href=\""; - buf += swordUrlForSearch(DEFBIBLE, token + 3, m_swordoptions); + buf += swordUrlForSearch(DEFBIBLE, token + 3, m_swordoptions).utf8(); /* FIXME - restore this, work out what it does for (tok = token + 3; *tok; tok++) { diff --git a/src/renderer.cpp b/src/renderer.cpp index 2fa180f..5a11e6a 100644 --- a/src/renderer.cpp +++ b/src/renderer.cpp @@ -150,7 +150,7 @@ namespace KioSword else setGlobalOption("Variants", "Primary Readings"); - LocaleMgr::getSystemLocaleMgr()->setDefaultLocaleName(options.locale()); + LocaleMgr::getSystemLocaleMgr()->setDefaultLocaleName(options.locale().latin1()); } /** Return an HTML hyperlinked list of all modules, @@ -481,7 +481,7 @@ namespace KioSword doindex = true; break; } - lk = vk->ParseVerseList(ref, "Genesis 1:1", true); + lk = vk->ParseVerseList(ref.utf8(), "Genesis 1:1", true); if (lk.Count() == 0) { text += "<p class=\"error\">" + i18n("Couldn't find reference '%1'.").arg(ref) + "</p>"; doindex = true; diff --git a/src/tdeio_sword.cpp b/src/tdeio_sword.cpp index 4702b9c..0e244e2 100644 --- a/src/tdeio_sword.cpp +++ b/src/tdeio_sword.cpp @@ -327,30 +327,30 @@ namespace KioSword m_redirect.module = val; } else if (!strcasecmp(key, "modtype")) { - if (!strcasecmp(val, "bible")) { + if (!strcasecmp(val.latin1(), "bible")) { m_moduletype = DEFBIBLE; m_action = REDIRECT_QUERY; - } else if (!strcasecmp(val, "greekstrongs")) { + } else if (!strcasecmp(val.latin1(), "greekstrongs")) { m_moduletype = GREEKSTRONGS; m_action = REDIRECT_QUERY; - } else if (!strcasecmp(val, "hebrewstrongs")) { + } else if (!strcasecmp(val.latin1(), "hebrewstrongs")) { m_moduletype = HEBREWSTRONGS; m_action = REDIRECT_QUERY; - } else if (!strcasecmp(val, "greekmorph")) { + } else if (!strcasecmp(val.latin1(), "greekmorph")) { m_moduletype = GREEKMORPH; m_action = REDIRECT_QUERY; - } else if (!strcasecmp(val, "hebrewmorph")) { + } else if (!strcasecmp(val.latin1(), "hebrewmorph")) { m_moduletype = HEBREWMORPH; m_action = REDIRECT_QUERY; } } // search else if (!strcasecmp(key, "stype")) { - if (!strcasecmp(val, "words")) { + if (!strcasecmp(val.latin1(), "words")) { m_stype = Renderer::SEARCH_WORDS; - } else if (!strcasecmp(val, "phrase")) { + } else if (!strcasecmp(val.latin1(), "phrase")) { m_stype = Renderer::SEARCH_PHRASE; - } else if (!strcasecmp(val, "regex")) { + } else if (!strcasecmp(val.latin1(), "regex")) { m_stype = Renderer::SEARCH_REGEX; } else { m_stype = Renderer::SEARCH_WORDS; |