Merge commit 'origin/master' into softkeys

15 files changed, 101 insertions, 53 deletions

diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp
index 038d490..e3e3a81 100644
--- a/src/gui/styles/qs60style.cpp
+++ b/src/gui/styles/qs60style.cpp
@@ -53,14 +53,14 @@ static const QByteArray propertyKeyCurrentlayout = "currentlayout";
 #if defined(QT_S60STYLE_LAYOUTDATA_SIMULATED)
 const layoutHeader QS60StylePrivate::m_layoutHeaders[] = {
 // *** generated layout data ***
-{240,320,1,13,true,QLatin1String("QVGA Landscape Mirrored")},
-{240,320,1,13,false,QLatin1String("QVGA Landscape")},
-{320,240,1,13,true,QLatin1String("QVGA Portrait Mirrored")},
-{320,240,1,13,false,QLatin1String("QVGA Portrait")},
-{360,640,1,13,true,QLatin1String("NHD Landscape Mirrored")},
-{360,640,1,13,false,QLatin1String("NHD Landscape")},
-{640,360,1,13,true,QLatin1String("NHD Portrait Mirrored")},
-{640,360,1,13,false,QLatin1String("NHD Portrait")},
+{240,320,1,14,true,QLatin1String("QVGA Landscape Mirrored")},
+{240,320,1,14,false,QLatin1String("QVGA Landscape")},
+{320,240,1,14,true,QLatin1String("QVGA Portrait Mirrored")},
+{320,240,1,14,false,QLatin1String("QVGA Portrait")},
+{360,640,1,14,true,QLatin1String("NHD Landscape Mirrored")},
+{360,640,1,14,false,QLatin1String("NHD Landscape")},
+{640,360,1,14,true,QLatin1String("NHD Portrait Mirrored")},
+{640,360,1,14,false,QLatin1String("NHD Portrait")},
 {352,800,1,12,true,QLatin1String("E90 Landscape Mirrored")},
 {352,800,1,12,false,QLatin1String("E90 Landscape")}
 // *** End of generated data ***
@@ -70,14 +70,14 @@ const int QS60StylePrivate::m_numberOfLayouts =
 
 const short QS60StylePrivate::data[][MAX_PIXELMETRICS] = {
 // *** generated pixel metrics ***
-{5,0,-909,0,0,1,0,0,-1,8,15,22,15,15,7,198,-909,-909,-909,19,15,2,0,0,21,-909,21,-909,4,4,1,-909,-909,0,2,0,0,13,23,17,17,21,21,2,115,21,0,-909,-909,-909,-909,0,0,15,1,-909,0,0,-909,15,-909,-909,-909,-909,32,21,51,27,51,4,4,5,3,15,-909,5,58,12,5,0,7,4,4,9,4,4,-909,1,-909,-909,-909,-909,4,4,3,1},
-{5,0,-909,0,0,1,0,0,-1,8,15,22,15,15,7,198,-909,-909,-909,19,15,2,0,0,21,-909,21,-909,4,4,1,-909,-909,0,2,0,0,13,23,17,17,21,21,2,115,21,0,-909,-909,-909,-909,0,0,15,1,-909,0,0,-909,15,-909,-909,-909,-909,32,21,51,27,51,4,4,5,3,15,-909,5,58,12,5,0,4,4,7,9,4,4,-909,1,-909,-909,-909,-909,4,4,3,1},
-{5,0,-909,0,0,1,0,0,-1,8,14,22,15,15,7,164,-909,-909,-909,19,15,2,0,0,21,-909,27,-909,4,4,1,-909,-909,0,7,6,0,13,23,17,17,21,21,7,115,21,0,-909,-909,-909,-909,0,0,15,1,-909,0,0,-909,15,-909,-909,-909,-909,32,21,65,27,65,4,4,5,3,15,-909,5,58,13,5,0,7,4,4,9,4,4,-909,1,-909,-909,-909,-909,4,4,3,1},
-{5,0,-909,0,0,1,0,0,-1,8,14,22,15,15,7,164,-909,-909,-909,19,15,2,0,0,21,-909,27,-909,4,4,1,-909,-909,0,7,6,0,13,23,17,17,21,21,7,115,21,0,-909,-909,-909,-909,0,0,15,1,-909,0,0,-909,15,-909,-909,-909,-909,32,21,65,27,65,4,4,5,3,15,-909,5,58,13,5,0,4,4,7,9,4,4,-909,1,-909,-909,-909,-909,4,4,3,1},
-{7,0,-909,0,0,2,0,0,-1,20,53,28,19,19,9,258,-909,-909,-909,29,19,26,0,0,32,-909,72,-909,5,5,2,-909,-909,0,7,21,0,17,29,22,22,27,27,7,173,29,0,-909,-909,-909,-909,0,0,25,2,-909,0,0,-909,25,-909,-909,-909,-909,87,27,77,35,77,5,5,6,3,19,-909,7,74,19,7,0,8,5,5,12,5,5,-909,2,-909,-909,-909,-909,7,7,3,1},
-{7,0,-909,0,0,2,0,0,-1,20,53,28,19,19,9,258,-909,-909,-909,29,19,26,0,0,32,-909,72,-909,5,5,2,-909,-909,0,7,21,0,17,29,22,22,27,27,7,173,29,0,-909,-909,-909,-909,0,0,25,2,-909,0,0,-909,25,-909,-909,-909,-909,87,27,77,35,77,5,5,6,3,19,-909,7,74,19,7,0,5,5,8,12,5,5,-909,2,-909,-909,-909,-909,7,7,3,1},
-{7,0,-909,0,0,2,0,0,-1,20,52,28,19,19,9,258,-909,-909,-909,29,19,6,0,0,32,-909,60,-909,5,5,2,-909,-909,0,7,32,0,17,29,22,22,27,27,7,173,29,0,-909,-909,-909,-909,0,0,26,2,-909,0,0,-909,26,-909,-909,-909,-909,87,27,98,35,98,5,5,6,3,19,-909,7,74,22,7,0,8,5,5,12,5,5,-909,2,-909,-909,-909,-909,7,7,3,1},
-{7,0,-909,0,0,2,0,0,-1,20,52,28,19,19,9,258,-909,-909,-909,29,19,6,0,0,32,-909,60,-909,5,5,2,-909,-909,0,7,32,0,17,29,22,22,27,27,7,173,29,0,-909,-909,-909,-909,0,0,26,2,-909,0,0,-909,26,-909,-909,-909,-909,87,27,98,35,98,5,5,6,3,19,-909,7,74,22,7,0,5,5,8,12,5,5,-909,2,-909,-909,-909,-909,7,7,3,1},
+{5,0,-909,0,0,1,0,0,-1,8,15,22,15,15,7,198,-909,-909,-909,19,15,2,0,0,21,-909,21,-909,4,4,1,-909,-909,0,2,0,0,13,23,17,17,21,21,2,115,21,0,-909,-909,-909,-909,0,0,15,1,-909,0,0,-909,15,-909,-909,-909,-909,32,21,51,27,51,4,4,5,10,15,-909,5,58,12,5,0,7,4,4,9,4,4,-909,1,-909,-909,-909,-909,4,4,3,1},
+{5,0,-909,0,0,1,0,0,-1,8,15,22,15,15,7,198,-909,-909,-909,19,15,2,0,0,21,-909,21,-909,4,4,1,-909,-909,0,2,0,0,13,23,17,17,21,21,2,115,21,0,-909,-909,-909,-909,0,0,15,1,-909,0,0,-909,15,-909,-909,-909,-909,32,21,51,27,51,4,4,5,10,15,-909,5,58,12,5,0,4,4,7,9,4,4,-909,1,-909,-909,-909,-909,4,4,3,1},
+{5,0,-909,0,0,1,0,0,-1,8,14,22,15,15,7,164,-909,-909,-909,19,15,2,0,0,21,-909,27,-909,4,4,1,-909,-909,0,7,6,0,13,23,17,17,21,21,7,115,21,0,-909,-909,-909,-909,0,0,15,1,-909,0,0,-909,15,-909,-909,-909,-909,32,21,65,27,65,4,4,5,10,15,-909,5,58,13,5,0,7,4,4,9,4,4,-909,1,-909,-909,-909,-909,4,4,3,1},
+{5,0,-909,0,0,1,0,0,-1,8,14,22,15,15,7,164,-909,-909,-909,19,15,2,0,0,21,-909,27,-909,4,4,1,-909,-909,0,7,6,0,13,23,17,17,21,21,7,115,21,0,-909,-909,-909,-909,0,0,15,1,-909,0,0,-909,15,-909,-909,-909,-909,32,21,65,27,65,4,4,5,10,15,-909,5,58,13,5,0,4,4,7,9,4,4,-909,1,-909,-909,-909,-909,4,4,3,1},
+{7,0,-909,0,0,2,0,0,-1,20,53,28,19,19,9,258,-909,-909,-909,29,19,26,0,0,32,-909,72,-909,5,5,2,-909,-909,0,7,21,0,17,29,22,22,27,27,7,173,29,0,-909,-909,-909,-909,0,0,25,2,-909,0,0,-909,25,-909,-909,-909,-909,87,27,77,35,77,5,5,6,8,19,-909,7,74,19,7,0,8,5,5,12,5,5,-909,2,-909,-909,-909,-909,7,7,3,1},
+{7,0,-909,0,0,2,0,0,-1,20,53,28,19,19,9,258,-909,-909,-909,29,19,26,0,0,32,-909,72,-909,5,5,2,-909,-909,0,7,21,0,17,29,22,22,27,27,7,173,29,0,-909,-909,-909,-909,0,0,25,2,-909,0,0,-909,25,-909,-909,-909,-909,87,27,77,35,77,5,5,6,8,19,-909,7,74,19,7,0,5,5,8,12,5,5,-909,2,-909,-909,-909,-909,7,7,3,1},
+{7,0,-909,0,0,2,0,0,-1,20,52,28,19,19,9,258,-909,-909,-909,29,19,6,0,0,32,-909,60,-909,5,5,2,-909,-909,0,7,32,0,17,29,22,22,27,27,7,173,29,0,-909,-909,-909,-909,0,0,26,2,-909,0,0,-909,26,-909,-909,-909,-909,87,27,98,35,98,5,5,6,8,19,-909,7,74,22,7,0,8,5,5,12,5,5,-909,2,-909,-909,-909,-909,7,7,3,1},
+{7,0,-909,0,0,2,0,0,-1,20,52,28,19,19,9,258,-909,-909,-909,29,19,6,0,0,32,-909,60,-909,5,5,2,-909,-909,0,7,32,0,17,29,22,22,27,27,7,173,29,0,-909,-909,-909,-909,0,0,26,2,-909,0,0,-909,26,-909,-909,-909,-909,87,27,98,35,98,5,5,6,8,19,-909,7,74,22,7,0,5,5,8,12,5,5,-909,2,-909,-909,-909,-909,7,7,3,1},
 {7,0,-909,0,0,2,0,0,-1,10,20,27,18,18,9,301,-909,-909,-909,29,18,5,0,0,35,-909,32,-909,5,5,2,-909,-909,0,2,8,0,16,28,21,21,26,26,2,170,26,0,-909,-909,-909,-909,0,0,21,5,-909,0,0,-909,-909,-909,-909,-909,-909,54,26,265,34,265,5,5,6,3,18,-909,7,72,19,7,0,8,6,5,11,6,5,-909,2,-909,-909,-909,-909,5,5,3,1},
 {7,0,-909,0,0,2,0,0,-1,10,20,27,18,18,9,301,-909,-909,-909,29,18,5,0,0,35,-909,32,-909,5,5,2,-909,-909,0,2,8,0,16,28,21,21,26,26,2,170,26,0,-909,-909,-909,-909,0,0,21,6,-909,0,0,-909,-909,-909,-909,-909,-909,54,26,265,34,265,5,5,6,3,18,-909,7,72,19,7,0,5,6,8,11,6,5,-909,2,-909,-909,-909,-909,5,5,3,1}
 
diff --git a/src/network/socket/qnativesocketengine_unix.cpp b/src/network/socket/qnativesocketengine_unix.cpp
index 5584c6a..0e0980c 100644
--- a/src/network/socket/qnativesocketengine_unix.cpp
+++ b/src/network/socket/qnativesocketengine_unix.cpp
@@ -885,17 +885,38 @@ int QNativeSocketEnginePrivate::nativeSelect(int timeout, bool selectForRead) co
     tv.tv_sec = timeout / 1000;
     tv.tv_usec = (timeout % 1000) * 1000;
 
+#ifdef Q_OS_SYMBIAN    
+    fd_set fdexec;
+    FD_ZERO(&fdexec);
+    FD_SET(socketDescriptor, &fdexec);    
+#endif   
+
     QTime timer;
     timer.start();
 
     int retval;
     do {
         if (selectForRead)
-           //retval = ::select(socketDescriptor + 1, &fds, 0, 0, timeout < 0 ? 0 : &tv);
+#ifndef Q_OS_SYMBIAN
            retval = qt_socket_select(socketDescriptor + 1, &fds, 0, 0, timeout < 0 ? 0 : &tv);
+#else            
+           retval = qt_socket_select(socketDescriptor + 1, &fds, 0, &fdexec, timeout < 0 ? 0 : &tv); 
+#endif             
         else
-           //retval = ::select(socketDescriptor + 1, 0, &fds, 0, timeout < 0 ? 0 : &tv);
+#ifndef Q_OS_SYMBIAN
            retval = qt_socket_select(socketDescriptor + 1, 0, &fds, 0, timeout < 0 ? 0 : &tv);
+#else            
+           retval = qt_socket_select(socketDescriptor + 1, 0, &fds, &fdexec, timeout < 0 ? 0 : &tv); 
+#endif                 
+
+            
+#ifdef Q_OS_SYMBIAN            
+        bool selectForExec = FD_ISSET(socketDescriptor, &fdexec);        
+        if(selectForExec) {
+            qWarning("nativeSelect (selectForRead %d, retVal %d) Unexpected expectfds ready in fd %d", 
+            		selectForRead, retval, socketDescriptor);
+			}
+#endif            
 
         if (retval != -1 || errno != EINTR) {
             break;
@@ -930,6 +951,12 @@ int QNativeSocketEnginePrivate::nativeSelect(int timeout, bool checkRead, bool c
     FD_ZERO(&fdwrite);
     if (checkWrite)
         FD_SET(socketDescriptor, &fdwrite);
+    
+#ifdef Q_OS_SYMBIAN    
+    fd_set fdexec;
+    FD_ZERO(&fdexec);
+    FD_SET(socketDescriptor, &fdexec);    
+#endif    
 
     struct timeval tv;
     tv.tv_sec = timeout / 1000;
@@ -940,10 +967,20 @@ int QNativeSocketEnginePrivate::nativeSelect(int timeout, bool checkRead, bool c
 
     int ret;
     do {
-
+#ifndef Q_OS_SYMBIAN
         ret = qt_socket_select(socketDescriptor + 1, &fdread, &fdwrite, 0, timeout < 0 ? 0 : &tv);
-        //ret = ::select(socketDescriptor + 1, &fdread, &fdwrite, 0, timeout < 0 ? 0 : &tv);
-
+#else            
+        ret = qt_socket_select(socketDescriptor + 1, &fdread, &fdwrite, &fdexec, timeout < 0 ? 0 : &tv);
+        bool selectForExec = FD_ISSET(socketDescriptor, &fdexec);        
+        if(selectForExec) {
+        	qWarning("nativeSelect (checkRead %d, checkWrite %d, ret %d): Unexpected expectfds ready in fd %d", 
+        			checkRead, checkWrite, ret, socketDescriptor);
+        	if(checkRead)
+        	    FD_SET(socketDescriptor, &fdread);
+        	if(checkWrite)
+				FD_SET(socketDescriptor, &fdwrite);           	     		
+        }
+#endif        
         if (ret != -1 || errno != EINTR) {
             break;
         }
diff --git a/tests/auto/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/qtcpsocket/tst_qtcpsocket.cpp
index 2e039bf..da3f19a 100644
--- a/tests/auto/qtcpsocket/tst_qtcpsocket.cpp
+++ b/tests/auto/qtcpsocket/tst_qtcpsocket.cpp
@@ -944,7 +944,7 @@ public:
         : server(0), ok(false), quit(false)
     { }
 
-    ~ReceiverThread() { wait(); delete server; }
+    ~ReceiverThread() { /*delete server;*/ terminate(); wait();  }
 
     bool listen()
     {
@@ -969,7 +969,11 @@ protected:
 
         QTcpSocket *socket = server->nextPendingConnection();
         while (!quit) {
+#ifndef Q_OS_SYMBIAN    
             if (socket->waitForDisconnected(500))
+#else    
+            if (socket->waitForDisconnected(1000))
+#endif     
                 break;
             if (socket->error() != QAbstractSocket::SocketTimeoutError)
                 return;
@@ -992,8 +996,6 @@ void tst_QTcpSocket::disconnectWhileConnectingNoEventLoop_data()
 
 void tst_QTcpSocket::disconnectWhileConnectingNoEventLoop()
 {
-    QSKIP("Check this", SkipAll);
-    
     QFETCH(QByteArray, data);
 
     ReceiverThread thread;
@@ -1019,7 +1021,11 @@ void tst_QTcpSocket::disconnectWhileConnectingNoEventLoop()
         socket->disconnectFromHost();
     }
 
+#ifndef Q_OS_SYMBIAN    
     QVERIFY2(socket->waitForDisconnected(10000), "Network timeout");
+#else    
+    QVERIFY2(socket->waitForDisconnected(20000), "Network timeout");
+#endif     
     QVERIFY(socket->state() == QAbstractSocket::UnconnectedState);
     if (!closeDirectly) {
         QCOMPARE(int(socket->openMode()), int(QIODevice::ReadWrite));
diff --git a/util/s60pixelmetrics/pixelmetricsmapper/bld.inf b/util/s60pixelmetrics/bld.inf
index 748e8810..748e8810 100644
--- a/util/s60pixelmetrics/pixelmetricsmapper/bld.inf
+++ b/util/s60pixelmetrics/bld.inf
diff --git a/util/s60pixelmetrics/src/pixel_metrics.cpp b/util/s60pixelmetrics/pixel_metrics.cpp
index f71a266..8925ebe 100644
--- a/util/s60pixelmetrics/src/pixel_metrics.cpp
+++ b/util/s60pixelmetrics/pixel_metrics.cpp
@@ -50,7 +50,7 @@
 // so that we can keep dynamic and static values inline.
 // Please adjust version data if correcting dynamic PM calculations.
 const TInt KPMMajorVersion = 1;
-const TInt KPMMinorVersion = 13;
+const TInt KPMMinorVersion = 14;
 
 TPixelMetricsVersion PixelMetrics::Version()
     {
@@ -295,17 +295,21 @@ TInt PixelMetrics::PixelMetricValue(QStyle::PixelMetric metric)
                   B is gap between icon and text
                   C is right padding
             */
+
             TRect rectParent( mainPaneRect );
             TAknLayoutRect layoutRect;
-            layoutRect.LayoutRect( rectParent,AknLayoutScalable_Avkon::list_set_graphic_pane(0).LayoutLine() );
+            layoutRect.LayoutRect( rectParent, AknLayoutScalable_Avkon::listscroll_gen_pane(0).LayoutLine() );
+
             TAknLayoutRect layoutRect2;
+            layoutRect2.LayoutRect( layoutRect.Rect(), AknLayoutScalable_Avkon::list_gen_pane(0).LayoutLine() );
             TAknLayoutRect layoutRect3;
-            layoutRect2.LayoutRect( layoutRect.Rect(),AknLayoutScalable_Avkon::set_content_pane().LayoutLine() );
+            layoutRect3.LayoutRect( layoutRect2.Rect(), AknLayoutScalable_Avkon::list_single_graphic_pane(0).LayoutLine() );
 
             TAknLayoutText itemText;
-            itemText.LayoutText( layoutRect2.Rect(), AknLayoutScalable_Avkon::list_set_graphic_pane_t1(0) );
+            itemText.LayoutText( layoutRect3.Rect(), AknLayoutScalable_Avkon::list_single_graphic_pane_t1(0) );
             TAknLayoutRect iconLayoutRect;
-            iconLayoutRect.LayoutRect( layoutRect2.Rect(), AknLayoutScalable_Avkon::list_set_graphic_pane_g1(0).LayoutLine() );
+            iconLayoutRect.LayoutRect( layoutRect3.Rect(), AknLayoutScalable_Avkon::list_single_graphic_pane_g1(0).LayoutLine() );
+
             if ( !AknLayoutUtils::LayoutMirrored() )
                 {
                 value = itemText.TextRect().iTl.iX - iconLayoutRect.Rect().iBr.iX;
@@ -973,6 +977,7 @@ TInt PixelMetrics::PixelMetricValue(QStyle::PixelMetric metric)
             inputFocusInnerRect.LayoutRect(mainPaneRect, AknLayoutScalable_Avkon::input_focus_pane_g1());
 
             value = inputFocusRect.Rect().iBr.iX - inputFocusInnerRect.Rect().iBr.iX;
+            value+= 2; //visually better value for generic cases
             }
             break;
         case QStyle::PM_Custom_FrameCornerHeight:
@@ -982,6 +987,7 @@ TInt PixelMetrics::PixelMetricValue(QStyle::PixelMetric metric)
             TAknLayoutRect inputFocusInnerRect;
             inputFocusInnerRect.LayoutRect(mainPaneRect, AknLayoutScalable_Avkon::input_focus_pane_g1());
             value = inputFocusRect.Rect().iBr.iY - inputFocusInnerRect.Rect().iBr.iY;
+            value+= 2; //visually better value for generic cases
             }
             break;
         case QStyle::PM_Custom_BoldLineWidth:
diff --git a/util/s60pixelmetrics/inc/pixel_metrics.h b/util/s60pixelmetrics/pixel_metrics.h
index 7235bda..692564c 100644
--- a/util/s60pixelmetrics/inc/pixel_metrics.h
+++ b/util/s60pixelmetrics/pixel_metrics.h
@@ -43,7 +43,7 @@
 #define PIXELMETRICS_H
 
 #include <e32base.h>
-//#define S60_Rnd_Env
+#define S60_Rnd_Env
 
 #ifdef S60_Rnd_Env
 #pragma message ("Building in supported environment")
diff --git a/util/s60pixelmetrics/pixelmetricsmapper/PMMapper.hrh b/util/s60pixelmetrics/pm_mapper.hrh
index afd47db..afd47db 100644
--- a/util/s60pixelmetrics/pixelmetricsmapper/PMMapper.hrh
+++ b/util/s60pixelmetrics/pm_mapper.hrh
diff --git a/util/s60pixelmetrics/pixelmetricsmapper/pm_mapper.mmp b/util/s60pixelmetrics/pm_mapper.mmp
index fe55fc9..a277404 100644
--- a/util/s60pixelmetrics/pixelmetricsmapper/pm_mapper.mmp
+++ b/util/s60pixelmetrics/pm_mapper.mmp
@@ -50,9 +50,9 @@ CAPABILITY CAP_APPLICATION
 VENDORID VID_DEFAULT
 
 SOURCEPATH      .
-SOURCE          pmmapperview.cpp
-SOURCE          pmmapperapp.cpp
-SOURCE          ..\src\pixel_metrics.cpp
+SOURCE          pm_mapperview.cpp
+SOURCE          pm_mapperapp.cpp
+SOURCE          pixel_metrics.cpp
 
 START RESOURCE  pm_mapper.rss
 HEADER
@@ -65,7 +65,6 @@ END
 
 APP_LAYER_SYSTEMINCLUDE
 USERINCLUDE     .
-USERINCLUDE ..\inc
 
 LIBRARY    eikcoctl.lib
 LIBRARY    avkon.lib
diff --git a/util/s60pixelmetrics/pixelmetricsmapper/pmmapper.pkg b/util/s60pixelmetrics/pm_mapper.pkg
index 1f2e38f..1f2e38f 100644
--- a/util/s60pixelmetrics/pixelmetricsmapper/pmmapper.pkg
+++ b/util/s60pixelmetrics/pm_mapper.pkg
diff --git a/util/s60pixelmetrics/pixelmetricsmapper/pm_mapper.rss b/util/s60pixelmetrics/pm_mapper.rss
index 60c15a8..8543271 100644
--- a/util/s60pixelmetrics/pixelmetricsmapper/pm_mapper.rss
+++ b/util/s60pixelmetrics/pm_mapper.rss
@@ -55,7 +55,7 @@ NAME TATR
 #include <data_caging_paths_strings.hrh>
 #include <appinfo.rh>
 
-#include "pmmapper.hrh"
+#include "pm_mapper.hrh"
 
 
 //  RESOURCE DEFINITIONS
diff --git a/util/s60pixelmetrics/pixelmetricsmapper/pm_mapper_reg.rss b/util/s60pixelmetrics/pm_mapper_reg.rss
index d21a2c8..d21a2c8 100644
--- a/util/s60pixelmetrics/pixelmetricsmapper/pm_mapper_reg.rss
+++ b/util/s60pixelmetrics/pm_mapper_reg.rss
diff --git a/util/s60pixelmetrics/pixelmetricsmapper/PMMapperApp.cpp b/util/s60pixelmetrics/pm_mapperapp.cpp
index de0b753..e699019 100644
--- a/util/s60pixelmetrics/pixelmetricsmapper/PMMapperApp.cpp
+++ b/util/s60pixelmetrics/pm_mapperapp.cpp
@@ -43,9 +43,9 @@
 
 #include <avkon.rsg>
 #include <avkon.hrh>
-#include "pmmapper.hrh"
-#include "pmmapperApp.h"
-#include "pmmapperView.h"
+#include "pm_mapper.hrh"
+#include "pm_mapperapp.h"
+#include "pm_mapperview.h"
 #include <pm_mapper.rsg>
 
 #include <BldVariant.hrh>
@@ -290,7 +290,7 @@ void CPixelMetricsMapperAppUi::HandleCommandL( TInt aCommand )
         case ECmdSwitchOrientation:
             {
             ClearL();
-			#ifndef __SERIES60_31__
+            #ifndef __SERIES60_31__
             if (!iAvkonAppUi->OrientationCanBeChanged())
                 {
                 HBufC* buffer = HBufC::NewLC( 100 );
@@ -301,7 +301,7 @@ void CPixelMetricsMapperAppUi::HandleCommandL( TInt aCommand )
                 bufferPtr.Zero();
                 delete buffer;
                 }
-			#endif //__SERIES60_31__
+            #endif //__SERIES60_31__
             if ( iAvkonAppUi->Orientation() == CAknAppUiBase::EAppUiOrientationPortrait)
                 {
                 iAvkonAppUi->SetOrientationL(CAknAppUiBase::EAppUiOrientationLandscape);
@@ -402,16 +402,16 @@ void CPixelMetricsMapperAppUi::HandleCommandL( TInt aCommand )
         }
     }
 void CPixelMetricsMapperAppUi::DoAutoOperationL()
-	{
-	HandleCommandL(ECmdStartCalculations);
-	iMode = EFalse;
-	HandleCommandL(ECmdSwitchMirroring);
-	}
+    {
+    HandleCommandL(ECmdStartCalculations);
+    iMode = EFalse;
+    HandleCommandL(ECmdSwitchMirroring);
+    }
 
 TBool CPixelMetricsMapperAppUi::ReadyForAutoOp() const
-	{
-	return (iAutoMode && iMode);
-	}
+    {
+    return (iAutoMode && iMode);
+    }
 
 // -----------------------------------------------------------------------------
 //
@@ -853,9 +853,9 @@ void CPixelMetricsMapperAppUi::CreateHeaderFileL() const
             else
                 {
                 if (nextValue == -909)
-                	bufferPMData.Append(_L("ECommonStyleValue"));
+                    bufferPMData.Append(_L("ECommonStyleValue"));
                 else
-                	bufferPMData.AppendNum(nextValue);
+                    bufferPMData.AppendNum(nextValue);
                 }
             oneline.Zero();
             loop++;
diff --git a/util/s60pixelmetrics/pixelmetricsmapper/PMMapperApp.h b/util/s60pixelmetrics/pm_mapperapp.h
index 02d297e..02d297e 100644
--- a/util/s60pixelmetrics/pixelmetricsmapper/PMMapperApp.h
+++ b/util/s60pixelmetrics/pm_mapperapp.h
diff --git a/util/s60pixelmetrics/pixelmetricsmapper/PMMapperView.cpp b/util/s60pixelmetrics/pm_mapperview.cpp
index 9d5d668..f7ab2ac 100644
--- a/util/s60pixelmetrics/pixelmetricsmapper/PMMapperView.cpp
+++ b/util/s60pixelmetrics/pm_mapperview.cpp
@@ -46,10 +46,10 @@
 #include <aknviewappui.h>
 #include <aknconsts.h>
 
-#include "pmmapper.hrh"
+#include "pm_mapper.hrh"
 #include <pm_mapper.rsg>
-#include "pmmapperView.h"
-#include "pmmapperApp.h"
+#include "pm_mapperView.h"
+#include "pm_mapperApp.h"
 
 #include <aknlists.h>
 #include <avkon.hrh>
diff --git a/util/s60pixelmetrics/pixelmetricsmapper/PMMapperView.h b/util/s60pixelmetrics/pm_mapperview.h
index e9eb42e..e9eb42e 100644
--- a/util/s60pixelmetrics/pixelmetricsmapper/PMMapperView.h
+++ b/util/s60pixelmetrics/pm_mapperview.h