diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2010-06-18 19:04:06 +0000 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2010-06-18 19:04:06 +0000 |
commit | 2c6895207d46f1005afb33668f277237ac5e1238 (patch) | |
tree | c4a82f6808550e9aa2990a5c411970bb0136b4a0 /rbutil/rbutilqt/base/utils.cpp | |
parent | ae64b59afad9e186340b4cfe27f8fa78157c80b1 (diff) | |
download | rockbox-2c6895207d46f1005afb33668f277237ac5e1238.tar.gz rockbox-2c6895207d46f1005afb33668f277237ac5e1238.zip |
Make System and Utils class based on QObject.
Those classes use Qt objects anyway, and making them based on QObject moved the
strings into the appropriate class when translating.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26931 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil/rbutilqt/base/utils.cpp')
-rw-r--r-- | rbutil/rbutilqt/base/utils.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/rbutil/rbutilqt/base/utils.cpp b/rbutil/rbutilqt/base/utils.cpp index ce8cb1c5a9..f9efd955f0 100644 --- a/rbutil/rbutilqt/base/utils.cpp +++ b/rbutil/rbutilqt/base/utils.cpp | |||
@@ -180,7 +180,7 @@ QString Utils::checkEnvironment(bool permission) | |||
180 | #if defined(Q_OS_WIN32) | 180 | #if defined(Q_OS_WIN32) |
181 | if(System::userPermissions() != System::ADMIN) | 181 | if(System::userPermissions() != System::ADMIN) |
182 | { | 182 | { |
183 | text += QObject::tr("<li>Permissions insufficient for bootloader " | 183 | text += tr("<li>Permissions insufficient for bootloader " |
184 | "installation.\nAdministrator priviledges are necessary.</li>"); | 184 | "installation.\nAdministrator priviledges are necessary.</li>"); |
185 | } | 185 | } |
186 | #endif | 186 | #endif |
@@ -192,14 +192,14 @@ QString Utils::checkEnvironment(bool permission) | |||
192 | if(!installed.isEmpty() && installed != | 192 | if(!installed.isEmpty() && installed != |
193 | SystemInfo::value(SystemInfo::CurConfigureModel).toString()) | 193 | SystemInfo::value(SystemInfo::CurConfigureModel).toString()) |
194 | { | 194 | { |
195 | text += QObject::tr("<li>Target mismatch detected.\n" | 195 | text += tr("<li>Target mismatch detected.\n" |
196 | "Installed target: %1, selected target: %2.</li>") | 196 | "Installed target: %1, selected target: %2.</li>") |
197 | .arg(installed, SystemInfo::value(SystemInfo::CurPlatformName).toString()); | 197 | .arg(installed, SystemInfo::value(SystemInfo::CurPlatformName).toString()); |
198 | // FIXME: replace installed by human-friendly name | 198 | // FIXME: replace installed by human-friendly name |
199 | } | 199 | } |
200 | 200 | ||
201 | if(!text.isEmpty()) | 201 | if(!text.isEmpty()) |
202 | return QObject::tr("Problem detected:") + "<ul>" + text + "</ul>"; | 202 | return tr("Problem detected:") + "<ul>" + text + "</ul>"; |
203 | else | 203 | else |
204 | return text; | 204 | return text; |
205 | } | 205 | } |