--- a/src/hbcore/i18n/hbextendedlocale.cpp	Wed Aug 18 10:05:37 2010 +0300
+++ b/src/hbcore/i18n/hbextendedlocale.cpp	Thu Sep 02 20:44:51 2010 +0300
@@ -133,7 +133,7 @@
 QChar HbExtendedLocale::dateSeparator( int index ) const
 {
 #if defined(Q_OS_SYMBIAN)
-    _symbianLocale.LoadSystemSettings();	
+    _symbianLocale.LoadSystemSettings();    
     TChar val = _symbianLocale.GetLocale()->DateSeparator(index);
     return QChar(val);
 #else
@@ -163,7 +163,7 @@
     if ( index < 0 || index > 3 ) {
         return false;
     }
-    _symbianLocale.LoadSystemSettings();	
+    _symbianLocale.LoadSystemSettings();    
     TChar symbianch( ch.unicode() );
     _symbianLocale.GetLocale()->SetDateSeparator(symbianch, index);
     _symbianLocale.GetLocale()->Set();
@@ -443,9 +443,9 @@
     _symbianLocale.LoadSystemSettings();
     TLocalePos position = _symbianLocale.GetLocale()->AmPmSymbolPosition();
     if ( position == ELocaleBefore ) {
-    	return HbExtendedLocale::Before;
-    } else { 			
-    	return HbExtendedLocale::After;
+        return HbExtendedLocale::Before;
+    } else {            
+        return HbExtendedLocale::After;
     }
 #else
     return HbExtendedLocale::After;
@@ -533,11 +533,11 @@
     switch ( format ) {
     default:
     case QLocale::MetricSystem:
-    	set = EUnitsMetric;
-    	break;
+        set = EUnitsMetric;
+        break;
     case QLocale::ImperialSystem:
-    	set = EUnitsImperial;
-    	break;
+        set = EUnitsImperial;
+        break;
     }
     
     _symbianLocale.LoadSystemSettings();
@@ -589,11 +589,11 @@
     switch ( format ) {
     default:
     case QLocale::MetricSystem:
-    	set = EUnitsMetric;
-    	break;
+        set = EUnitsMetric;
+        break;
     case QLocale::ImperialSystem:
-    	set = EUnitsImperial;
-    	break;
+        set = EUnitsImperial;
+        break;
     }
     _symbianLocale.LoadSystemSettings();
     _symbianLocale.GetLocale()->SetUnitsDistanceLong(set);
@@ -620,11 +620,11 @@
     switch ( format ) {
     default:
     case QLocale::MetricSystem:
-    	set = EUnitsMetric;
-    	break;
+        set = EUnitsMetric;
+        break;
     case QLocale::ImperialSystem:
-    	set = EUnitsImperial;
-    	break;
+        set = EUnitsImperial;
+        break;
     }
     _symbianLocale.LoadSystemSettings();
     _symbianLocale.GetLocale()->SetUnitsGeneral(set);
@@ -1311,7 +1311,7 @@
         { ELangBasque,              "eu_ES" },
         { ELangGalician,            "gl_ES" },
 #endif
-        { ELangJavanese,            "jv_ID" },	
+        { ELangJavanese,            "jv_ID" },  
         { ELangMaithili,            "bh_IN" },
         { ELangAzerbaijani_Latin,   "az_AZ" }, 
         { ELangOriya,               "or_IN" },
@@ -1559,7 +1559,7 @@
                 ++i;
                 if ( i >= sys_fmt.size() ) {
                     break;
-		        }
+                }
 
                 c = sys_fmt.at(i);
                 
@@ -1739,8 +1739,8 @@
                     }
 
                     if ( !abbrev_next && locale->AmPmSpaceBetween() ) {
-						if ( pos == ELocaleBefore ) {
-						    qtampm.append(QLatin1Char(' '));
+                        if ( pos == ELocaleBefore ) {
+                            qtampm.append(QLatin1Char(' '));
                         } else {
                            qtampm.prepend(QLatin1Char(' '));
                         }
@@ -2127,7 +2127,7 @@
 {
 #if defined(Q_OS_SYMBIAN)
     QLocale::system();
-    _symbianLocale.LoadSystemSettings();	
+    _symbianLocale.LoadSystemSettings();    
 #endif
 }
 
@@ -2166,7 +2166,7 @@
            sp.reset(cleanup);
        }
     }    
-	QString resultString;
+    QString resultString;
     _symbianLocale.LoadSystemSettings();
     TDateTime s60DateTime;
          
@@ -2182,30 +2182,30 @@
     else {     
         return QString("");
     }
-	
-	TTime s60Date(s60DateTime);
-	
-	HBufC *s60Format = QString2HBufC(dateFormat);
+    
+    TTime s60Date(s60DateTime);
+    
+    HBufC *s60Format = QString2HBufC(dateFormat);
     if (!s60Format) {
         return QString();
     }
     QScopedPointer<HBufC> sp1(s60Format);
-		
-	HBufC *s60DateStr = HBufC::New(50);
+        
+    HBufC *s60DateStr = HBufC::New(50);
     if (!s60DateStr) {
         return QString();
     }         
     QScopedPointer<HBufC> sp2(s60DateStr);
     
     TPtr s60FormatPtr = s60Format->Des();    
-	TPtr s60DatePtr = s60DateStr->Des();
-	
-	TRAPD(err, s60Date.FormatL( s60DatePtr, s60FormatPtr ));
-	if( err ){
-		return QString("");
-	}	
-	return TDesC2QString(s60DateStr->Des());
-	
+    TPtr s60DatePtr = s60DateStr->Des();
+    
+    TRAPD(err, s60Date.FormatL( s60DatePtr, s60FormatPtr ));
+    if( err ){
+        return QString("");
+    }   
+    return TDesC2QString(s60DateStr->Des());
+    
 #else
     Q_UNUSED(dateFormat);
     return toString(date, ShortFormat );
@@ -2236,37 +2236,37 @@
     }    
 
     QString resultString;
-	
+    
     TDateTime s60DateTime;
     if (s60DateTime.Set( 0, TMonth(0), 0, time.hour(), time.minute(), time.second(), time.msec())) {
         return QString();
     }
-	
-	TTime s60Time(s60DateTime);
-	
-	HBufC *s60Format = QString2HBufC(timeFormat);
+    
+    TTime s60Time(s60DateTime);
+    
+    HBufC *s60Format = QString2HBufC(timeFormat);
     if (!s60Format) {
         return QString();
     }
     QScopedPointer<HBufC> sp1(s60Format);
-	
-	
-	HBufC *s60TimeStr = HBufC::New(50);
+    
+    
+    HBufC *s60TimeStr = HBufC::New(50);
     if (!s60TimeStr) {
         return QString();
     }         
     QScopedPointer<HBufC> sp2(s60TimeStr);
-	
-	TPtr s60FormatPtr = s60Format->Des();
-	TPtr s60TimePtr = s60TimeStr->Des();
-	
-	TRAPD(err, s60Time.FormatL( s60TimePtr, s60FormatPtr ));
-	if( err ){
-		return QString("");
-	}
-	return TDesC2QString(s60TimeStr->Des());
+    
+    TPtr s60FormatPtr = s60Format->Des();
+    TPtr s60TimePtr = s60TimeStr->Des();
+    
+    TRAPD(err, s60Time.FormatL( s60TimePtr, s60FormatPtr ));
+    if( err ){
+        return QString("");
+    }
+    return TDesC2QString(s60TimeStr->Des());
 #else 
     Q_UNUSED(timeFormat);
     return toString(time, ShortFormat);
-#endif	
+#endif  
 }