diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2009-06-15 19:06:03 +0000 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2009-06-15 19:06:03 +0000 |
commit | 7533dcb6eb6b762271525226b59efd5f58b80138 (patch) | |
tree | 8f1af406d4f700623bb6b18f7a376308505d51d4 /rbutil/rbutilqt/base | |
parent | e8c825fc29088f0d5b06dc5728d004510e0d9b06 (diff) | |
download | rockbox-7533dcb6eb6b762271525226b59efd5f58b80138.tar.gz 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/rbutilqt/base')
-rw-r--r-- | rbutil/rbutilqt/base/rbsettings.cpp | 20 |
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 { | |||
46 | { RbSettings::ThemesUrl, "themes_url", "" }, | 46 | { RbSettings::ThemesUrl, "themes_url", "" }, |
47 | { RbSettings::BleedingInfo, "bleeding_info", "" }, | 47 | { RbSettings::BleedingInfo, "bleeding_info", "" }, |
48 | { RbSettings::CurPlatformName, ":platform:/name", "" }, | 48 | { RbSettings::CurPlatformName, ":platform:/name", "" }, |
49 | { RbSettings::CurManual, ":platform:/manual", "rockbox-:platform:" }, | 49 | { RbSettings::CurManual, ":platform:/manualname","rockbox-:platform:" }, |
50 | { RbSettings::CurBootloaderMethod, ":platform:/bootloadermethod", "none" }, | 50 | { RbSettings::CurBootloaderMethod, ":platform:/bootloadermethod", "none" }, |
51 | { RbSettings::CurBootloaderName, ":platform:/bootloadername", "" }, | 51 | { RbSettings::CurBootloaderName, ":platform:/bootloadername", "" }, |
52 | { RbSettings::CurBootloaderFile, ":platform:/bootloaderfile", "" }, | 52 | { RbSettings::CurBootloaderFile, ":platform:/bootloaderfile", "" }, |
@@ -107,7 +107,7 @@ void RbSettings::ensureRbSettingsExists() | |||
107 | // only use built-in rbutil.ini | 107 | // only use built-in rbutil.ini |
108 | systemSettings = new QSettings(":/ini/rbutil.ini", QSettings::IniFormat, 0); | 108 | systemSettings = new QSettings(":/ini/rbutil.ini", QSettings::IniFormat, 0); |
109 | } | 109 | } |
110 | 110 | ||
111 | if(userSettings == NULL) | 111 | if(userSettings == NULL) |
112 | { | 112 | { |
113 | // portable installation: | 113 | // portable installation: |
@@ -132,7 +132,7 @@ void RbSettings::ensureRbSettingsExists() | |||
132 | 132 | ||
133 | void RbSettings::sync() | 133 | void RbSettings::sync() |
134 | { | 134 | { |
135 | ensureRbSettingsExists(); | 135 | ensureRbSettingsExists(); |
136 | 136 | ||
137 | userSettings->sync(); | 137 | userSettings->sync(); |
138 | #if defined(Q_OS_LINUX) | 138 | #if defined(Q_OS_LINUX) |
@@ -160,13 +160,13 @@ void RbSettings::sync() | |||
160 | 160 | ||
161 | QString RbSettings::userSettingFilename() | 161 | QString RbSettings::userSettingFilename() |
162 | { | 162 | { |
163 | ensureRbSettingsExists(); | 163 | ensureRbSettingsExists(); |
164 | return userSettings->fileName(); | 164 | return userSettings->fileName(); |
165 | } | 165 | } |
166 | 166 | ||
167 | QVariant RbSettings::value(enum SystemSettings setting) | 167 | QVariant RbSettings::value(enum SystemSettings setting) |
168 | { | 168 | { |
169 | ensureRbSettingsExists(); | 169 | ensureRbSettingsExists(); |
170 | 170 | ||
171 | // locate setting item | 171 | // locate setting item |
172 | int i = 0; | 172 | int i = 0; |
@@ -181,14 +181,14 @@ QVariant RbSettings::value(enum SystemSettings setting) | |||
181 | } | 181 | } |
182 | 182 | ||
183 | QVariant RbSettings::value(enum UserSettings setting) | 183 | QVariant RbSettings::value(enum UserSettings setting) |
184 | { | 184 | { |
185 | QString empty; | 185 | QString empty; |
186 | return subValue(empty, setting); | 186 | return subValue(empty, setting); |
187 | } | 187 | } |
188 | 188 | ||
189 | QVariant RbSettings::subValue(QString sub, enum UserSettings setting) | 189 | QVariant RbSettings::subValue(QString sub, enum UserSettings setting) |
190 | { | 190 | { |
191 | ensureRbSettingsExists(); | 191 | ensureRbSettingsExists(); |
192 | 192 | ||
193 | // locate setting item | 193 | // locate setting item |
194 | int i = 0; | 194 | int i = 0; |
@@ -202,13 +202,13 @@ QVariant RbSettings::subValue(QString sub, enum UserSettings setting) | |||
202 | 202 | ||
203 | void RbSettings::setValue(enum UserSettings setting , QVariant value) | 203 | void RbSettings::setValue(enum UserSettings setting , QVariant value) |
204 | { | 204 | { |
205 | QString empty; | 205 | QString empty; |
206 | return setSubValue(empty, setting, value); | 206 | return setSubValue(empty, setting, value); |
207 | } | 207 | } |
208 | 208 | ||
209 | void RbSettings::setSubValue(QString sub, enum UserSettings setting, QVariant value) | 209 | void RbSettings::setSubValue(QString sub, enum UserSettings setting, QVariant value) |
210 | { | 210 | { |
211 | ensureRbSettingsExists(); | 211 | ensureRbSettingsExists(); |
212 | 212 | ||
213 | // locate setting item | 213 | // locate setting item |
214 | int i = 0; | 214 | int i = 0; |