Mercurial Mercurial > oss > FCL > sf > app > devicecontrol / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revision: 201033 RCL_3 PDK_3.0.3
authorDremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
Tue, 14 Sep 2010 20:57:05 +0300
branchRCL_3
changeset 61 ae4a65edc4fe
parent 58 5b858729772b
child 65 450d1facd418
Revision: 201033 Kit: 201035
applicationmanagement/server/group/ApplicationManagementServer.mmp file | annotate | diff | comparison | revisions
customization/DMUtils/bld/DMUtils.mmp file | annotate | diff | comparison | revisions
devicediagnostics/devdiagapp/group/devdiagapp.mmp file | annotate | diff | comparison | revisions
devicediagnostics/devdiaggsplugin/group/gsdevdiagplugin.mmp file | annotate | diff | comparison | revisions
devicediagnostics/diagplugins/DiagInternalMemoryPlugin/group/diaginternalmemoryplugin.mmp file | annotate | diff | comparison | revisions
devicediagnostics/diagplugins/diagbatterychargerplugin/group/diagbatterychargercabletestplugin.mmp file | annotate | diff | comparison | revisions
devicediagnostics/diagplugins/diagbrowserplugin/group/diagbrowserplugin.mmp file | annotate | diff | comparison | revisions
devicediagnostics/diagplugins/diagdatanetworkplugin/group/diagdatanetworktestplugin.mmp file | annotate | diff | comparison | revisions
devicediagnostics/diagplugins/diagearpieceplugin/group/diagaudioplugin.mmp file | annotate | diff | comparison | revisions
devicediagnostics/diagplugins/diagexternalmediacardplugin/group/diagexternalmediacardplugin.mmp file | annotate | diff | comparison | revisions
devicediagnostics/diagplugins/diagheadsetcableplugin/group/diagheadsetcabletestplugin.mmp file | annotate | diff | comparison | revisions
devicediagnostics/diagplugins/diagloudspeakerplugin/group/diagspeakerplugin.mmp file | annotate | diff | comparison | revisions
devicediagnostics/diagplugins/diagnetcoverageplugin/group/diagnetcoverageplugin.mmp file | annotate | diff | comparison | revisions
devicediagnostics/diagplugins/diagusbcableplugin/group/diagusbcabletestplugin.mmp file | annotate | diff | comparison | revisions
devicediagnostics/diagplugins/diagvibrateplugin/group/diagvibrateplugin.mmp file | annotate | diff | comparison | revisions
devicediagnostics/diagsuites/diagconnectivitysuiteplugin/group/diagconnectivitysuiteplugin.mmp file | annotate | diff | comparison | revisions
devicediagnostics/diagsuites/diagcoveragesuiteplugin/group/diagcoveragesuiteplugin.mmp file | annotate | diff | comparison | revisions
devicediagnostics/diagsuites/diaghardwaresuiteplugin/group/diaghardwaresuiteplugin.mmp file | annotate | diff | comparison | revisions
devicediagnostics/diagsuites/diagservicessuiteplugin/group/diagservicessuiteplugin.mmp file | annotate | diff | comparison | revisions
devicediagnostics/diagsuites/diagtoplevelsuiteplugin/group/diagtoplevelsuiteplugin.mmp file | annotate | diff | comparison | revisions
omacp/omacpadapters/EmailAdapter/Group/WPEmailAdapter.mmp file | annotate | diff | comparison | revisions
omadm/dcmo/dcmoadapters/extmemctrl/group/extmemctrldcmoadapter.mmp file | annotate | diff | comparison | revisions
omadm/lawmo/lawmoplugins/calllogsplugin/src/lawmocalllogsasyncwipe.cpp file | annotate | diff | comparison | revisions
omadm/lawmo/lawmoplugins/contactsplugin/inc/lawmocontactsasyncwipe.h file | annotate | diff | comparison | revisions
omadm/lawmo/lawmoplugins/contactsplugin/src/lawmocontactsasyncwipe.cpp file | annotate | diff | comparison | revisions
omadm/lawmo/lawmoplugins/mediaplugin/group/mediaplugin.mmp file | annotate | diff | comparison | revisions
omadm/lawmo/lawmoplugins/messagingplugin/inc/lawmomessagingasyncwipe.h file | annotate | diff | comparison | revisions
omadm/omadmappui/OmaDmCPPlugin/group/OmaDmCPPlugin.mmp file | annotate | diff | comparison | revisions
omadm/omadmappui/group/NSmlDMSync.mmp file | annotate | diff | comparison | revisions
omadm/omadmextensions/adapters/globalwlansettings/group/globalwlanadapter.mmp file | annotate | diff | comparison | revisions
omadm/omadmextensions/adapters/lawmodmadapter/inc/lawmodmadapter.h file | annotate | diff | comparison | revisions
omadm/omadmextensions/adapters/lawmodmadapter/src/lawmodmadapter.cpp file | annotate | diff | comparison | revisions
omadm/omadmextensions/adapters/nsmldinternet/group/nsmlinternetadapter.mmp file | annotate | diff | comparison | revisions
omadm/omadmextensions/adapters/wlanctrldcmoadapter/group/wlanctrldcmoadapter.mmp file | annotate | diff | comparison | revisions
pnpmobileservices/pnpms/ServiceHelpPlugin/Group/ServiceHelpPlugin.mmp file | annotate | diff | comparison | revisions
pnpmobileservices/pnpms/group/OnlineSupport.mmp file | annotate | diff | comparison | revisions
pnpmobileservices/pnpms/group/Pnpprovisioning.mmp file | annotate | diff | comparison | revisions 
--- a/applicationmanagement/server/group/ApplicationManagementServer.mmp	Wed Sep 01 12:31:32 2010 +0100
+++ b/applicationmanagement/server/group/ApplicationManagementServer.mmp	Tue Sep 14 20:57:05 2010 +0300
@@ -109,7 +109,7 @@
 LIBRARY		imut.lib
 LIBRARY		downloadmgr.lib
 LIBRARY 	swinstcli.lib
