Imported Debian patch 2.9.1-1

1 files changed, 10 insertions, 8 deletions

diff --git a/src/frontend/cprinter.cpp b/src/frontend/cprinter.cpp
index 99d1daf..3645472 100644
--- a/src/frontend/cprinter.cpp
+++ b/src/frontend/cprinter.cpp
@@ -52,8 +52,8 @@ void CPrinter::printKeyTree( KeyTree& tree ) {
     }
 }
 
-const QString CPrinter::entryLink(const KeyTreeItem &item,
-                                  const CSwordModuleInfo *module)
+QString CPrinter::entryLink(const KeyTreeItem &item,
+                            const CSwordModuleInfo * module)
 {
     Q_ASSERT(module);
     if (module->type() == CSwordModuleInfo::Bible) {
@@ -71,13 +71,15 @@ const QString CPrinter::entryLink(const KeyTreeItem &item,
 
             case KeyTreeItem::Settings::SimpleKey: //fall through
             default:
-                return QString::number(vk.Verse());
+                return QString::number(vk.getVerse());
         }
     }
     return item.key();
 }
 
-const QString CPrinter::renderEntry( const KeyTreeItem& i, CSwordKey* ) {
+QString CPrinter::renderEntry(const KeyTreeItem &i, CSwordKey * key) {
+    Q_UNUSED(key);
+
     const CPrinter::KeyTreeItem* printItem = dynamic_cast<const CPrinter::KeyTreeItem*>(&i);
     Q_ASSERT(printItem);
 
@@ -87,7 +89,7 @@ const QString CPrinter::renderEntry( const KeyTreeItem& i, CSwordKey* ) {
         if (!i.childList()->isEmpty()) {
             KeyTree const * tree = i.childList();
 
-            foreach ( KeyTreeItem* c, (*tree)) {
+            Q_FOREACH (const KeyTreeItem * const c, *tree) {
                 ret.append( CDisplayRendering::renderEntry( *c ) );
             }
         }
@@ -98,8 +100,8 @@ const QString CPrinter::renderEntry( const KeyTreeItem& i, CSwordKey* ) {
     return CDisplayRendering::renderEntry(i);
 }
 
-const QString CPrinter::finishText(const QString& text, KeyTree& tree) {
-    QList<const CSwordModuleInfo*> modules = collectModules(&tree);
+QString CPrinter::finishText(const QString &text, const KeyTree &tree) {
+    QList<const CSwordModuleInfo*> modules = collectModules(tree);
     Q_ASSERT(modules.count() > 0);
 
     const CLanguageMgr::Language* const lang = modules.first()->language();
@@ -120,7 +122,7 @@ const QString CPrinter::finishText(const QString& text, KeyTree& tree) {
     }
 
     CDisplayTemplateMgr *tMgr = CDisplayTemplateMgr::instance();
-    return tMgr->fillTemplate(CBTConfig::get(CBTConfig::displayStyle), text, settings);
+    return tMgr->fillTemplate(CDisplayTemplateMgr::activeTemplateName(), text, settings);
 }
 
 } //end of namespace