Fix build with sword 1.5.8

pull/1/head
Slávek Banko 11 years ago
parent 44c23c4159
commit bf740faff1

@ -4,6 +4,6 @@ AM_INIT_AUTOMAKE(kio_sword, 0.3)
AC_C_BIGENDIAN AC_C_BIGENDIAN
AC_CHECK_KDEMAXPATHLEN 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 ]) AC_CONFIG_FILES([ src/data/kio_sword.css ])

@ -150,7 +150,7 @@ namespace KioSword
else else
setGlobalOption("Variants", "Primary Readings"); setGlobalOption("Variants", "Primary Readings");
LocaleMgr::systemLocaleMgr.setDefaultLocaleName(options.locale()); LocaleMgr::getSystemLocaleMgr()->setDefaultLocaleName(options.locale());
} }
/** Return an HTML hyperlinked list of all modules, /** Return an HTML hyperlinked list of all modules,
@ -471,7 +471,7 @@ namespace KioSword
return; return;
// FIXME - why do I need this call to setLocale()? // FIXME - why do I need this call to setLocale()?
vk->setLocale(LocaleMgr::systemLocaleMgr.getDefaultLocaleName()); vk->setLocale(LocaleMgr::getSystemLocaleMgr()->getDefaultLocaleName());
modtextdir = textDirection(module); modtextdir = textDirection(module);
@ -835,7 +835,7 @@ namespace KioSword
if (!vk) if (!vk)
return output; return output;
vk->setLocale(LocaleMgr::systemLocaleMgr.getDefaultLocaleName()); vk->setLocale(LocaleMgr::getSystemLocaleMgr()->getDefaultLocaleName());
module->setSkipConsecutiveLinks(true); module->setSkipConsecutiveLinks(true);
vk->AutoNormalize(1); vk->AutoNormalize(1);
@ -1015,7 +1015,7 @@ namespace KioSword
QStringList Renderer::availableLocales() 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;
list<SWBuf>::const_iterator it_end = locales.end(); list<SWBuf>::const_iterator it_end = locales.end();
QStringList output; QStringList output;

Loading…
Cancel
Save