-LIBRARY         drmhelper.lib
+LIBRARY         DRMHelper.lib
 LIBRARY         drmlicensemanager.lib
 LIBRARY         ezip.lib
 LIBRARY         platformenv.lib
@@ -120,7 +120,7 @@
  LIBRARY				nsmldmtreedbhandler.lib
  LIBRARY  			syncmlclientapi.lib
  LIBRARY 				nsmldmmodule.lib
- LIBRARY 				nsmldmtreedbclient.lib connmon.lib commonengine.lib
+ LIBRARY 				nsmldmtreedbclient.lib connmon.lib CommonEngine.lib
  LIBRARY     		nsmltransporthandler.lib
 LIBRARY     		nsmltransport.lib cone.lib javaregistryclient.lib avkon.lib eikcore.lib  apparc.lib
 LIBRARY					apmime.lib
--- a/customization/DMUtils/bld/DMUtils.mmp	Wed Sep 01 12:31:32 2010 +0100
+++ b/customization/DMUtils/bld/DMUtils.mmp	Tue Sep 14 20:57:05 2010 +0300
@@ -65,7 +65,7 @@
 LIBRARY         sysutil.lib
 LIBRARY					edbms.lib
 LIBRARY         bafl.lib
-LIBRARY         commonengine.lib
+LIBRARY         CommonEngine.lib
 LIBRARY         imut.lib
 LIBRARY         apparc.lib
 LIBRARY         ws32.lib
--- a/devicediagnostics/devdiagapp/group/devdiagapp.mmp	Wed Sep 01 12:31:32 2010 +0100
+++ b/devicediagnostics/devdiagapp/group/devdiagapp.mmp	Tue Sep 14 20:57:05 2010 +0300
@@ -87,7 +87,7 @@
 LIBRARY           diagresultsdatabase.lib
 LIBRARY           eiksrv.lib
 LIBRARY           drmserviceapi.lib
-LIBRARY           commonengine.lib  //String loader
+LIBRARY           CommonEngine.lib  //String loader
 LIBRARY           centralrepository.lib 
 LIBRARY           efsrv.lib 
 
--- a/devicediagnostics/devdiaggsplugin/group/gsdevdiagplugin.mmp	Wed Sep 01 12:31:32 2010 +0100
+++ b/devicediagnostics/devdiaggsplugin/group/gsdevdiagplugin.mmp	Tue Sep 14 20:57:05 2010 +0300
@@ -75,7 +75,7 @@
 LIBRARY   ws32.lib 
 
 
-LIBRARY   commonengine.lib      // For RConeResourceLoader
+LIBRARY   CommonEngine.lib      // For RConeResourceLoader
 LIBRARY   featmgr.lib           // Feature manager
 LIBRARY   aknskinsrv.lib        // for enhanced skinning
 LIBRARY   aknskins.lib          // for enhanced skinning
