1 files changed, 7 insertions, 7 deletions
diff --git a/src/frontend/displaywindow/btmodulechooserbutton.cpp b/src/frontend/displaywindow/btmodulechooserbutton.cpp
index 200da78..4e0a5fc 100644
--- a/src/frontend/displaywindow/btmodulechooserbutton.cpp
+++ b/src/frontend/displaywindow/btmodulechooserbutton.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.
 *
 **********/
@@ -15,11 +15,12 @@
 #include <QString>
 #include <QToolButton>
 #include <QToolTip>
-#include "backend/config/cbtconfig.h"
+#include "backend/config/btconfig.h"
 #include "backend/managers/cswordbackend.h"
+#include "bibletimeapp.h"
 #include "frontend/displaywindow/btmodulechooserbar.h"
 #include "util/cresmgr.h"
-#include "util/directory.h"
+#include "util/geticon.h"
 
 
 BtModuleChooserButton::BtModuleChooserButton(BtModuleChooserBar *parent, CSwordModuleInfo::ModuleType mtype)
@@ -58,7 +59,6 @@ void BtModuleChooserButton::updateMenu(QStringList newModulesToUse, QString this
 
     m_module = thisModule;
     m_hasModule = thisModule.isEmpty() ? false : true;
-    namespace DU = util::directory;
 
     //All items are iterated and the state is changed properly
     QListIterator<QMenu*> it(m_submenus);
@@ -70,7 +70,7 @@ void BtModuleChooserButton::updateMenu(QStringList newModulesToUse, QString this
         }
     }
     m_noneAction->setChecked(m_hasModule ? false : true);
-    setIcon(DU::getIcon(iconName()));
+    setIcon(util::getIcon(iconName()));
 
     if (m_hasModule) {
         setToolTip( QString(tr("Select a work [%1]")).arg(m_module) );
@@ -141,7 +141,7 @@ void BtModuleChooserButton::populateMenu() {
     // Filters: add only non-hidden and right type
     BTModuleTreeItem::HiddenOff hiddenFilter;
     QList<BTModuleTreeItem::Filter*> filters;
-    if (!CBTConfig::get(CBTConfig::bookshelfShowHidden)) {
+    if (!btConfig().value<bool>("GUI/bookshelfShowHidden", false)) {
         filters.append(&hiddenFilter);
     }
     TypeFilter typeFilter(m_moduleType);
@@ -150,7 +150,7 @@ void BtModuleChooserButton::populateMenu() {
     if (m_moduleType == CSwordModuleInfo::Bible) {
       BTModuleTreeItem root(filters, BTModuleTreeItem::CatLangMod);
         QList<BTModuleTreeItem::Filter*> filters2;
-        if (!CBTConfig::get(CBTConfig::bookshelfShowHidden)) {
+        if (!btConfig().value<bool>("GUI/bookshelfShowHidden", false)) {
             filters2.append(&hiddenFilter);
         }
         TypeFilter typeFilter2(CSwordModuleInfo::Commentary);