[PC-BSD Commits] r12087 - pcbsd/current/src-qt4/pc-controlpanel

[svn at pcbsd.org]

Author: yurkis
Date: 2011-08-11 05:47:29 -0700 (Thu, 11 Aug 2011)
New Revision: 12087

Modified:
   pcbsd/current/src-qt4/pc-controlpanel/item.cpp
Log:
Fix for pc-controlpanel item class. After ini file reader was changed to enforce UTF8 encoding localized values was read incorrectly. At this time item text if fully UTF8 compatible and do not need any previous my ugly code

Modified: pcbsd/current/src-qt4/pc-controlpanel/item.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-controlpanel/item.cpp	2011-08-11 10:18:02 UTC (rev 12086)
+++ pcbsd/current/src-qt4/pc-controlpanel/item.cpp	2011-08-11 12:47:29 UTC (rev 12087)
@@ -252,10 +252,11 @@
 
     RetVal= Reader.value(FieldName).toString();
 
-    Str = QString::fromUtf8(Reader.value(FieldName + Locale).toByteArray());
+    Str = Reader.value(FieldName + Locale).toString();
     if (Str.length())
         RetVal= Str;
-    Str= QString::fromUtf8(Reader.value(FieldName+LocaleCountry).toByteArray());
+
+    Str= Reader.value(FieldName+LocaleCountry).toString();
     if (Str.length())
         RetVal= Str;