diff options
Diffstat (limited to 'src/backend/managers/referencemanager.cpp')
| -rw-r--r-- | src/backend/managers/referencemanager.cpp | 37 |
1 files changed, 16 insertions, 21 deletions
diff --git a/src/backend/managers/referencemanager.cpp b/src/backend/managers/referencemanager.cpp index 0a17645..144ad8c 100644 --- a/src/backend/managers/referencemanager.cpp +++ b/src/backend/managers/referencemanager.cpp @@ -2,7 +2,7 @@ * * This file is part of BibleTime's source code, http://www.bibletime.info/. * -* Copyright 1999-2011 by the BibleTime developers. +* Copyright 1999-2014 by the BibleTime developers. * The BibleTime source code is licensed under the GNU General Public License version 2.0. * **********/ @@ -12,8 +12,10 @@ #include <algorithm> #include <QRegExp> #include <QDebug> -#include "backend/config/cbtconfig.h" +#include "backend/config/btconfig.h" #include "backend/keys/cswordversekey.h" +#include "backend/drivers/cswordmoduleinfo.h" +#include "backend/managers/cswordbackend.h" /** Returns a hyperlink used to be imbedded in the display windows. At the moment the format is sword://module/key */ @@ -250,33 +252,26 @@ const QString ReferenceManager::preferredModule( const ReferenceManager::Type ty switch (type) { case ReferenceManager::Bible: - module = CBTConfig::get(CBTConfig::standardBible); + module = btConfig().getDefaultSwordModuleByType( "standardBible" ); break; - case ReferenceManager::Commentary: - module = CBTConfig::get(CBTConfig::standardCommentary); + module = btConfig().getDefaultSwordModuleByType( "standardCommentary" ); break; - case ReferenceManager::Lexicon: - module = CBTConfig::get(CBTConfig::standardLexicon); + module = btConfig().getDefaultSwordModuleByType( "standardLexicon" ); break; - case ReferenceManager::StrongsHebrew: - module = CBTConfig::get(CBTConfig::standardHebrewStrongsLexicon); + module = btConfig().getDefaultSwordModuleByType( "standardHebrewStrongsLexicon" ); break; - case ReferenceManager::StrongsGreek: - module = CBTConfig::get(CBTConfig::standardGreekStrongsLexicon); + module = btConfig().getDefaultSwordModuleByType( "standardGreekStrongsLexicon" ); break; - case ReferenceManager::MorphHebrew: - module = CBTConfig::get(CBTConfig::standardHebrewMorphLexicon); + module = btConfig().getDefaultSwordModuleByType( "standardHebrewMorphLexicon" ); break; - case ReferenceManager::MorphGreek: - module = CBTConfig::get(CBTConfig::standardGreekMorphLexicon); + module = btConfig().getDefaultSwordModuleByType( "standardGreekMorphLexicon" ); break; - default: module = 0; break; @@ -353,18 +348,18 @@ const QString ReferenceManager::parseVerseReference( const QString& ref, const R // qDebug("Parsing '%s' in '%s' using '%s' as base, source lang '%s', dest lang '%s'", ref.latin1(), options.refDestinationModule.latin1(), baseKey.key().latin1(), sourceLanguage.latin1(), destinationLanguage.latin1()); - for (QStringList::iterator it = refList.begin(); it != refList.end(); it++) { + for (QStringList::iterator it = refList.begin(); it != refList.end(); ++it) { //The listkey may contain more than one item, because a ref lik "Gen 1:3,5" is parsed into two single refs - sword::ListKey lk = dummy.ParseVerseList((*it).toUtf8().constData(), baseKey.key().toUtf8().constData(), true); - Q_ASSERT(!dummy.Error()); + sword::ListKey lk = dummy.parseVerseList((*it).toUtf8().constData(), baseKey.key().toUtf8().constData(), true); + Q_ASSERT(!dummy.popError()); //Q_ASSERT(lk.Count()); - if (!lk.Count()) { + if (!lk.getCount()) { ret.append( *it ); //don't change the original continue; } - for (int i = 0; i < lk.Count(); ++i) { + for (int i = 0; i < lk.getCount(); ++i) { if (dynamic_cast<sword::VerseKey*>(lk.getElement(i))) { // a range sword::VerseKey* k = dynamic_cast<sword::VerseKey*>(lk.getElement(i)); Q_ASSERT(k); |