diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2013-08-21 19:22:28 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-08-21 19:22:28 +0200 |
| commit | bf740faff197102a84b0812d158fe2eca51262c2 (patch) | |
| tree | f91c8b265f7c397529fd4b31a29f11d539a341e2 | |
| parent | 44c23c4159d9195718a7e80e005cc5c12c7001ce (diff) | |
| download | tdeio-sword-bf740faff197102a84b0812d158fe2eca51262c2.tar.gz tdeio-sword-bf740faff197102a84b0812d158fe2eca51262c2.zip | |
Fix build with sword 1.5.8
| -rw-r--r-- | configure.in.in | 2 | ||||
| -rw-r--r-- | src/renderer.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/configure.in.in b/configure.in.in index 25c6fb1..cdc5e69 100644 --- a/configure.in.in +++ b/configure.in.in @@ -4,6 +4,6 @@ AM_INIT_AUTOMAKE(kio_sword, 0.3) AC_C_BIGENDIAN AC_CHECK_KDEMAXPATHLEN -AC_CHECK_SWORD(1.5.7, [$ac_use_static]) +AC_CHECK_SWORD(1.5.8, [$ac_use_static]) AC_CONFIG_FILES([ src/data/kio_sword.css ]) diff --git a/src/renderer.cpp b/src/renderer.cpp index 79a38d0..60a13bc 100644 --- a/src/renderer.cpp +++ b/src/renderer.cpp @@ -150,7 +150,7 @@ namespace KioSword else setGlobalOption("Variants", "Primary Readings"); - LocaleMgr::systemLocaleMgr.setDefaultLocaleName(options.locale()); + LocaleMgr::getSystemLocaleMgr()->setDefaultLocaleName(options.locale()); } /** Return an HTML hyperlinked list of all modules, @@ -471,7 +471,7 @@ namespace KioSword return; // FIXME - why do I need this call to setLocale()? - vk->setLocale(LocaleMgr::systemLocaleMgr.getDefaultLocaleName()); + vk->setLocale(LocaleMgr::getSystemLocaleMgr()->getDefaultLocaleName()); modtextdir = textDirection(module); @@ -835,7 +835,7 @@ namespace KioSword if (!vk) return output; - vk->setLocale(LocaleMgr::systemLocaleMgr.getDefaultLocaleName()); + vk->setLocale(LocaleMgr::getSystemLocaleMgr()->getDefaultLocaleName()); module->setSkipConsecutiveLinks(true); vk->AutoNormalize(1); @@ -1015,7 +1015,7 @@ namespace KioSword QStringList Renderer::availableLocales() { - list<SWBuf> locales = LocaleMgr::systemLocaleMgr.getAvailableLocales(); + list<SWBuf> locales = LocaleMgr::getSystemLocaleMgr()->getAvailableLocales(); list<SWBuf>::const_iterator it; list<SWBuf>::const_iterator it_end = locales.end(); QStringList output; |