1 files changed, 48 insertions, 60 deletions

diff --git a/rbutil/rbutilqt/configure.cpp b/rbutil/rbutilqt/configure.cpp
index 00a899abb4..0752b1f2a5 100644
--- a/rbutil/rbutilqt/configure.cpp
+++ b/rbutil/rbutilqt/configure.cpp
@@ -28,6 +28,7 @@
 #include "tts.h"
 #include "detect.h"
 #include "encttscfggui.h"
+#include "rbsettings.h"
 
 #include <stdio.h>
 #if defined(Q_OS_WIN32)
@@ -85,10 +86,10 @@ Config::Config(QWidget *parent,int index) : QDialog(parent)
     connect(ui.comboTts, SIGNAL(currentIndexChanged(int)), this, SLOT(updateTtsState(int)));
     connect(ui.treeDevices, SIGNAL(itemSelectionChanged()), this, SLOT(updateEncState()));
 
+    setUserSettings();
+    setDevices();
 }
 
-
-
 void Config::accept()
 {
     qDebug() << "Config::accept()";
@@ -104,20 +105,20 @@ void Config::accept()
         proxy.setPort(ui.proxyPort->text().toInt());
     }
 
-    settings->setValue(RbSettings::Proxy, proxy.toString());
+    RbSettings::setValue(RbSettings::Proxy, proxy.toString());
     qDebug() << "new proxy:" << proxy;
     // proxy type
     QString proxyType;
     if(ui.radioNoProxy->isChecked()) proxyType = "none";
     else if(ui.radioSystemProxy->isChecked()) proxyType = "system";
     else proxyType = "manual";
-    settings->setValue(RbSettings::ProxyType, proxyType);
+    RbSettings::setValue(RbSettings::ProxyType, proxyType);
 
     // language
-    if(settings->value(RbSettings::Language).toString() != language && !language.isEmpty()) {
+    if(RbSettings::value(RbSettings::Language).toString() != language && !language.isEmpty()) {
         QMessageBox::information(this, tr("Language changed"),
             tr("You need to restart the application for the changed language to take effect."));
-        settings->setValue(RbSettings::Language, language);
+        RbSettings::setValue(RbSettings::Language, language);
     }
 
     // mountpoint
@@ -139,14 +140,14 @@ void Config::accept()
         error = true;
     }
     else {
-        settings->setValue(RbSettings::Mountpoint, QDir::fromNativeSeparators(mp));
+        RbSettings::setValue(RbSettings::Mountpoint, QDir::fromNativeSeparators(mp));
     }
 
     // platform
     QString nplat;
     if(ui.treeDevices->selectedItems().size() != 0) {
         nplat = ui.treeDevices->selectedItems().at(0)->data(0, Qt::UserRole).toString();
-        settings->setValue(RbSettings::Platform, nplat);
+        RbSettings::setValue(RbSettings::Platform, nplat);
     }
     else {
         errormsg += "<li>" + tr("No player selected") + "</li>";
@@ -161,18 +162,18 @@ void Config::accept()
             error = true;
         }
         else
-            settings->setValue(RbSettings::CachePath, ui.cachePath->text());
+            RbSettings::setValue(RbSettings::CachePath, ui.cachePath->text());
     }
     else // default to system temp path
-        settings->setValue(RbSettings::CachePath, QDir::tempPath());
-    settings->setValue(RbSettings::CacheDisabled, ui.cacheDisable->isChecked());
-    settings->setValue(RbSettings::CacheOffline, ui.cacheOfflineMode->isChecked());
+        RbSettings::setValue(RbSettings::CachePath, QDir::tempPath());
+    RbSettings::setValue(RbSettings::CacheDisabled, ui.cacheDisable->isChecked());
+    RbSettings::setValue(RbSettings::CacheOffline, ui.cacheOfflineMode->isChecked());
 
     // tts settings
     int i = ui.comboTts->currentIndex();
-    settings->setValue(RbSettings::Tts, ui.comboTts->itemData(i).toString());
+    RbSettings::setValue(RbSettings::Tts, ui.comboTts->itemData(i).toString());
 
-    settings->setValue(RbSettings::RbutilVersion, PUREVERSION);
+    RbSettings::setValue(RbSettings::RbutilVersion, PUREVERSION);
 
     errormsg += "</ul>";
     errormsg += tr("You need to fix the above errors before you can continue.");
@@ -182,7 +183,7 @@ void Config::accept()
     }
     else {
         // sync settings
-        settings->sync();
+        RbSettings::sync();
         this->close();
         emit settingsUpdated();
     }
@@ -195,18 +196,10 @@ void Config::abort()
     this->close();
 }
 