--- a/devicediagnostics/diagplugins/DiagInternalMemoryPlugin/group/diaginternalmemoryplugin.mmp	Wed Sep 01 12:31:32 2010 +0100
+++ b/devicediagnostics/diagplugins/DiagInternalMemoryPlugin/group/diaginternalmemoryplugin.mmp	Tue Sep 14 20:57:05 2010 +0300
@@ -59,7 +59,7 @@
 LIBRARY   efsrv.lib
 LIBRARY	  avkon.lib
 
-LIBRARY   commonengine.lib      // For RConeResourceLoader
+LIBRARY   CommonEngine.lib      // For RConeResourceLoader
 LIBRARY   flogger.lib           // for LOGGER
 // ADO & Platformization Changes
 LIBRARY   diagframework.lib 
--- a/devicediagnostics/diagplugins/diagbatterychargerplugin/group/diagbatterychargercabletestplugin.mmp	Wed Sep 01 12:31:32 2010 +0100
+++ b/devicediagnostics/diagplugins/diagbatterychargerplugin/group/diagbatterychargercabletestplugin.mmp	Tue Sep 14 20:57:05 2010 +0300
@@ -64,7 +64,7 @@
 LIBRARY   eikcoctl.lib
 LIBRARY   eikdlg.lib
 
-LIBRARY   commonengine.lib      // For StringLoader
+LIBRARY   CommonEngine.lib      // For StringLoader
 LIBRARY   diagpluginbase.lib
 LIBRARY   flogger.lib           // for RFileLogger
 LIBRARY   diagframework.lib 
--- a/devicediagnostics/diagplugins/diagbrowserplugin/group/diagbrowserplugin.mmp	Wed Sep 01 12:31:32 2010 +0100
+++ b/devicediagnostics/diagplugins/diagbrowserplugin/group/diagbrowserplugin.mmp	Tue Sep 14 20:57:05 2010 +0300
@@ -55,7 +55,7 @@
 LIBRARY   			eikcoctl.lib // ADO & Platformization Changes
 LIBRARY   			eikdlg.lib // ADO & Platformization Changes
 LIBRARY             euser.lib
-LIBRARY             commonengine.lib
+LIBRARY             CommonEngine.lib
 LIBRARY             centralrepository.lib
 LIBRARY             cmmanager.lib
 LIBRARY             commdb.lib
--- a/devicediagnostics/diagplugins/diagdatanetworkplugin/group/diagdatanetworktestplugin.mmp	Wed Sep 01 12:31:32 2010 +0100
+++ b/devicediagnostics/diagplugins/diagdatanetworkplugin/group/diagdatanetworktestplugin.mmp	Tue Sep 14 20:57:05 2010 +0300
@@ -72,7 +72,7 @@
 LIBRARY   centralrepository.lib // for CRepository
 LIBRARY   esock.lib             // for RConnection
 
-LIBRARY   commonengine.lib      // For StringLoader
+LIBRARY   CommonEngine.lib      // For StringLoader
 LIBRARY   diagpluginbase.lib
 LIBRARY   flogger.lib           // for RFileLogger
 LIBRARY   diagframework.lib     // for CDiagLogEventEraser
--- a/devicediagnostics/diagplugins/diagearpieceplugin/group/diagaudioplugin.mmp	Wed Sep 01 12:31:32 2010 +0100
+++ b/devicediagnostics/diagplugins/diagearpieceplugin/group/diagaudioplugin.mmp	Tue Sep 14 20:57:05 2010 +0300
@@ -62,7 +62,7 @@
 LIBRARY   euser.lib
 LIBRARY   efsrv.lib
 LIBRARY   avkon.lib
-LIBRARY   commonengine.lib      // For StringLoader
+LIBRARY   CommonEngine.lib      // For StringLoader
 LIBRARY   flogger.lib           // for LOGGER
 LIBRARY   diagframework.lib 
 LIBRARY   diagpluginbase.lib
@@ -73,6 +73,6 @@
 
 LIBRARY   mediaclientaudio.lib       // for AudioRecorderUtility
 LIBRARY   centralrepository.lib      // for Central Repository
-LIBRARY   telephonyaudiorouting.lib  // for AudioRouting
+LIBRARY   TelephonyAudioRouting.lib  // for AudioRouting
 
 // End of File
