1 files changed, 14 insertions, 12 deletions

diff --git a/src/frontend/searchdialog/crangechooserdialog.cpp b/src/frontend/searchdialog/crangechooserdialog.cpp
index 6a8c89d..efece49 100644
--- a/src/frontend/searchdialog/crangechooserdialog.cpp
+++ b/src/frontend/searchdialog/crangechooserdialog.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.
 *
 **********/
@@ -19,8 +19,8 @@
 #include <QPushButton>
 #include <QTextEdit>
 #include <QVBoxLayout>
-#include "backend/config/cbtconfig.h"
-#include "util/dialogutil.h"
+#include "backend/config/btconfig.h"
+#include "frontend/messagedialog.h"
 
 // Sword includes:
 #include "versekey.h"
@@ -37,8 +37,8 @@ CRangeChooserDialog::CRangeChooserDialog(QWidget *parentDialog)
     retranslateUi();
 
     // Add the existing scopes
-    CBTConfig::StringMap map = CBTConfig::get(CBTConfig::searchScopes);
-    CBTConfig::StringMap::Iterator it;
+    BtConfig::StringMap map = btConfig().getSearchScopesForCurrentLocale();
+    BtConfig::StringMap::Iterator it;
     for (it = map.begin(); it != map.end(); ++it) {
         new RangeItem(it.key(), it.value(), m_rangeList);
     }
@@ -74,7 +74,7 @@ void CRangeChooserDialog::initView() {
     m_buttonBox->setStandardButtons(QDialogButtonBox::Ok
                                     | QDialogButtonBox::Cancel
                                     | QDialogButtonBox::RestoreDefaults);
-    util::prepareDialogBox(m_buttonBox);
+    message::prepareDialogBox(m_buttonBox);
 
     QHBoxLayout *rangeButtonsLayout = new QHBoxLayout();
     rangeButtonsLayout->addWidget(m_newRangeButton);
@@ -176,6 +176,7 @@ void CRangeChooserDialog::addNewRange() {
 void CRangeChooserDialog::selectedRangeChanged(QListWidgetItem * current,
                                                QListWidgetItem * previous)
 {
+    Q_UNUSED(current);
     if (previous) {
         Q_ASSERT(dynamic_cast<RangeItem*>(previous) != 0);
         saveCurrentToRange(static_cast<RangeItem*>(previous));
@@ -211,9 +212,9 @@ void CRangeChooserDialog::updateResultList() {
     //HACK: repair range to work with Sword 1.5.6
     const QString range = m_rangeEdit->toPlainText().replace(QRegExp("\\s{0,}-\\s{0,}"), "-");
 
-    sword::ListKey verses = VK().ParseVerseList(range.toUtf8().constData(),
+    sword::ListKey verses = VK().parseVerseList(range.toUtf8().constData(),
                                                 "Genesis 1:1", true);
-    for (int i = 0; i < verses.Count(); ++i) {
+    for (int i = 0; i < verses.getCount(); i++) {
         new QListWidgetItem(QString::fromUtf8(verses.getElement(i)->getRangeText()),
                             m_resultList);
     }
@@ -238,22 +239,23 @@ void CRangeChooserDialog::accept() {
 
     // Save the new sorted map of search scopes:
     m_rangeList->sortItems();
-    CBTConfig::StringMap map;
+    BtConfig::StringMap map;
     for (int i = 0; i < m_rangeList->count(); i++) {
         Q_ASSERT(dynamic_cast<RangeItem*>(m_rangeList->item(i)) != 0);
         const RangeItem * item = static_cast<RangeItem*>(m_rangeList->item(i));
         map[item->caption()] = item->range();
     }
-    CBTConfig::set(CBTConfig::searchScopes, map);
+    btConfig().setSearchScopesWithCurrentLocale(map);
 
     QDialog::accept();
 }
 
 void CRangeChooserDialog::restoreDefaults() {
-    typedef CBTConfig::StringMap::ConstIterator SMCI;
+    typedef BtConfig::StringMap::ConstIterator SMCI;
 
     m_rangeList->clear();
-    const CBTConfig::StringMap map = CBTConfig::getDefault(CBTConfig::searchScopes);
+    btConfig().deleteSearchScopesWithCurrentLocale();
+    const BtConfig::StringMap map = btConfig().getSearchScopesForCurrentLocale();
     for (SMCI it = map.begin(); it != map.end(); ++it) {
         new RangeItem(it.key(), it.value(), m_rangeList);
     };