diff options
Diffstat (limited to 'bindings/corba/orbitcpp/swordorb-impl.cpp')
| -rw-r--r-- | bindings/corba/orbitcpp/swordorb-impl.cpp | 62 |
1 files changed, 46 insertions, 16 deletions
diff --git a/bindings/corba/orbitcpp/swordorb-impl.cpp b/bindings/corba/orbitcpp/swordorb-impl.cpp index d45832a..4d40727 100644 --- a/bindings/corba/orbitcpp/swordorb-impl.cpp +++ b/bindings/corba/orbitcpp/swordorb-impl.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * swordorb-impl.cpp - + * + * $Id: swordorb-impl.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -18,6 +23,7 @@ #include "swordorb-impl.hpp" #include <iostream> #include <swmgr.h> +#include <installmgr.h> #include <versekey.h> #include <treekeyidx.h> #include <swbuf.h> @@ -44,13 +50,13 @@ ModInfoList *SWMgr_impl::getModInfoList() throw(CORBA::SystemException) { ModInfoList *milist = new ModInfoList; sword::SWModule *module = 0; int size = 0; - for (sword::ModMap::iterator it = delegate->Modules.begin(); it != delegate->Modules.end(); it++) { + for (sword::ModMap::iterator it = delegate->Modules.begin(); it != delegate->Modules.end(); ++it) { if ((!(it->second->getConfigEntry("CipherKey"))) || (*(it->second->getConfigEntry("CipherKey")))) size++; } milist->length(size); int i = 0; - for (sword::ModMap::iterator it = delegate->Modules.begin(); it != delegate->Modules.end(); it++) { + for (sword::ModMap::iterator it = delegate->Modules.begin(); it != delegate->Modules.end(); ++it) { module = it->second; if ((!(module->getConfigEntry("CipherKey"))) || (*(module->getConfigEntry("CipherKey")))) { SWBuf type = module->Type(); @@ -88,12 +94,12 @@ StringList *SWMgr_impl::getGlobalOptions() throw(CORBA::SystemException) { sword::StringList options = delegate->getGlobalOptions(); StringList *retVal = new StringList; int count = 0; - for (sword::StringList::iterator it = options.begin(); it != options.end(); it++) { + for (sword::StringList::iterator it = options.begin(); it != options.end(); ++it) { count++; } retVal->length(count); count = 0; - for (sword::StringList::iterator it = options.begin(); it != options.end(); it++) { + for (sword::StringList::iterator it = options.begin(); it != options.end(); ++it) { (*retVal)[count++] = CORBA::string_dup(it->c_str()); } return retVal; @@ -104,12 +110,12 @@ StringList *SWMgr_impl::getGlobalOptionValues(const char *option) throw(CORBA::S sword::StringList options = delegate->getGlobalOptionValues(option); StringList *retVal = new StringList; int count = 0; - for (sword::StringList::iterator it = options.begin(); it != options.end(); it++) { + for (sword::StringList::iterator it = options.begin(); it != options.end(); ++it) { count++; } retVal->length(count); count = 0; - for (sword::StringList::iterator it = options.begin(); it != options.end(); it++) { + for (sword::StringList::iterator it = options.begin(); it != options.end(); ++it) { (*retVal)[count++] = CORBA::string_dup(it->c_str()); } return retVal; @@ -236,35 +242,35 @@ StringList *SWModule_impl::getEntryAttribute(const char *level1, const char *lev i1Start = entryAttribs.find(level1); i1End = i1Start; if (i1End != entryAttribs.end()) - i1End++; + ++i1End; } else { i1Start = entryAttribs.begin(); i1End = entryAttribs.end(); } - for (;i1Start != i1End; i1Start++) { + for (;i1Start != i1End; ++i1Start) { if ((level2) && (*level2)) { i2Start = i1Start->second.find(level2); i2End = i2Start; if (i2End != i1Start->second.end()) - i2End++; + ++i2End; } else { i2Start = i1Start->second.begin(); i2End = i1Start->second.end(); } - for (;i2Start != i2End; i2Start++) { + for (;i2Start != i2End; ++i2Start) { if ((level3) && (*level3)) { i3Start = i2Start->second.find(level3); i3End = i3Start; if (i3End != i2Start->second.end()) - i3End++; + ++i3End; } else { i3Start = i2Start->second.begin(); i3End = i2Start->second.end(); } - for (;i3Start != i3End; i3Start++) { + for (;i3Start != i3End; ++i3Start) { results.push_back(i3Start->second); } if (i3Start != i3End) @@ -394,12 +400,12 @@ StringList *SWMgr_impl::getAvailableLocales() throw(CORBA::SystemException) { sword::StringList localeNames = LocaleMgr::getSystemLocaleMgr()->getAvailableLocales(); StringList *retVal = new StringList; int count = 0; - for (sword::StringList::iterator it = localeNames.begin(); it != localeNames.end(); it++) { + for (sword::StringList::iterator it = localeNames.begin(); it != localeNames.end(); ++it) { count++; } retVal->length(count); count = 0; - for (sword::StringList::iterator it = localeNames.begin(); it != localeNames.end(); it++) { + for (sword::StringList::iterator it = localeNames.begin(); it != localeNames.end(); ++it) { (*retVal)[count++] = CORBA::string_dup(it->c_str()); } return retVal; @@ -410,4 +416,28 @@ void SWMgr_impl::setDefaultLocale(const char *name) throw(CORBA::SystemException LocaleMgr::getSystemLocaleMgr()->setDefaultLocaleName(name); } +char* SWMgr_impl::translate(const char* text, const char* localeName) throw(CORBA::SystemException) { + return CORBA::string_dup(LocaleMgr::getSystemLocaleMgr()->translate(text, localeName)); +} + +swordorb::StringList *SWMgr_impl::getRepos() throw(CORBA::SystemException) { + swordorb::StringList *retVal = new swordorb::StringList; + int count = 0; + sword::InstallMgr *installMgr = new sword::InstallMgr(); + for (InstallSourceMap::iterator it = installMgr->sources.begin(); it != installMgr->sources.end(); ++it) { + count++; + } + retVal->length(count); + count = 0; + for (InstallSourceMap::iterator it = installMgr->sources.begin(); it != installMgr->sources.end(); ++it) { + (*retVal)[count++] = CORBA::string_dup(assureValidUTF8(it->second->caption.c_str())); + } + delete installMgr; + return retVal; +} + +// Don't call me yet +swordorb::SWMgr_ptr SWMgr_impl::getShadowMgr (CORBA_char const *repoName) throw (CORBA::SystemException) { + return 0; +} } |