Corrections diverses

git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@204 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
xavierqet
2007-11-04 17:37:10 +00:00
parent 6c4a7ace87
commit 317256b134
10 changed files with 35 additions and 31 deletions

View File

@@ -151,16 +151,16 @@ bool NamesList::operator==(const NamesList &nl) const {
@param fallback_name Le nom a retourner si aucun nom approprie n'est trouve
@return Le nom approprie en fonction de la langue du systeme
*/
const QString &NamesList::name(const QString &fallback_name) const {
QString NamesList::name(const QString &fallback_name) const {
// recupere les deux premiers caracteres de la locale en cours du systeme
QString system_language = QLocale::system().name().left(2);
QString *returned_name;
if (hash_names[system_language] != QString()) {
returned_name = new QString(hash_names[system_language]);
} else if (hash_names["en"] != QString()) {
returned_name = new QString(hash_names["en"]);
QString returned_name;
if (!hash_names[system_language].isEmpty()) {
returned_name = hash_names[system_language];
} else if (!hash_names["en"].isEmpty()) {
returned_name = hash_names["en"];
} else {
returned_name = new QString(fallback_name);
returned_name = fallback_name;
}
return(*returned_name);
return(returned_name);
}