summaryrefslogtreecommitdiffstats
path: root/rbutil
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2009-06-15 19:06:03 +0000
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2009-06-15 19:06:03 +0000
commit7533dcb6eb6b762271525226b59efd5f58b80138 (patch)
tree8f1af406d4f700623bb6b18f7a376308505d51d4 /rbutil
parente8c825fc29088f0d5b06dc5728d004510e0d9b06 (diff)
downloadrockbox-7533dcb6eb6b762271525226b59efd5f58b80138.tar.gz
rockbox-7533dcb6eb6b762271525226b59efd5f58b80138.tar.bz2
rockbox-7533dcb6eb6b762271525226b59efd5f58b80138.zip
Fix manual download using the wrong filename if the manual name differs from the target name.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21296 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil')
-rw-r--r--rbutil/rbutilqt/base/rbsettings.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/rbutil/rbutilqt/base/rbsettings.cpp b/rbutil/rbutilqt/base/rbsettings.cpp
index 8e2e7c26d2..fec68b5336 100644
--- a/rbutil/rbutilqt/base/rbsettings.cpp
+++ b/rbutil/rbutilqt/base/rbsettings.cpp
@@ -46,7 +46,7 @@ const static struct {
{ RbSettings::ThemesUrl, "themes_url", "" },
{ RbSettings::BleedingInfo, "bleeding_info", "" },
{ RbSettings::CurPlatformName, ":platform:/name", "" },
- { RbSettings::CurManual, ":platform:/manual", "rockbox-:platform:" },
+ { RbSettings::CurManual, ":platform:/manualname","rockbox-:platform:" },
{ RbSettings::CurBootloaderMethod, ":platform:/bootloadermethod", "none" },
{ RbSettings::CurBootloaderName, ":platform:/bootloadername", "" },
{ RbSettings::CurBootloaderFile, ":platform:/bootloaderfile", "" },
@@ -107,7 +107,7 @@ void RbSettings::ensureRbSettingsExists()
// only use built-in rbutil.ini
systemSettings = new QSettings(":/ini/rbutil.ini", QSettings::IniFormat, 0);
}
-
+
if(userSettings == NULL)
{
// portable installation:
@@ -132,7 +132,7 @@ void RbSettings::ensureRbSettingsExists()
void RbSettings::sync()
{
- ensureRbSettingsExists();
+ ensureRbSettingsExists();
userSettings->sync();
#if defined(Q_OS_LINUX)
@@ -160,13 +160,13 @@ void RbSettings::sync()
QString RbSettings::userSettingFilename()
{
- ensureRbSettingsExists();
+ ensureRbSettingsExists();
return userSettings->fileName();
}
QVariant RbSettings::value(enum SystemSettings setting)
{
- ensureRbSettingsExists();
+ ensureRbSettingsExists();
// locate setting item
int i = 0;
@@ -181,14 +181,14 @@ QVariant RbSettings::value(enum SystemSettings setting)
}
QVariant RbSettings::value(enum UserSettings setting)
-{
- QString empty;
+{
+ QString empty;
return subValue(empty, setting);
}
QVariant RbSettings::subValue(QString sub, enum UserSettings setting)
{
- ensureRbSettingsExists();
+ ensureRbSettingsExists();
// locate setting item
int i = 0;
@@ -202,13 +202,13 @@ QVariant RbSettings::subValue(QString sub, enum UserSettings setting)
void RbSettings::setValue(enum UserSettings setting , QVariant value)
{
- QString empty;
+ QString empty;
return setSubValue(empty, setting, value);
}
void RbSettings::setSubValue(QString sub, enum UserSettings setting, QVariant value)
{
- ensureRbSettingsExists();
+ ensureRbSettingsExists();
// locate setting item
int i = 0;