# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1284487025 -10800 # Node ID ae4a65edc4fe11a583d9fa50fcb59fc647c1bf64 # Parent 5b858729772b6860c8c35320f172c5e4cc89af10 Revision: 201033 Kit: 201035 diff -r 5b858729772b -r ae4a65edc4fe applicationmanagement/server/group/ApplicationManagementServer.mmp --- 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 diff -r 5b858729772b -r ae4a65edc4fe customization/DMUtils/bld/DMUtils.mmp --- 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 diff -r 5b858729772b -r ae4a65edc4fe devicediagnostics/devdiagapp/group/devdiagapp.mmp --- 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 diff -r 5b858729772b -r ae4a65edc4fe devicediagnostics/devdiaggsplugin/group/gsdevdiagplugin.mmp --- 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 diff -r 5b858729772b -r ae4a65edc4fe devicediagnostics/diagplugins/DiagInternalMemoryPlugin/group/diaginternalmemoryplugin.mmp --- 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 diff -r 5b858729772b -r ae4a65edc4fe devicediagnostics/diagplugins/diagbatterychargerplugin/group/diagbatterychargercabletestplugin.mmp --- 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 diff -r 5b858729772b -r ae4a65edc4fe devicediagnostics/diagplugins/diagbrowserplugin/group/diagbrowserplugin.mmp --- 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 diff -r 5b858729772b -r ae4a65edc4fe devicediagnostics/diagplugins/diagdatanetworkplugin/group/diagdatanetworktestplugin.mmp --- 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 diff -r 5b858729772b -r ae4a65edc4fe devicediagnostics/diagplugins/diagearpieceplugin/group/diagaudioplugin.mmp --- 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 diff -r 5b858729772b -r ae4a65edc4fe devicediagnostics/diagplugins/diagexternalmediacardplugin/group/diagexternalmediacardplugin.mmp --- 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 diff -r 5b858729772b -r ae4a65edc4fe devicediagnostics/diagplugins/diagheadsetcableplugin/group/diagheadsetcabletestplugin.mmp --- 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 diff -r 5b858729772b -r ae4a65edc4fe devicediagnostics/diagplugins/diagloudspeakerplugin/group/diagspeakerplugin.mmp --- 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 diff -r 5b858729772b -r ae4a65edc4fe devicediagnostics/diagplugins/diagnetcoverageplugin/group/diagnetcoverageplugin.mmp --- 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 diff -r 5b858729772b -r ae4a65edc4fe devicediagnostics/diagplugins/diagusbcableplugin/group/diagusbcabletestplugin.mmp --- 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 diff -r 5b858729772b -r ae4a65edc4fe devicediagnostics/diagplugins/diagvibrateplugin/group/diagvibrateplugin.mmp --- 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 diff -r 5b858729772b -r ae4a65edc4fe devicediagnostics/diagsuites/diagconnectivitysuiteplugin/group/diagconnectivitysuiteplugin.mmp --- 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 diff -r 5b858729772b -r ae4a65edc4fe devicediagnostics/diagsuites/diagcoveragesuiteplugin/group/diagcoveragesuiteplugin.mmp --- 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 diff -r 5b858729772b -r ae4a65edc4fe devicediagnostics/diagsuites/diaghardwaresuiteplugin/group/diaghardwaresuiteplugin.mmp --- 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 diff -r 5b858729772b -r ae4a65edc4fe devicediagnostics/diagsuites/diagservicessuiteplugin/group/diagservicessuiteplugin.mmp --- 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 diff -r 5b858729772b -r ae4a65edc4fe devicediagnostics/diagsuites/diagtoplevelsuiteplugin/group/diagtoplevelsuiteplugin.mmp --- 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 diff -r 5b858729772b -r ae4a65edc4fe omacp/omacpadapters/EmailAdapter/Group/WPEmailAdapter.mmp --- 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 diff -r 5b858729772b -r ae4a65edc4fe omadm/dcmo/dcmoadapters/extmemctrl/group/extmemctrldcmoadapter.mmp --- 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 diff -r 5b858729772b -r ae4a65edc4fe omadm/lawmo/lawmoplugins/calllogsplugin/src/lawmocalllogsasyncwipe.cpp --- 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 #include -#include // ----------------------------------------------------------------------------- // CActiveWipeObject::CActiveWipeObject diff -r 5b858729772b -r ae4a65edc4fe omadm/lawmo/lawmoplugins/contactsplugin/inc/lawmocontactsasyncwipe.h --- 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 #include -#include +#include #include #include "fdebug.h" diff -r 5b858729772b -r ae4a65edc4fe omadm/lawmo/lawmoplugins/contactsplugin/src/lawmocontactsasyncwipe.cpp --- 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 #include #include -#include +#include #include #include @@ -28,7 +28,6 @@ // Application Closing #include #include -#include #include "fdebug.h" #include "lawmocontactsasyncwipe.h" diff -r 5b858729772b -r ae4a65edc4fe omadm/lawmo/lawmoplugins/mediaplugin/group/mediaplugin.mmp --- 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 diff -r 5b858729772b -r ae4a65edc4fe omadm/lawmo/lawmoplugins/messagingplugin/inc/lawmomessagingasyncwipe.h --- 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 #include -#include #define KMessagingAppUid 0x100058C5 // Messgaing App Uid diff -r 5b858729772b -r ae4a65edc4fe omadm/omadmappui/OmaDmCPPlugin/group/OmaDmCPPlugin.mmp --- 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 diff -r 5b858729772b -r ae4a65edc4fe omadm/omadmappui/group/NSmlDMSync.mmp --- 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 diff -r 5b858729772b -r ae4a65edc4fe omadm/omadmextensions/adapters/globalwlansettings/group/globalwlanadapter.mmp --- 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 diff -r 5b858729772b -r ae4a65edc4fe omadm/omadmextensions/adapters/lawmodmadapter/inc/lawmodmadapter.h --- 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 #include #include -#include "lawmoclient.h" +#include #include const TInt KMaxBufferLength = 256; diff -r 5b858729772b -r ae4a65edc4fe omadm/omadmextensions/adapters/lawmodmadapter/src/lawmodmadapter.cpp --- 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 #include #include -#include +#include #include #include // syncmlclientapi.lib #include // Generic alert #include #include #include -#include +#include //User Include #include "lawmodmadapter.h" #include "nsmldebug.h" diff -r 5b858729772b -r ae4a65edc4fe omadm/omadmextensions/adapters/nsmldinternet/group/nsmlinternetadapter.mmp --- 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 diff -r 5b858729772b -r ae4a65edc4fe omadm/omadmextensions/adapters/wlanctrldcmoadapter/group/wlanctrldcmoadapter.mmp --- 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 diff -r 5b858729772b -r ae4a65edc4fe pnpmobileservices/pnpms/ServiceHelpPlugin/Group/ServiceHelpPlugin.mmp --- 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 diff -r 5b858729772b -r ae4a65edc4fe pnpmobileservices/pnpms/group/OnlineSupport.mmp --- 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 diff -r 5b858729772b -r ae4a65edc4fe pnpmobileservices/pnpms/group/Pnpprovisioning.mmp --- 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