--- a/devicediagnostics/diagplugins/diagexternalmediacardplugin/group/diagexternalmediacardplugin.mmp	Wed Sep 01 12:31:32 2010 +0100
+++ b/devicediagnostics/diagplugins/diagexternalmediacardplugin/group/diagexternalmediacardplugin.mmp	Tue Sep 14 20:57:05 2010 +0300
@@ -59,7 +59,7 @@
 LIBRARY   efsrv.lib
 LIBRARY	  avkon.lib				// ADO & Platformization Changes
 
-LIBRARY   commonengine.lib      // For RConeResourceLoader
+LIBRARY   CommonEngine.lib      // For RConeResourceLoader
 LIBRARY   featmgr.lib           // Feature manager
 LIBRARY   flogger.lib           // for LOGGER
 LIBRARY   diagframework.lib  	// ADO & Platformization Changes
--- a/devicediagnostics/diagplugins/diagheadsetcableplugin/group/diagheadsetcabletestplugin.mmp	Wed Sep 01 12:31:32 2010 +0100
+++ b/devicediagnostics/diagplugins/diagheadsetcableplugin/group/diagheadsetcabletestplugin.mmp	Tue Sep 14 20:57:05 2010 +0300
@@ -61,7 +61,7 @@
 
 LIBRARY   euser.lib
 LIBRARY   avkon.lib
-LIBRARY   commonengine.lib      // For RConeResourceLoader
+LIBRARY   CommonEngine.lib      // For RConeResourceLoader
 LIBRARY   diagframework.lib
 LIBRARY   eikcoctl.lib
 LIBRARY   eikdlg.lib
--- a/devicediagnostics/diagplugins/diagloudspeakerplugin/group/diagspeakerplugin.mmp	Wed Sep 01 12:31:32 2010 +0100
+++ b/devicediagnostics/diagplugins/diagloudspeakerplugin/group/diagspeakerplugin.mmp	Tue Sep 14 20:57:05 2010 +0300
@@ -62,7 +62,7 @@
 LIBRARY   euser.lib
 LIBRARY   efsrv.lib
 LIBRARY   avkon.lib
-LIBRARY   commonengine.lib  // For RConeResourceLoader
+LIBRARY   CommonEngine.lib  // For RConeResourceLoader
 LIBRARY   flogger.lib       // for LOGGER
 LIBRARY   diagframework.lib 
 LIBRARY   diagpluginbase.lib
@@ -73,6 +73,6 @@
 
 LIBRARY   mediaclientaudio.lib    // for AudioRecorderUtility
 LIBRARY   centralrepository.lib   // for Central Repository
-LIBRARY   audiooutputrouting.lib  // for CAudioOutput
+LIBRARY   AudioOutputRouting.lib  // for CAudioOutput
 // End of File
 
--- a/devicediagnostics/diagplugins/diagnetcoverageplugin/group/diagnetcoverageplugin.mmp	Wed Sep 01 12:31:32 2010 +0100
+++ b/devicediagnostics/diagplugins/diagnetcoverageplugin/group/diagnetcoverageplugin.mmp	Tue Sep 14 20:57:05 2010 +0300
@@ -62,7 +62,7 @@
 LIBRARY             diagframework.lib  // ADO & Platformization Changes
 LIBRARY   			eikdlg.lib	// ADO & Platformization Changes
 LIBRARY             euser.lib
-LIBRARY             commonengine.lib      // For StringLoader
+LIBRARY             CommonEngine.lib      // For StringLoader
 LIBRARY             flogger.lib           // for LOGGER
 LIBRARY             diagpluginbase.lib
 LIBRARY             etel3rdparty.lib      // for CTelephony
--- a/devicediagnostics/diagplugins/diagusbcableplugin/group/diagusbcabletestplugin.mmp	Wed Sep 01 12:31:32 2010 +0100
+++ b/devicediagnostics/diagplugins/diagusbcableplugin/group/diagusbcabletestplugin.mmp	Tue Sep 14 20:57:05 2010 +0300
@@ -62,7 +62,7 @@
 LIBRARY   euser.lib
 LIBRARY   avkon.lib
 
-LIBRARY   commonengine.lib      // For StringLoader
+LIBRARY   CommonEngine.lib      // For StringLoader
 LIBRARY   diagframework.lib
 LIBRARY   eikcoctl.lib
 LIBRARY   eikdlg.lib
