--- a/src/hbcore/i18n/hbstringutil.cpp Wed Aug 18 10:05:37 2010 +0300
+++ b/src/hbcore/i18n/hbstringutil.cpp Thu Sep 02 20:44:51 2010 +0300
@@ -109,9 +109,9 @@
TPtrC s1Ptr( strFrom.utf16() );
TPtrC s2Ptr( strToMatch.utf16() );
- if ( (maxLevel < 0) || (maxLevel > 3) ) {
- maxLevel = 0;
- }
+ if ( (maxLevel < 0) || (maxLevel > 3) ) {
+ maxLevel = 0;
+ }
if ( (flags < 0) || (flags > 127) ) {
flags = Default;
}
@@ -154,7 +154,7 @@
\param flags The flags that will be used. Default value is Default.
\return Positive if source string is greater, negative if it is less and
- zero if the content of both strings match.
+ zero if the content of both strings match.
Example:
\snippet{unittest_hbstringutil/unittest_hbstringutil.cpp,1}
@@ -166,9 +166,9 @@
TPtrC s1Ptr(string1.utf16());
TPtrC s2Ptr(string2.utf16());
- if ( (maxLevel < 0) || (maxLevel > 3) ) {
- maxLevel = 3;
- }
+ if ( (maxLevel < 0) || (maxLevel > 3) ) {
+ maxLevel = 3;
+ }
if ( (flags < 0) || (flags > 127) ) {
flags = Default;
}
@@ -213,9 +213,9 @@
TPtrC s1Ptr( strFrom.utf16() );
TPtrC s2Ptr( strToFind.utf16() );
- if ( (maxLevel < 0) || (maxLevel > 3) ) {
- maxLevel = 0;
- }
+ if ( (maxLevel < 0) || (maxLevel > 3) ) {
+ maxLevel = 0;
+ }
return s1Ptr.FindC( s2Ptr.Ptr(),
s2Ptr.Length(),
maxLevel );
@@ -343,15 +343,15 @@
*/
QString HbStringUtil::convertDigits( const QString str )
{
- HbExtendedLocale locale = HbExtendedLocale::system();
- DigitType digitType = WesternDigit;
- if (locale.language() == HbExtendedLocale::Arabic) {
- digitType = ArabicIndicDigit;
- } else if (locale.language() == HbExtendedLocale::Persian || locale.language() == HbExtendedLocale::Urdu) {
- digitType = EasternArabicIndicDigit;
- }
- QString converted = HbStringUtil::convertDigitsTo(str, digitType);
- return converted;
+ HbExtendedLocale locale = HbExtendedLocale::system();
+ DigitType digitType = WesternDigit;
+ if (locale.language() == HbExtendedLocale::Arabic) {
+ digitType = ArabicIndicDigit;
+ } else if (locale.language() == HbExtendedLocale::Persian || locale.language() == HbExtendedLocale::Urdu) {
+ digitType = EasternArabicIndicDigit;
+ }
+ QString converted = HbStringUtil::convertDigitsTo(str, digitType);
+ return converted;
}
/*!
@@ -382,7 +382,7 @@
convDigit[i] = QChar(convertedDigit);
break;
default:
- convDigit[i] = QChar(digit);
+ convDigit[i] = QChar(digit);
break;
};
}
@@ -401,18 +401,18 @@
*/
void HbStringUtil::sort( QStringList &strList )
{
- if ( strList.size() > 1 ) {
- qSort(strList.begin(), strList.end(), hbStringUtil_SortHelper);
- }
+ if ( strList.size() > 1 ) {
+ qSort(strList.begin(), strList.end(), hbStringUtil_SortHelper);
+ }
}
bool hbStringUtil_SortHelper( const QString &s1, const QString &s2 )
{
- if ( HbStringUtil::compareC(s1, s2) < 0 ) {
- // s1 is before s2
- return true;
- } else {
- // s1 is after s2 (or they are equal)
- return false;
- }
+ if ( HbStringUtil::compareC(s1, s2) < 0 ) {
+ // s1 is before s2
+ return true;
+ } else {
+ // s1 is after s2 (or they are equal)
+ return false;
+ }
}