[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/4.3/kdelibs/kdecore/localization
From:       Chusslove Illich <caslav.ilic () gmx ! net>
Date:       2009-07-02 12:10:51
Message-ID: 1246536651.467571.27356.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 990354 by ilic:

Performance optimization for usual case and some old cruft removed. (bport: 990353)

 M  +4 -10     klocale.cpp  
 M  +1 -3      kuitsemantics.cpp  


--- branches/KDE/4.3/kdelibs/kdecore/localization/klocale.cpp #990353:990354
@@ -1292,14 +1292,6 @@
   if (round && precision < 0)
     return numStr;
 
-  // FIXME: Temporary until full language-sensitivity implemented.
-  QString numLang = d->language;
-  int p = tmpString.indexOf('\x04');
-  if (p >= 0) {
-    numLang = tmpString.mid(p + 1);
-    tmpString = tmpString.left(p);
-  }
-
   // Skip the sign (for now)
   const bool neg = (tmpString[0] == '-');
   if (neg || tmpString[0] == '+') tmpString.remove(0, 1);
@@ -1334,8 +1326,10 @@
   mantString.prepend(neg?negativeSign():positiveSign());
 
   // Convert to target digit set.
-  mantString = convertDigits(mantString, d->digitSet);
-  expString = convertDigits(expString, d->digitSet);
+  if (d->digitSet != KLocale::ArabicDigits) {
+      mantString = convertDigits(mantString, d->digitSet);
+      expString = convertDigits(expString, d->digitSet);
+  }
 
   return mantString + expString;
 }
--- branches/KDE/4.3/kdelibs/kdecore/localization/kuitsemantics.cpp #990353:990354
@@ -1415,9 +1415,7 @@
     if (   (tag == Kuit::Tag::NumIntg || tag == Kuit::Tag::NumReal) \
         && numctx < 1)
     {
-        // FIXME: Temporary until full language-sensitivity implemented.
-        QString text2 = text + '\x04' + m_lang;
-        return KGlobal::locale()->formatNumber(text2, false);
+        return KGlobal::locale()->formatNumber(text, false);
     }
     else if (tag == Kuit::Tag::Filename) {
         return QDir::toNativeSeparators(text);
[prev in list] [next in list] [prev in thread] [next in thread]