--- a/devicediagnostics/diagplugins/diagvibrateplugin/group/diagvibrateplugin.mmp	Wed Sep 01 12:31:32 2010 +0100
+++ b/devicediagnostics/diagplugins/diagvibrateplugin/group/diagvibrateplugin.mmp	Tue Sep 14 20:57:05 2010 +0300
@@ -61,14 +61,14 @@
 LIBRARY   euser.lib
 LIBRARY   avkon.lib
 
-LIBRARY   commonengine.lib      
+LIBRARY   CommonEngine.lib      
 LIBRARY   featmgr.lib           
 LIBRARY   flogger.lib           
 LIBRARY   diagframework.lib 
 LIBRARY   diagpluginbase.lib
 LIBRARY   centralrepository.lib // for CRepository
 LIBRARY   hwrmvibraclient.lib
-LIBRARY   profileengine.lib 
+LIBRARY   ProfileEngine.lib 
 LIBRARY   eikcoctl.lib
 LIBRARY   eikdlg.lib
 
--- a/devicediagnostics/diagsuites/diagconnectivitysuiteplugin/group/diagconnectivitysuiteplugin.mmp	Wed Sep 01 12:31:32 2010 +0100
+++ b/devicediagnostics/diagsuites/diagconnectivitysuiteplugin/group/diagconnectivitysuiteplugin.mmp	Tue Sep 14 20:57:05 2010 +0300
@@ -52,7 +52,7 @@
 
 LIBRARY                 euser.lib
 LIBRARY                 ecom.lib
-LIBRARY                 commonengine.lib
+LIBRARY                 CommonEngine.lib
 LIBRARY                 aknicon.lib
 LIBRARY                 egul.lib
 LIBRARY                 flogger.lib
--- a/devicediagnostics/diagsuites/diagcoveragesuiteplugin/group/diagcoveragesuiteplugin.mmp	Wed Sep 01 12:31:32 2010 +0100
+++ b/devicediagnostics/diagsuites/diagcoveragesuiteplugin/group/diagcoveragesuiteplugin.mmp	Tue Sep 14 20:57:05 2010 +0300
@@ -51,7 +51,7 @@
 
 LIBRARY                 euser.lib
 LIBRARY                 ecom.lib
-LIBRARY                 commonengine.lib
+LIBRARY                 CommonEngine.lib
 LIBRARY                 aknicon.lib
 LIBRARY                 egul.lib
 LIBRARY                 flogger.lib
--- a/devicediagnostics/diagsuites/diaghardwaresuiteplugin/group/diaghardwaresuiteplugin.mmp	Wed Sep 01 12:31:32 2010 +0100
+++ b/devicediagnostics/diagsuites/diaghardwaresuiteplugin/group/diaghardwaresuiteplugin.mmp	Tue Sep 14 20:57:05 2010 +0300
@@ -51,7 +51,7 @@
 
 LIBRARY                 euser.lib
 LIBRARY                 ecom.lib
-LIBRARY                 commonengine.lib
+LIBRARY                 CommonEngine.lib
 LIBRARY                 aknicon.lib
 LIBRARY                 egul.lib
 LIBRARY                 flogger.lib
--- a/devicediagnostics/diagsuites/diagservicessuiteplugin/group/diagservicessuiteplugin.mmp	Wed Sep 01 12:31:32 2010 +0100
+++ b/devicediagnostics/diagsuites/diagservicessuiteplugin/group/diagservicessuiteplugin.mmp	Tue Sep 14 20:57:05 2010 +0300
@@ -51,7 +51,7 @@
 
 LIBRARY                 euser.lib
 LIBRARY                 ecom.lib
-LIBRARY                 commonengine.lib
+LIBRARY                 CommonEngine.lib
 LIBRARY                 aknicon.lib
 LIBRARY                 egul.lib
 LIBRARY                 flogger.lib
--- a/devicediagnostics/diagsuites/diagtoplevelsuiteplugin/group/diagtoplevelsuiteplugin.mmp	Wed Sep 01 12:31:32 2010 +0100
+++ b/devicediagnostics/diagsuites/diagtoplevelsuiteplugin/group/diagtoplevelsuiteplugin.mmp	Tue Sep 14 20:57:05 2010 +0300
@@ -51,7 +51,7 @@
 
 LIBRARY                 euser.lib
 LIBRARY                 ecom.lib
