diff options
Diffstat (limited to 'src/frontend/bookmarks/btbookmarkitem.cpp')
-rw-r--r-- | src/frontend/bookmarks/btbookmarkitem.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/frontend/bookmarks/btbookmarkitem.cpp b/src/frontend/bookmarks/btbookmarkitem.cpp index 639d33e..952be22 100644 --- a/src/frontend/bookmarks/btbookmarkitem.cpp +++ b/src/frontend/bookmarks/btbookmarkitem.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. * **********/ @@ -10,14 +10,16 @@ #include "frontend/bookmarks/btbookmarkitem.h" #include <QSharedPointer> -#include "backend/config/cbtconfig.h" +#include "backend/config/btconfig.h" +#include "backend/managers/cswordbackend.h" #include "backend/drivers/cswordmoduleinfo.h" #include "backend/keys/cswordversekey.h" +#include "bibletimeapp.h" #include "btglobal.h" #include "frontend/bookmarks/btbookmarkfolder.h" #include "frontend/bookmarks/bteditbookmarkdialog.h" #include "util/cresmgr.h" -#include "util/directory.h" +#include "util/geticon.h" BtBookmarkItem::BtBookmarkItem(const CSwordModuleInfo *module, @@ -81,7 +83,7 @@ QString BtBookmarkItem::toolTip() const { return QString::null; } - FilterOptions filterOptions = CBTConfig::getFilterOptionDefaults(); + FilterOptions filterOptions = btConfig().getFilterOptions(); filterOptions.footnotes = false; filterOptions.scriptureReferences = false; CSwordBackend::instance()->setFilterOptions(filterOptions); @@ -91,7 +93,7 @@ QString BtBookmarkItem::toolTip() const { k->setKey(key()); // const CLanguageMgr::Language* lang = module()->language(); - // CBTConfig::FontSettingsPair fontPair = CBTConfig::get(lang); + // BtConfig::FontSettingsPair fontPair = getBtConfig().getFontForLanguage(lang); Q_ASSERT(k.data()); QString header = QString::fromLatin1("%1 (%2)") @@ -134,9 +136,7 @@ void BtBookmarkItem::rename() { } void BtBookmarkItem::update() { - namespace DU = util::directory; - - setIcon(0, DU::getIcon(CResMgr::mainIndex::bookmark::icon)); + setIcon(0, util::getIcon(CResMgr::mainIndex::bookmark::icon)); if (m_title.isEmpty()) { m_title = QString::fromLatin1("%1 (%2)").arg(key()).arg(module() ? module()->name() : QObject::tr("unknown")); |