--- a/applicationmanagement/server/src/nsmldmiapmatcher.cpp	Thu Aug 19 09:42:30 2010 +0300
+++ b/applicationmanagement/server/src/nsmldmiapmatcher.cpp	Tue Aug 31 15:05:55 2010 +0300
@@ -15,10 +15,10 @@
  *
  */
 
+#include <utf.h>
+#include <smldmadapter.h>
 #include "nsmldmiapmatcher.h"
 
-#include <utf.h>
-#include <smldmadapter.h>
 
 // -----------------------------------------------------------------------------
 // CNSmlDMIAPMatcher* CNSmlDMIAPMatcher::NewL( MSmlDmCallback* aDmCallback )
@@ -153,7 +153,7 @@
 // -----------------------------------------------------------------------------
 // TInt CNSmlDMIAPMatcher::DesToInt(const TDesC& aLuid)
 // -----------------------------------------------------------------------------
-TInt CNSmlDMIAPMatcher::DesToInt(const TDesC8& aLuid) const
+TInt CNSmlDMIAPMatcher::DesToInt(const TDesC8& aLuid)
     {
     TLex8 lex(aLuid);
     TInt value = 0;