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
This commit is contained in:
Dominik Riebeling 2010-06-18 19:04:06 +00:00
parent ae64b59afa
commit 2c6895207d
4 changed files with 15 additions and 11 deletions

View file

@ -180,7 +180,7 @@ QString Utils::checkEnvironment(bool permission)
#if defined(Q_OS_WIN32)
if(System::userPermissions() != System::ADMIN)
{
text += QObject::tr("<li>Permissions insufficient for bootloader "
text += tr("<li>Permissions insufficient for bootloader "
"installation.\nAdministrator priviledges are necessary.</li>");
}
#endif
@ -192,14 +192,14 @@ QString Utils::checkEnvironment(bool permission)
if(!installed.isEmpty() && installed !=
SystemInfo::value(SystemInfo::CurConfigureModel).toString())
{
text += QObject::tr("<li>Target mismatch detected.\n"
text += tr("<li>Target mismatch detected.\n"
"Installed target: %1, selected target: %2.</li>")
.arg(installed, SystemInfo::value(SystemInfo::CurPlatformName).toString());
// FIXME: replace installed by human-friendly name
}
if(!text.isEmpty())
return QObject::tr("Problem detected:") + "<ul>" + text + "</ul>";
return tr("Problem detected:") + "<ul>" + text + "</ul>";
else
return text;
}