summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--rbutil/rbutilqt/encodersgui.cpp2
-rw-r--r--rbutil/rbutilqt/encodersgui.h2
-rw-r--r--rbutil/rbutilqt/rbsettings.cpp4
3 files changed, 4 insertions, 4 deletions
diff --git a/rbutil/rbutilqt/encodersgui.cpp b/rbutil/rbutilqt/encodersgui.cpp
index 76d0acf..b363e95 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 f889823..389139c 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 2dd1996..c4b33ce 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";
}
}