diff -r 2bb96f4ecad8 -r 8e7494275d3a omads/omadsextensions/adapters/contacts/src/NSmlContactsDataProvider.cpp --- a/omads/omadsextensions/adapters/contacts/src/NSmlContactsDataProvider.cpp Thu Aug 19 09:41:17 2010 +0300 +++ b/omads/omadsextensions/adapters/contacts/src/NSmlContactsDataProvider.cpp Tue Aug 31 15:05:37 2010 +0300 @@ -15,32 +15,36 @@ * */ - // INCLUDE FILES #include #include #include -#include #include -#include #include #include #include #include -#include #include #include #include #include #include #include -#include +#include +#include +#include #include "nsmldebug.h" #include "nsmlconstants.h" -#include #include "nsmldsimpluids.h" #include "nsmlchangefinder.h" +#ifndef __WINS__ +// This lowers the unnecessary compiler warning (armv5) to remark. +// "Warning: #174-D: expression has no effect..." is caused by +// DBG_ARGS8 macro in no-debug builds. +#pragma diag_remark 174 +#endif + // ============================ MEMBER FUNCTIONS =============================== // ----------------------------------------------------------------------------- @@ -91,9 +95,8 @@ User::LeaveIfError( iRfs.Connect() ); - iContactsDataStore = CreateDataStoreLC(); + iContactsDataStore = CreateDataStoreLC(); CleanupStack::Pop( iContactsDataStore ); - iStringPool.OpenL(); _DBG_FILE("CNSmlContactsDataProvider::ConstructL(): end"); @@ -168,10 +171,14 @@ TFileName resourceFileName; resourceFileName.Copy( TParsePtrC( dllFileName ).Drive() ); + + resourceFileName.Append( GetStoreFormatResourceFileL() ); - parse.Set( GetStoreFormatResourceFileL(), &KDC_RESOURCE_FILES_DIR, NULL ); + parse.Set( resourceFileName, &KDC_RESOURCE_FILES_DIR, NULL ); fileName = parse.FullName(); + + DBG_ARGS(_S("CNSmlContactsDataProvider::SetOwnStoreFormatL(): '%S'"), &parse.FullName()); RResourceFile resourceFile; BaflUtils::NearestLanguageFile( iRfs, fileName ); @@ -295,24 +302,24 @@ // // ------------------------------------------------------------------------------------------------ EXPORT_C const TDesC& CNSmlContactsDataProvider::GetStoreFormatResourceFileL() const - { + { _DBG_FILE("CNSmlContactsDataProvider::GetStoreFormatResourceFileL(): BEGIN"); - // Check correct Data Sync protocol - TInt value( EDataSyncNotRunning ); - TInt error = RProperty::Get( KPSUidDataSynchronizationInternalKeys, - KDataSyncStatus, - value ); - if ( error == KErrNone && - value == EDataSyncRunning ) - { - return KNSmlContactsStoreFormatRsc_1_1_2; - } - else // error or protocol version 1.2 - { - return KNSmlContactsStoreFormatRsc_1_2; - } - _DBG_FILE("CNSmlContactsDataProvider::GetStoreFormatResourceFileL(): END"); + // Check correct Data Sync protocol + TInt value( EDataSyncNotRunning ); + TInt error = RProperty::Get( KPSUidDataSynchronizationInternalKeys, + KDataSyncStatus, + value ); + if ( error == KErrNone && value == EDataSyncRunning ) + { + _DBG_FILE("CNSmlContactsDataProvider::GetStoreFormatResourceFileL() 1.1.2 : END"); + return KNSmlContactsStoreFormatRsc_1_1_2; + } + else // error or protocol version 1.2 + { + _DBG_FILE("CNSmlContactsDataProvider::GetStoreFormatResourceFileL() 1.2 : END"); + return KNSmlContactsStoreFormatRsc_1_2; + } } // ------------------------------------------------------------------------------------------------ @@ -352,5 +359,4 @@ _DBG_FILE("ImplementationGroupProxy() for CNSmlContactsDataProvider: end"); return ImplementationTable; } - // End of File