From 80a6d16d395ed036d25cf407f8df7e3bd87c15b7 Mon Sep 17 00:00:00 2001
From: domonoky <domonoky@a1c6a512-1295-4272-9138-f99709370657>
Date: Wed, 30 Jan 2008 19:46:02 +0000
Subject: [PATCH] rbutil: fix a bug in rbsettings: FS#8512 by Sander Knopper.
 Also remove a warning in encodersgui.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16185 a1c6a512-1295-4272-9138-f99709370657
---
 rbutil/rbutilqt/encodersgui.cpp | 2 +-
 rbutil/rbutilqt/encodersgui.h   | 2 +-
 rbutil/rbutilqt/rbsettings.cpp  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/rbutil/rbutilqt/encodersgui.cpp b/rbutil/rbutilqt/encodersgui.cpp
index 76d0acf5c..b363e95e6 100644
--- a/rbutil/rbutilqt/encodersgui.cpp
+++ b/rbutil/rbutilqt/encodersgui.cpp
@@ -122,7 +122,7 @@ EncRbSpeexGui::EncRbSpeexGui(QDialog* parent) : QDialog(parent)
 
 }
 
-void EncRbSpeexGui::showCfg(float defQ,float defV,float defC, bool defB)
+void EncRbSpeexGui::showCfg(float defQ,float defV,int defC, bool defB)
 {
     defaultQuality =defQ;
     defaultVolume = defV;
diff --git a/rbutil/rbutilqt/encodersgui.h b/rbutil/rbutilqt/encodersgui.h
index f889823ac..389139c56 100644
--- a/rbutil/rbutilqt/encodersgui.h
+++ b/rbutil/rbutilqt/encodersgui.h
@@ -55,7 +55,7 @@ class EncRbSpeexGui : public QDialog
 public:
     EncRbSpeexGui(QDialog* parent = NULL);
     
-    void showCfg(float defQ,float defV,float defC, bool defB);
+    void showCfg(float defQ,float defV,int defC, bool defB);
     void setCfg(RbSettings* sett){settings = sett;}
 
 public slots:
diff --git a/rbutil/rbutilqt/rbsettings.cpp b/rbutil/rbutilqt/rbsettings.cpp
index 2dd19965b..c4b33ce29 100644
--- a/rbutil/rbutilqt/rbsettings.cpp
+++ b/rbutil/rbutilqt/rbsettings.cpp
@@ -32,13 +32,13 @@ void RbSettings::open()
     if(config.isFile()) 
     {
         userSettings = new QSettings(qApp->applicationDirPath() + "/RockboxUtility.ini",
-            QSettings::IniFormat, 0);
+            QSettings::IniFormat, this);
         qDebug() << "config: portable";
     }
     else
     {
         userSettings = new QSettings(QSettings::IniFormat,
-            QSettings::UserScope, "rockbox.org", "RockboxUtility");
+            QSettings::UserScope, "rockbox.org", "RockboxUtility",this);
         qDebug() << "config: system";
     }
 }
-- 
2.11.4.GIT