-LIBRARY                 commonengine.lib
+LIBRARY                 CommonEngine.lib
 LIBRARY                 flogger.lib
 LIBRARY                 diagframework.lib
 LIBRARY                 diagpluginbase.lib
--- a/omacp/omacpadapters/EmailAdapter/Group/WPEmailAdapter.mmp	Wed Sep 01 12:31:32 2010 +0100
+++ b/omacp/omacpadapters/EmailAdapter/Group/WPEmailAdapter.mmp	Tue Sep 14 20:57:05 2010 +0300
@@ -66,7 +66,7 @@
 LIBRARY         apengine.lib commdb.lib
 LIBRARY         etel.lib                    // RTelServer
 LIBRARY         etelmm.lib                  // RMobilePhone
-LIBRARY		imumda.lib
+LIBRARY					IMUMDA.lib
 
 
 LIBRARY  pnp.lib
--- a/omadm/dcmo/dcmoadapters/extmemctrl/group/extmemctrldcmoadapter.mmp	Wed Sep 01 12:31:32 2010 +0100
+++ b/omadm/dcmo/dcmoadapters/extmemctrl/group/extmemctrldcmoadapter.mmp	Tue Sep 14 20:57:05 2010 +0300
@@ -45,6 +45,6 @@
 LIBRARY 			euser.lib ecom.lib efsrv.lib bafl.lib  etul.lib
 LIBRARY       centralrepository.lib
 LIBRARY       platformenv.lib
-LIBRARY 			commonengine.lib               // Series 60 common components library
+LIBRARY 			CommonEngine.lib               // Series 60 common components library
 
 SMPSAFE
--- a/omadm/lawmo/lawmoplugins/calllogsplugin/src/lawmocalllogsasyncwipe.cpp	Wed Sep 01 12:31:32 2010 +0100
+++ b/omadm/lawmo/lawmoplugins/calllogsplugin/src/lawmocalllogsasyncwipe.cpp	Tue Sep 14 20:57:05 2010 +0300
@@ -27,7 +27,6 @@
 // Application Closing
 #include <apgtask.h>
 #include <w32std.h>
-#include <APGTASK.H>
 
 // ----------------------------------------------------------------------------- 
 // CActiveWipeObject::CActiveWipeObject
--- a/omadm/lawmo/lawmoplugins/contactsplugin/inc/lawmocontactsasyncwipe.h	Wed Sep 01 12:31:32 2010 +0100
+++ b/omadm/lawmo/lawmoplugins/contactsplugin/inc/lawmocontactsasyncwipe.h	Tue Sep 14 20:57:05 2010 +0300
@@ -24,7 +24,7 @@
 
 #include <CPbkContactEngine.h>
 #include <CPbkSingleEntryFetchDlg.h>
-#include <rpbkviewresourcefile.h>
+#include <RPbkViewResourceFile.h>
 #include <cntdb.h>
 #include "fdebug.h"
  
--- a/omadm/lawmo/lawmoplugins/contactsplugin/src/lawmocontactsasyncwipe.cpp	Wed Sep 01 12:31:32 2010 +0100
+++ b/omadm/lawmo/lawmoplugins/contactsplugin/src/lawmocontactsasyncwipe.cpp	Tue Sep 14 20:57:05 2010 +0300
@@ -18,7 +18,7 @@
 #include <f32file.h>
 #include <CPbkContactEngine.h>
 #include <CPbkSingleEntryFetchDlg.h>
-#include <rpbkviewresourcefile.h>
+#include <RPbkViewResourceFile.h>
 #include <cntdb.h>
 #include <etelmm.h>
 
@@ -28,7 +28,6 @@
 // Application Closing
 #include <apgtask.h>
 #include <w32std.h>
-#include <APGTASK.H>
 
 #include "fdebug.h"
 #include "lawmocontactsasyncwipe.h"
--- a/omadm/lawmo/lawmoplugins/mediaplugin/group/mediaplugin.mmp	Wed Sep 01 12:31:32 2010 +0100
+++ b/omadm/lawmo/lawmoplugins/mediaplugin/group/mediaplugin.mmp	Tue Sep 14 20:57:05 2010 +0300
@@ -44,7 +44,7 @@
 
 LIBRARY 			euser.lib ecom.lib efsrv.lib bafl.lib  etul.lib
 LIBRARY       		centralrepository.lib
