1 files changed, 11 insertions, 9 deletions
diff --git a/src/frontend/keychooser/cbooktreechooser.cpp b/src/frontend/keychooser/cbooktreechooser.cpp
index a41922e..96917d8 100644
--- a/src/frontend/keychooser/cbooktreechooser.cpp
+++ b/src/frontend/keychooser/cbooktreechooser.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.
 *
 **********/
@@ -13,16 +13,19 @@
 #include <QHBoxLayout>
 #include <QTreeWidget>
 #include <QTreeWidgetItem>
-#include "backend/config/cbtconfig.h"
+#include "backend/config/btconfig.h"
 #include "backend/drivers/cswordbookmoduleinfo.h"
 #include "backend/keys/cswordtreekey.h"
 #include "frontend/keychooser/bthistory.h"
 
 
-CBookTreeChooser::CBookTreeChooser(const QList<const CSwordModuleInfo*> &modules,
-                                   BTHistory* historyPtr, CSwordKey *key, QWidget *parent)
-        : CKeyChooser(modules, historyPtr, key, parent),
-        m_key( dynamic_cast<CSwordTreeKey*>(key) ) {
+CBookTreeChooser::CBookTreeChooser(const QList<const CSwordModuleInfo *> & modules,
+                                   BTHistory * historyPtr,
+                                   CSwordKey * key,
+                                   QWidget * parent)
+    : CKeyChooser(modules, historyPtr, parent)
+    , m_key(dynamic_cast<CSwordTreeKey *>(key))
+{
 
     setModules(modules, false);
 
@@ -109,8 +112,7 @@ void CBookTreeChooser::setModules(const QList<const CSwordModuleInfo*> &modules,
 /** From ckeychooser. */
 void CBookTreeChooser::adjustFont() {
     //Make sure the entries are displayed correctly.
-    m_treeView->setFont( CBTConfig::get(m_modules.first()->language()).second );
-
+    m_treeView->setFont(btConfig().getFontForLanguage(*m_modules.first()->language()).second);
 }
 
 
@@ -183,7 +185,7 @@ void CBookTreeChooser::addKeyChildren(CSwordTreeKey* key, QTreeWidgetItem* item)
     }
 }
 
-void CBookTreeChooser::setKey(QString& newKey) {
+void CBookTreeChooser::setKey(const QString & newKey) {
     m_key->setKey(newKey);
     setKey(m_key);
 }