-void Config::setSettings(RbSettings* sett)
-{
-    settings = sett;
-
-    setUserSettings();
-    setDevices();
-}
-
 void Config::setUserSettings()
 {
     // set proxy
-    proxy = settings->value(RbSettings::Proxy).toString();
+    proxy = RbSettings::value(RbSettings::Proxy).toString();
 
     if(proxy.port() > 0)
         ui.proxyPort->setText(QString("%1").arg(proxy.port()));
@@ -215,7 +208,7 @@ void Config::setUserSettings()
     ui.proxyUser->setText(proxy.userName());
     ui.proxyPass->setText(proxy.password());
 
-    QString proxyType = settings->value(RbSettings::ProxyType).toString();
+    QString proxyType = RbSettings::value(RbSettings::ProxyType).toString();
     if(proxyType == "manual") ui.radioManualProxy->setChecked(true);
     else if(proxyType == "system") ui.radioSystemProxy->setChecked(true);
     else ui.radioNoProxy->setChecked(true);
@@ -225,7 +218,7 @@ void Config::setUserSettings()
     QString b;
     // find key for lang value
     QMap<QString, QString>::const_iterator i = lang.constBegin();
-    QString l = settings->value(RbSettings::Language).toString();
+    QString l = RbSettings::value(RbSettings::Language).toString();
     if(l.isEmpty())
         l = QLocale::system().name();
     while (i != lang.constEnd()) {
@@ -248,15 +241,15 @@ void Config::setUserSettings()
     connect(ui.listLanguages, SIGNAL(itemSelectionChanged()), this, SLOT(updateLanguage()));
 
     // devices tab
-    ui.mountPoint->setText(QDir::toNativeSeparators(settings->value(RbSettings::Mountpoint).toString()));
+    ui.mountPoint->setText(QDir::toNativeSeparators(RbSettings::value(RbSettings::Mountpoint).toString()));
 
     // cache tab
-    if(!QFileInfo(settings->value(RbSettings::CachePath).toString()).isDir())
-        settings->setValue(RbSettings::CachePath, QDir::tempPath());
-    ui.cachePath->setText(QDir::toNativeSeparators(settings->value(RbSettings::CachePath).toString()));
-    ui.cacheDisable->setChecked(settings->value(RbSettings::CacheDisabled).toBool());
-    ui.cacheOfflineMode->setChecked(settings->value(RbSettings::CacheOffline).toBool());
-    updateCacheInfo(settings->value(RbSettings::CachePath).toString());
+    if(!QFileInfo(RbSettings::value(RbSettings::CachePath).toString()).isDir())
+        RbSettings::setValue(RbSettings::CachePath, QDir::tempPath());
+    ui.cachePath->setText(QDir::toNativeSeparators(RbSettings::value(RbSettings::CachePath).toString()));
+    ui.cacheDisable->setChecked(RbSettings::value(RbSettings::CacheDisabled).toBool());
+    ui.cacheOfflineMode->setChecked(RbSettings::value(RbSettings::CacheOffline).toBool());
+    updateCacheInfo(RbSettings::value(RbSettings::CachePath).toString());
 }
 
 
@@ -280,20 +273,20 @@ void Config::setDevices()
     // setup devices table
     qDebug() << "Config::setDevices()";
     
-    QStringList platformList = settings->platforms();
+    QStringList platformList = RbSettings::platforms();
 
     QMap <QString, QString> manuf;
     QMap <QString, QString> devcs;
     for(int it = 0; it < platformList.size(); it++) 
     {
-        QString curname = settings->name(platformList.at(it));
-        QString curbrand = settings->brand(platformList.at(it));
+        QString curname = RbSettings::name(platformList.at(it));
+        QString curbrand = RbSettings::brand(platformList.at(it));
         manuf.insertMulti(curbrand, platformList.at(it));
         devcs.insert(platformList.at(it), curname);
     }
 
     QString platform;
-    platform = devcs.value(settings->value(RbSettings::Platform).toString());
+    platform = devcs.value(RbSettings::value(RbSettings::Platform).toString());
 
     // set up devices table
     ui.treeDevices->header()->hide();
@@ -316,8 +309,8 @@ void Config::setDevices()
         // go through platforms again for sake of order
         for(int it = 0; it < platformList.size(); it++) {
            
-            QString curname = settings->name(platformList.at(it));
-            QString curbrand = settings->brand(platformList.at(it));
+            QString curname = RbSettings::name(platformList.at(it));
+            QString curbrand = RbSettings::brand(platformList.at(it));
        
             if(curbrand != brands.at(c)) continue;
             qDebug() << "adding:" << brands.at(c) << curname;
@@ -346,7 +339,7 @@ void Config::setDevices()
     for(int a = 0; a < ttslist.size(); a++)
         ui.comboTts->addItem(TTSBase::getTTSName(ttslist.at(a)), ttslist.at(a));
     //update index of combobox
-    int index = ui.comboTts->findData(settings->value(RbSettings::Tts).toString());
+    int index = ui.comboTts->findData(RbSettings::value(RbSettings::Tts).toString());
     if(index < 0) index = 0;
     ui.comboTts->setCurrentIndex(index);
     updateTtsState(index);
@@ -358,7 +351,6 @@ void Config::updateTtsState(int index)
 {
     QString ttsName = ui.comboTts->itemData(index).toString();
     TTSBase* tts = TTSBase::getTTS(this,ttsName);
-    tts->setCfg(settings);
     
     if(tts->configOk())
     {
@@ -381,14 +373,13 @@ void Config::updateEncState()
         return;
 
     QString devname = ui.treeDevices->selectedItems().at(0)->data(0, Qt::UserRole).toString();
-    QString olddevice = settings->value(RbSettings::Platform).toString();
-    settings->setValue(RbSettings::Platform, devname);
-    QString encoder = settings->value(RbSettings::CurEncoder).toString();
-    ui.encoderName->setText(EncBase::getEncoderName(settings->value(RbSettings::CurEncoder).toString()));
-    settings->setValue(RbSettings::Platform, olddevice);
+    QString olddevice = RbSettings::value(RbSettings::Platform).toString();
+    RbSettings::setValue(RbSettings::Platform, devname);
+    QString encoder = RbSettings::value(RbSettings::CurEncoder).toString();
+    ui.encoderName->setText(EncBase::getEncoderName(RbSettings::value(RbSettings::CurEncoder).toString()));
+    RbSettings::setValue(RbSettings::Platform, olddevice);
 
     EncBase* enc = EncBase::getEncoder(this,encoder);
-    enc->setCfg(settings);
     
     if(enc->configOk())
     {
@@ -546,7 +537,6 @@ void Config::setCache(QString c)
 void Config::autodetect()
 {
     Autodetection detector(this);
-    detector.setSettings(settings);
     // disable tree during detection as "working" feedback.
     // TODO: replace the tree view with a splash screen during this time.
     ui.treeDevices->setEnabled(false);
@@ -601,10 +591,10 @@ void Config::autodetect()
             QString text;
             // we need to set the platform here to get the brand from the
             // settings object
-            settings->setValue(RbSettings::Platform, detector.incompatdev());
+            RbSettings::setValue(RbSettings::Platform, detector.incompatdev());
             text = tr("Detected an unsupported %1 player variant. Sorry, "
                       "Rockbox doesn't run on your player.")
-                      .arg(settings->value(RbSettings::CurBrand).toString());
+                      .arg(RbSettings::value(RbSettings::CurBrand).toString());
 
             QMessageBox::critical(this, tr("Fatal error: incompatible player found"),
                                   text, QMessageBox::Ok);
@@ -660,7 +650,7 @@ void Config::cacheClear()
         QFile::remove(f);
         qDebug() << "removed:" << f;
     }
-    updateCacheInfo(settings->value(RbSettings::CachePath).toString());
+    updateCacheInfo(RbSettings::value(RbSettings::CachePath).toString());
 }
 
 
@@ -669,8 +659,7 @@ void Config::configTts()
     int index = ui.comboTts->currentIndex();
     TTSBase* tts = TTSBase::getTTS(this,ui.comboTts->itemData(index).toString());
     
-    tts->setCfg(settings);
-    EncTtsCfgGui gui(this,tts,TTSBase::getTTSName(settings->value(RbSettings::Tts).toString()));
+    EncTtsCfgGui gui(this,tts,TTSBase::getTTSName(RbSettings::value(RbSettings::Tts).toString()));
     gui.exec();
     updateTtsState(ui.comboTts->currentIndex());
 }
@@ -685,16 +674,15 @@ void Config::configEnc()
         return;
 
     QString devname = ui.treeDevices->selectedItems().at(0)->data(0, Qt::UserRole).toString();
-    QString olddevice = settings->value(RbSettings::CurrentPlatform).toString();
-    settings->setValue(RbSettings::CurrentPlatform,devname);
-    QString encoder = settings->value(RbSettings::CurEncoder).toString();
-    ui.encoderName->setText(EncBase::getEncoderName(settings->value(RbSettings::CurEncoder).toString()));
-    settings->setValue(RbSettings::CurrentPlatform,olddevice);
+    QString olddevice = RbSettings::value(RbSettings::CurrentPlatform).toString();
+    RbSettings::setValue(RbSettings::CurrentPlatform,devname);
+    QString encoder = RbSettings::value(RbSettings::CurEncoder).toString();
+    ui.encoderName->setText(EncBase::getEncoderName(RbSettings::value(RbSettings::CurEncoder).toString()));
+    RbSettings::setValue(RbSettings::CurrentPlatform,olddevice);
 
 
     EncBase* enc = EncBase::getEncoder(this,encoder);
-    
-    enc->setCfg(settings);
+
     EncTtsCfgGui gui(this,enc,EncBase::getEncoderName(encoder));
     gui.exec();