-LIBRARY 			commonengine.lib               // Series 60 common components library
+LIBRARY 			CommonEngine.lib               // Series 60 common components library
 LIBRARY				cntmodel.lib flogger.lib
 LIBRARY			 	MetaDataUtility.lib
 LIBRARY			  	mdeclient.lib apmime.lib
--- a/omadm/lawmo/lawmoplugins/messagingplugin/inc/lawmomessagingasyncwipe.h	Wed Sep 01 12:31:32 2010 +0100
+++ b/omadm/lawmo/lawmoplugins/messagingplugin/inc/lawmomessagingasyncwipe.h	Tue Sep 14 20:57:05 2010 +0300
@@ -28,7 +28,6 @@
 // Application Closing
 #include <apgtask.h>
 #include <w32std.h>
-#include <APGTASK.H>
 
 #define KMessagingAppUid 0x100058C5  // Messgaing App Uid
 
--- a/omadm/omadmappui/OmaDmCPPlugin/group/OmaDmCPPlugin.mmp	Wed Sep 01 12:31:32 2010 +0100
+++ b/omadm/omadmappui/OmaDmCPPlugin/group/OmaDmCPPlugin.mmp	Tue Sep 14 20:57:05 2010 +0300
@@ -66,7 +66,7 @@
 LIBRARY         eikcore.lib
 LIBRARY         eikcoctl.lib
 LIBRARY			    avkon.lib
-LIBRARY         commonengine.lib
+LIBRARY         CommonEngine.lib
 LIBRARY         bafl.lib
 
 // Required only for embedded app
--- a/omadm/omadmappui/group/NSmlDMSync.mmp	Wed Sep 01 12:31:32 2010 +0100
+++ b/omadm/omadmappui/group/NSmlDMSync.mmp	Tue Sep 14 20:57:05 2010 +0300
@@ -97,7 +97,7 @@
 LIBRARY     bafl.lib
 LIBRARY     cone.lib
 LIBRARY     commdb.lib
-LIBRARY     commonengine.lib
+LIBRARY     CommonEngine.lib
 LIBRARY     edbms.lib
 LIBRARY     efsrv.lib
 LIBRARY     eikctl.lib
@@ -109,7 +109,7 @@
 LIBRARY     featmgr.lib
 LIBRARY     hlplch.lib      //help
 LIBRARY     ws32.lib
-LIBRARY     connectionuiutilities.lib
+LIBRARY     ConnectionUiUtilities.lib
 LIBRARY     sysutil.lib
 LIBRARY	    sysversioninfo.lib
 LIBRARY     etel.lib                        // RTelServer
--- a/omadm/omadmextensions/adapters/globalwlansettings/group/globalwlanadapter.mmp	Wed Sep 01 12:31:32 2010 +0100
+++ b/omadm/omadmextensions/adapters/globalwlansettings/group/globalwlanadapter.mmp	Tue Sep 14 20:57:05 2010 +0300
@@ -40,4 +40,4 @@
 LIBRARY		charconv.lib commdb.lib efsrv.lib ecom.lib euser.lib  
 LIBRARY		nsmldebug.lib sysutil.lib
 LIBRARY		inetprotutil.lib
-LIBRARY 	centralrepository.lib bafl.lib estor.lib edbms.lib FeatMgr.lib
+LIBRARY 	centralrepository.lib bafl.lib estor.lib edbms.lib featmgr.lib
--- a/omadm/omadmextensions/adapters/lawmodmadapter/inc/lawmodmadapter.h	Wed Sep 01 12:31:32 2010 +0100
+++ b/omadm/omadmextensions/adapters/lawmodmadapter/inc/lawmodmadapter.h	Tue Sep 14 20:57:05 2010 +0300
@@ -22,7 +22,7 @@
 #include <e32base.h>
 #include <smldmadapter.h>
 #include <centralrepository.h>
-#include "lawmoclient.h"
+#include <lawmoclient.h>
 #include <dcmoconst.h>
 
 const TInt KMaxBufferLength = 256;
--- a/omadm/omadmextensions/adapters/lawmodmadapter/src/lawmodmadapter.cpp	Wed Sep 01 12:31:32 2010 +0100
+++ b/omadm/omadmextensions/adapters/lawmodmadapter/src/lawmodmadapter.cpp	Tue Sep 14 20:57:05 2010 +0300
@@ -22,14 +22,14 @@
 #include <e32base.h>
 #include <ecom.h>
 #include <utf.h>
