--- a/phonebookengines/VirtualPhonebook/VPbkSimStore/src/CContactStoreDomain.cpp Wed Sep 15 11:56:55 2010 +0300
+++ b/phonebookengines/VirtualPhonebook/VPbkSimStore/src/CContactStoreDomain.cpp Wed Oct 13 14:15:33 2010 +0300
@@ -30,13 +30,12 @@
#include <RLocalizedResourceFile.h>
#include <TVPbkContactStoreUriPtr.h>
#include <VPbkDataCaging.hrh>
-#include <vpbksimstoreres.rsg>
+#include <VPbkSimStoreRes.rsg>
#include <VPbkStoreUriLiterals.h>
#include <VPbkUtil.h>
#include <barsc.h>
#include <barsread.h>
-#include <featmgr.h>
namespace VPbkSimStore {
@@ -81,20 +80,10 @@
VPbkEngUtils::RLocalizedResourceFile resFile;
resFile.OpenLC( iFs, KVPbkRomFileDrive, KDC_RESOURCE_FILES_DIR, KResFile );
- FeatureManager::InitializeLibL();
+
TResourceReader resReader;
-
- if ( !FeatureManager::FeatureSupported(
- KFeatureIdFfTdClmcontactreplicationfromphonebooktousimcard ) )
- {
- resReader.SetBuffer( resFile.AllocReadLC(
- R_VPBK_VERSIT_FIELD_TYPE_MAPPINGS ) );
- }
- else
- {
- resReader.SetBuffer( resFile.AllocReadLC(
- R_VPBK_USIM_VERSIT_FIELD_TYPE_MAPPINGS ) );
- }
+ resReader.SetBuffer( resFile.AllocReadLC(
+ R_VPBK_VERSIT_FIELD_TYPE_MAPPINGS ) );
// Read versit types
iFieldTypeMappings->InitVersitMappingsL( resReader );
resReader.SetBuffer( resFile.AllocReadLC(
@@ -164,7 +153,6 @@
delete iContactStoreList;
delete iTextStore;
iFs.Close();
- FeatureManager::UnInitializeLib();
}
// -----------------------------------------------------------------------------