# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1262860726 -7200 # Node ID 19dc812fb587d53a0e1eb35eb72e9d3414c20420 # Parent 95fdac6ccb5c1b99b47dca603679c890171f4a13 Revision: 200951 Kit: 201001 diff -r 95fdac6ccb5c -r 19dc812fb587 omads/omadsappui/AspSyncUtil/src/AspAdvanceSettingsDialog.cpp --- a/omads/omadsappui/AspSyncUtil/src/AspAdvanceSettingsDialog.cpp Thu Dec 17 08:39:39 2009 +0200 +++ b/omads/omadsappui/AspSyncUtil/src/AspAdvanceSettingsDialog.cpp Thu Jan 07 12:38:46 2010 +0200 @@ -30,7 +30,7 @@ #include // CAknAlphaPasswordSettingPage #include // CConnectionUiUtilities #include // FeatureManager -#include //For enum TRoamingSettings +#include "AspDefines.h" //For enum TRoamingSettings #include //For central Repository #include "CPreSyncPlugin.h" diff -r 95fdac6ccb5c -r 19dc812fb587 omads/omadsappui/AspSyncUtil/src/AspProfile.cpp --- a/omads/omadsappui/AspSyncUtil/src/AspProfile.cpp Thu Dec 17 08:39:39 2009 +0200 +++ b/omads/omadsappui/AspSyncUtil/src/AspProfile.cpp Thu Jan 07 12:38:46 2010 +0200 @@ -1408,7 +1408,7 @@ keyBuff.AppendNum( EGlobalUUID ); CCalenInterimUtils2* interimUtils = CCalenInterimUtils2::NewL(); CleanupStack::PushL( interimUtils ); - HBufC8* guuid = interimUtils->CalFileGlobalUidL(); + HBufC8* guuid = interimUtils->GlobalUidL(); TPtr8 guuidPtr = guuid->Des(); CleanupStack::PushL( guuid ); calinfo->SetPropertyL( keyBuff, guuidPtr ); diff -r 95fdac6ccb5c -r 19dc812fb587 omads/omadsextensions/adapters/agenda/src/nsmlagendadatastore.cpp --- a/omads/omadsextensions/adapters/agenda/src/nsmlagendadatastore.cpp Thu Dec 17 08:39:39 2009 +0200 +++ b/omads/omadsextensions/adapters/agenda/src/nsmlagendadatastore.cpp Thu Jan 07 12:38:46 2010 +0200 @@ -3225,7 +3225,7 @@ // Global UID MetaDataProperty keyBuff.Zero(); keyBuff.AppendNum( EGlobalUUID ); - HBufC8* guuid = iInterimUtils->CalFileGlobalUidL(); + HBufC8* guuid = iInterimUtils->GlobalUidL(); TPtr8 guuidPtr = guuid->Des(); CleanupStack::PushL( guuid ); calinfo->SetPropertyL( keyBuff, guuidPtr );