diff options
Diffstat (limited to 'src/backend/rendering/ctextrendering.cpp')
| -rw-r--r-- | src/backend/rendering/ctextrendering.cpp | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/src/backend/rendering/ctextrendering.cpp b/src/backend/rendering/ctextrendering.cpp index 72e4e12..409a601 100644 --- a/src/backend/rendering/ctextrendering.cpp +++ b/src/backend/rendering/ctextrendering.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. * **********/ @@ -136,19 +136,19 @@ CTextRendering::KeyTreeItem::KeyTreeItem(const QString &startKey, else { sword::VerseKey vk(startKey.toUtf8().constData(), stopKey.toUtf8().constData()); - if (vk.LowerBound().getBook() != vk.UpperBound().getBook()) { + if (vk.getLowerBound().getBook() != vk.getUpperBound().getBook()) { m_alternativeContent = QString::fromUtf8(vk.getRangeText()); } - else if (vk.LowerBound().getChapter() != vk.UpperBound().getChapter()) { + else if (vk.getLowerBound().getChapter() != vk.getUpperBound().getChapter()) { m_alternativeContent = QString("%1 - %2:%3") - .arg(QString::fromUtf8(vk.LowerBound().getText())) - .arg(vk.UpperBound().getChapter()) - .arg(vk.UpperBound().getVerse()); + .arg(QString::fromUtf8(vk.getLowerBound().getText())) + .arg(vk.getUpperBound().getChapter()) + .arg(vk.getUpperBound().getVerse()); } else { //only verses differ (same book, same chapter) m_alternativeContent = QString("%1 - %2") - .arg(QString::fromUtf8(vk.LowerBound().getText())) - .arg(vk.UpperBound().getVerse()); + .arg(QString::fromUtf8(vk.getLowerBound().getText())) + .arg(vk.getUpperBound().getVerse()); } } @@ -231,8 +231,8 @@ const QString CTextRendering::renderKeyRange( CSwordVerseKey* vk_stop = dynamic_cast<CSwordVerseKey*>(upperBound.data()); Q_ASSERT(vk_stop); - bool ok = true; - while (ok && ((*vk_start < *vk_stop) || (*vk_start == *vk_stop))) { + while ((*vk_start < *vk_stop) || (*vk_start == *vk_stop)) { + //make sure the key given by highlightKey gets marked as current key settings.highlight = (!highlightKey.isEmpty() ? (vk_start->key() == highlightKey) : false); @@ -249,7 +249,10 @@ const QString CTextRendering::renderKeyRange( vk_start->setVerse(0); } tree.append( new KeyTreeItem(vk_start->key(), modules, settings) ); - ok = vk_start->next(CSwordVerseKey::UseVerse); + if (!vk_start->next(CSwordVerseKey::UseVerse)) { + /// \todo Notify the user about this failure. + break; + } } return renderKeyTree(tree); } |