-#include <LawmoAdapterCRKeys.h>
+#include <lawmoadaptercrkeys.h>
 #include <DevManInternalCRKeys.h>
 #include <SyncMLClientDM.h>  // syncmlclientapi.lib
 #include <NSmlPrivateAPI.h> // Generic alert
 #include <nsmlconstants.h>
 #include <TerminalControl3rdPartyAPI.h>
 #include <coreapplicationuisdomainpskeys.h>
-#include <LAWMOInterface.h>
+#include <lawmointerface.h>
 //User Include
 #include "lawmodmadapter.h"
 #include "nsmldebug.h"
--- a/omadm/omadmextensions/adapters/nsmldinternet/group/nsmlinternetadapter.mmp	Wed Sep 01 12:31:32 2010 +0100
+++ b/omadm/omadmextensions/adapters/nsmldinternet/group/nsmlinternetadapter.mmp	Tue Sep 14 20:57:05 2010 +0300
@@ -49,7 +49,7 @@
 LIBRARY 	commsdat.lib
 LIBRARY 	cmmanager.lib
 LIBRARY 	cmmanagerdatabase.lib
-LIBRARY 	centralrepository.lib FeatMgr.lib
+LIBRARY 	centralrepository.lib featmgr.lib
 LIBRARY		policyengine.lib
 LIBRARY		nsmldmtreedbclient.lib
 
--- a/omadm/omadmextensions/adapters/wlanctrldcmoadapter/group/wlanctrldcmoadapter.mmp	Wed Sep 01 12:31:32 2010 +0100
+++ b/omadm/omadmextensions/adapters/wlanctrldcmoadapter/group/wlanctrldcmoadapter.mmp	Tue Sep 14 20:57:05 2010 +0300
@@ -36,8 +36,8 @@
 TARGET wlanctrldcmoadapter.rsc
 END
 
-LIBRARY 		euser.lib ECom.lib featmgr.lib
-LIBRARY			efsrv.lib commonengine.lib
+LIBRARY 		euser.lib ecom.lib featmgr.lib
+LIBRARY			efsrv.lib CommonEngine.lib
 
 SOURCEPATH ../src
 SOURCE wlanctrldcmoadapterproxy.cpp wlanctrldcmoadapter.cpp
--- a/pnpmobileservices/pnpms/ServiceHelpPlugin/Group/ServiceHelpPlugin.mmp	Wed Sep 01 12:31:32 2010 +0100
+++ b/pnpmobileservices/pnpms/ServiceHelpPlugin/Group/ServiceHelpPlugin.mmp	Tue Sep 14 20:57:05 2010 +0300
@@ -57,7 +57,7 @@
 LIBRARY             aknskins.lib // AknsUtils.h
 LIBRARY             avkon.lib 
 LIBRARY             bafl.lib
-LIBRARY             commonengine.lib // RConeResourceLoader
+LIBRARY             CommonEngine.lib // RConeResourceLoader
 LIBRARY             cone.lib
 LIBRARY             ecom.lib
 LIBRARY             efsrv.lib
--- a/pnpmobileservices/pnpms/group/OnlineSupport.mmp	Wed Sep 01 12:31:32 2010 +0100
+++ b/pnpmobileservices/pnpms/group/OnlineSupport.mmp	Tue Sep 14 20:57:05 2010 +0300
@@ -76,7 +76,7 @@
 LIBRARY	        etelmm.lib
 LIBRARY	        etel.lib
 LIBRARY	        inetprotutil.lib 
-LIBRARY	        commonengine.lib
+LIBRARY	        CommonEngine.lib
 LIBRARY	        centralrepository.lib
 LIBRARY	        apengine.lib        // for creating new Init Access
 LIBRARY	        sysutil.lib
--- a/pnpmobileservices/pnpms/group/Pnpprovisioning.mmp	Wed Sep 01 12:31:32 2010 +0100
+++ b/pnpmobileservices/pnpms/group/Pnpprovisioning.mmp	Tue Sep 14 20:57:05 2010 +0300
@@ -73,7 +73,7 @@
 LIBRARY	        aknnotify.lib
 LIBRARY         favouritesengine.lib
 LIBRARY         aknskins.lib
-LIBRARY         commonengine.lib
+LIBRARY         CommonEngine.lib
 LIBRARY         apengine.lib provisioningengine.lib eikctl.lib
 LIBRARY         efsrv.lib hash.lib apgrfx.lib
 LIBRARY         commdb.lib		// for commdb
FCL/sf/app/devicecontrol