Merge.
--- a/ccservices/cmsservices/cmscontactor/inc/cmsselectiondialog.h Sun Mar 14 13:08:38 2010 +0000
+++ b/ccservices/cmsservices/cmscontactor/inc/cmsselectiondialog.h Mon Mar 29 12:25:48 2010 +0100
@@ -56,7 +56,7 @@
* @param aFocusIndex Focused item.
* @return selected field item.
*/
- const CCmsContactFieldItem* CCMSSelectionDialog::ExecuteLD
+ const CCmsContactFieldItem* ExecuteLD
( TInt aCbaResourceId, const TDesC& aHeading,
TInt aFocusIndex );
@@ -83,7 +83,7 @@
* @since S60 v5.0
* @return listbox model.
*/
- MDesCArray* CCMSSelectionDialog::CreateListItemsL( );
+ MDesCArray* CreateListItemsL( );
/**
* Helper function for making correct model data for listbox.
--- a/ccservices/cmsservices/cmsengine/Server/inc/cmsserverasynccontact.h Sun Mar 14 13:08:38 2010 +0000
+++ b/ccservices/cmsservices/cmsengine/Server/inc/cmsserverasynccontact.h Mon Mar 29 12:25:48 2010 +0100
@@ -218,7 +218,7 @@
* @return TCmsDefaultAttributeTypes CMS's default type.
*/
CCmsContactFieldItem::TCmsDefaultAttributeTypes
- CCmsServerAsyncContact::MatchTypesToInternalEnum(
+ MatchTypesToInternalEnum(
TVPbkDefaultType aDefaultType );
/**
--- a/contacts_plat/phonebook_2_ui_controls_api/inc/CPbk2ContactIconsUtils.h Sun Mar 14 13:08:38 2010 +0000
+++ b/contacts_plat/phonebook_2_ui_controls_api/inc/CPbk2ContactIconsUtils.h Mon Mar 29 12:25:48 2010 +0100
@@ -73,7 +73,7 @@
IMPORT_C static CPbk2IconArray* CreateListboxIconArrayL(TInt aResourceId);
private:
- CPbk2ContactIconsUtils::CPbk2ContactIconsUtils(
+ CPbk2ContactIconsUtils(
CPbk2StorePropertyArray& aStoreProperties,
MPbk2ContactUiControlExtension* aUiExtension );
--- a/contacts_plat/virtual_phonebook_vcard_api/inc/CVPbkVCardEng.h Sun Mar 14 13:08:38 2010 +0000
+++ b/contacts_plat/virtual_phonebook_vcard_api/inc/CVPbkVCardEng.h Mon Mar 29 12:25:48 2010 +0100
@@ -322,7 +322,7 @@
* @return A new operation handle owned by the client.
* @asynchronous
*/
- IMPORT_C MVPbkContactOperationBase* CVPbkVCardEng::ImportVCardMergeL(
+ IMPORT_C MVPbkContactOperationBase* ImportVCardMergeL(
const MVPbkContactLink& aReplaceContact,
MVPbkContactStore& aTargetStore,
RReadStream& aSourceStream,
--- a/logsui/EngineInc/CLogsEngine.h Sun Mar 14 13:08:38 2010 +0000
+++ b/logsui/EngineInc/CLogsEngine.h Mon Mar 29 12:25:48 2010 +0100
@@ -227,7 +227,7 @@
*
* @return strings used by Log database
*/
- IMPORT_C TLogsEventStrings CLogsEngine::LogDbStrings();
+ IMPORT_C TLogsEventStrings LogDbStrings();
/**
* Returns reference to CLogClient.
--- a/phonebookengines/VirtualPhonebook/VPbkEng/src/CVPbkContactFieldIterator.cpp Sun Mar 14 13:08:38 2010 +0000
+++ b/phonebookengines/VirtualPhonebook/VPbkEng/src/CVPbkContactFieldIterator.cpp Mon Mar 29 12:25:48 2010 +0100
@@ -207,7 +207,9 @@
CStoreFieldByTypeIterator::CStoreFieldByTypeIterator(
const MVPbkFieldType& aFieldType,
MVPbkStoreContactFieldCollection& aFields )
- : CFieldByTypeIterator( aFieldType, aFields )
+ : CFieldByTypeIterator<
+ MVPbkStoreContactFieldCollection,
+ MVPbkStoreContactField>( aFieldType, aFields )
{
}
@@ -229,7 +231,9 @@
CBaseFieldByTypeIterator::CBaseFieldByTypeIterator(
const MVPbkFieldType& aFieldType,
const MVPbkBaseContactFieldCollection& aFields )
- : CFieldByTypeIterator( aFieldType, aFields )
+ : CFieldByTypeIterator<
+ const MVPbkBaseContactFieldCollection,
+ const MVPbkBaseContactField>( aFieldType, aFields )
{
}
@@ -251,7 +255,9 @@
CBaseFieldByTypeListIterator::CBaseFieldByTypeListIterator(
const MVPbkFieldTypeList& aFieldTypeList,
const MVPbkBaseContactFieldCollection& aFields )
- : CFieldByTypeListIterator( aFieldTypeList, aFields )
+ : CFieldByTypeListIterator<
+ const MVPbkBaseContactFieldCollection,
+ const MVPbkBaseContactField>( aFieldTypeList, aFields )
{
}
--- a/phonebookengines/VirtualPhonebook/VPbkSimStore/src/CRemoteStore.cpp Sun Mar 14 13:08:38 2010 +0000
+++ b/phonebookengines/VirtualPhonebook/VPbkSimStore/src/CRemoteStore.cpp Mon Mar 29 12:25:48 2010 +0100
@@ -761,8 +761,8 @@
CVPbkAsyncObjectCallback<MVPbkSimStoreObserver>* callback =
VPbkEngUtils::CreateAsyncObjectCallbackLC(
*this,
- CRemoteStore::DoOpenL,
- CRemoteStore::DoOpenError,
+ &CRemoteStore::DoOpenL,
+ &CRemoteStore::DoOpenError,
aObserver);
iAsyncOpenOp->CallbackL( callback );
CleanupStack::Pop( callback );
--- a/phonebookengines/VirtualPhonebook/VPbkSimStoreImpl/inc/CMultipleReadCmd.h Sun Mar 14 13:08:38 2010 +0000
+++ b/phonebookengines/VirtualPhonebook/VPbkSimStoreImpl/inc/CMultipleReadCmd.h Mon Mar 29 12:25:48 2010 +0100
@@ -124,7 +124,7 @@
/**
* C++ constructor.
*/
- CMultipleReadCmd::CMultipleReadCmd( CBasicStore& aBasicStore,
+ CMultipleReadCmd( CBasicStore& aBasicStore,
TInt& aIndexToRead );
/**
--- a/phonebookui/Phonebook2/Application/inc/CPbk2AppUi.h Sun Mar 14 13:08:38 2010 +0000
+++ b/phonebookui/Phonebook2/Application/inc/CPbk2AppUi.h Mon Mar 29 12:25:48 2010 +0100
@@ -92,11 +92,6 @@
void ExitL();
/**
- * Forces exit.
- */
- void Exit();
-
- /**
* Activates Phonebook view.
*
* @param aViewId Id of the view to activate.
--- a/phonebookui/Phonebook2/Application/src/CPbk2AppUi.cpp Sun Mar 14 13:08:38 2010 +0000
+++ b/phonebookui/Phonebook2/Application/src/CPbk2AppUi.cpp Mon Mar 29 12:25:48 2010 +0100
@@ -282,15 +282,6 @@
}
// --------------------------------------------------------------------------
-// CPbk2AppUi::Exit
-// --------------------------------------------------------------------------
-//
-void CPbk2AppUi::Exit()
- {
- CPbk2AppUiBase::Exit();
- }
-
-// --------------------------------------------------------------------------
// CPbk2AppUi::ActivatePhonebookViewL
// --------------------------------------------------------------------------
//
--- a/phonebookui/Phonebook2/UIControls/src/cpbk2filteredviewstack.cpp Sun Mar 14 13:08:38 2010 +0000
+++ b/phonebookui/Phonebook2/UIControls/src/cpbk2filteredviewstack.cpp Mon Mar 29 12:25:48 2010 +0100
@@ -1146,7 +1146,7 @@
{
// Always forward top view events to clients
SendEventToObservers( *this, iViewObservers,
- MVPbkContactViewObserver::ContactViewUnavailable );
+ &MVPbkContactViewObserver::ContactViewUnavailable );
}
}
@@ -1167,7 +1167,7 @@
if ( &aView == iBaseViewElement->View() )
{
SendEventToObservers( *this, iStackObservers,
- MPbk2FilteredViewStackObserver::ContactAddedToBaseView, aIndex,
+ &MPbk2FilteredViewStackObserver::ContactAddedToBaseView, aIndex,
aContactLink );
}
@@ -1175,7 +1175,7 @@
{
// Always forward only top view events to clients
SendEventToObservers( *this, iViewObservers,
- MVPbkContactViewObserver::ContactAddedToView, aIndex,
+ &MVPbkContactViewObserver::ContactAddedToView, aIndex,
aContactLink );
}
}
@@ -1196,7 +1196,7 @@
{
// Always forward top view events to clients
SendEventToObservers( *this, iViewObservers,
- MVPbkContactViewObserver::ContactRemovedFromView, aIndex,
+ &MVPbkContactViewObserver::ContactRemovedFromView, aIndex,
aContactLink );
}
}
@@ -1237,7 +1237,7 @@
// Always forward view erros to clients. The view stack is not in valid
// state and client must reset the stack
SendEventToObservers( *this, iViewObservers,
- MVPbkContactViewObserver::ContactViewError, aError,
+ &MVPbkContactViewObserver::ContactViewError, aError,
aErrorNotified );
}
@@ -1369,7 +1369,7 @@
ContactViewReady"));
SendEventToObservers( *this, iViewObservers,
- MVPbkContactViewObserver::ContactViewReady );
+ &MVPbkContactViewObserver::ContactViewReady );
}
}
--- a/phonebookui/Phonebook2/UIControls/src/cpbk2predictiveviewstack.cpp Sun Mar 14 13:08:38 2010 +0000
+++ b/phonebookui/Phonebook2/UIControls/src/cpbk2predictiveviewstack.cpp Mon Mar 29 12:25:48 2010 +0100
@@ -684,7 +684,7 @@
SendBaseViewChangedEvent();
SendEventToObservers( *this, iViewObservers,
- MVPbkContactViewObserver::ContactViewReady );
+ &MVPbkContactViewObserver::ContactViewReady );
}
// --------------------------------------------------------------------------
@@ -696,7 +696,7 @@
{
iViewReady = EFalse;
SendEventToObservers( *this, iViewObservers,
- MVPbkContactViewObserver::ContactViewUnavailable );
+ &MVPbkContactViewObserver::ContactViewUnavailable );
}
// --------------------------------------------------------------------------
@@ -715,12 +715,12 @@
if ( iBaseView == &aView )
{
SendEventToObservers( *this, iStackObservers,
- MPbk2FilteredViewStackObserver::ContactAddedToBaseView, aIndex,
+ &MPbk2FilteredViewStackObserver::ContactAddedToBaseView, aIndex,
aContactLink );
// Always forward only top view events to clients
SendEventToObservers( *this, iViewObservers,
- MVPbkContactViewObserver::ContactAddedToView, aIndex,
+ &MVPbkContactViewObserver::ContactAddedToView, aIndex,
aContactLink );
}
}
@@ -740,7 +740,7 @@
{
// Always forward top view events to clients
SendEventToObservers( *this, iViewObservers,
- MVPbkContactViewObserver::ContactRemovedFromView, aIndex,
+ &MVPbkContactViewObserver::ContactRemovedFromView, aIndex,
aContactLink );
}
}
@@ -758,7 +758,7 @@
{
// Always forward only top view events to clients
SendEventToObservers( *this, iViewObservers,
- MVPbkContactViewObserver::ContactViewError, aError,
+ &MVPbkContactViewObserver::ContactViewError, aError,
aErrorNotified );
}
}
--- a/phonebookui/Phonebook2/ccapplication/ccacommlauncherplugin/src/ccappcommlaunchercontacthandler.cpp Sun Mar 14 13:08:38 2010 +0000
+++ b/phonebookui/Phonebook2/ccapplication/ccacommlauncherplugin/src/ccappcommlaunchercontacthandler.cpp Mon Mar 29 12:25:48 2010 +0100
@@ -374,6 +374,7 @@
CCACOMMLAUNCHER_ROMARRAY_SIZE( KCCAppCommLauncherVoiceCallGroup ));
break;
case VPbkFieldTypeSelectorFactory::EUniEditorSelector:
+ {
TInt flags = 0;
CRepository* key = CRepository::NewL(TUid::Uid(KCRUidPhonebook));
TInt err = key->Get(KPhonebookLocalVariationFlags, flags);
@@ -391,7 +392,8 @@
CCACOMMLAUNCHER_ROMARRAY_SIZE( KCCAppCommLauncherMessageGroup ));
}
delete key;
- break;
+ }
+ break;
case VPbkFieldTypeSelectorFactory::EEmailEditorSelector:
isMatch = FieldArrayAndContactActionMatch(
aContactField, KCCAppCommLauncherEmailGroup,
--- a/phonebookui/Phonebook2/ccapplication/ccapp/inc/ccapppluginloader.h Sun Mar 14 13:08:38 2010 +0000
+++ b/phonebookui/Phonebook2/ccapplication/ccapp/inc/ccapppluginloader.h Mon Mar 29 12:25:48 2010 +0100
@@ -310,7 +310,7 @@
* @param aInfo, object of CImplementationInformation
* @return opaque integer value.
*/
- TInt CCCAppPluginLoader::OpaqueValueFrom( const CImplementationInformation& aInfo );
+ TInt OpaqueValueFrom( const CImplementationInformation& aInfo );
/**
* Loads a plugin.
--- a/phonebookui/Speeddial/inc/SpdiaContainer.h Sun Mar 14 13:08:38 2010 +0000
+++ b/phonebookui/Speeddial/inc/SpdiaContainer.h Mon Mar 29 12:25:48 2010 +0100
@@ -124,7 +124,7 @@
* Selection of the MiddleSoftKey
*
*/
- void CSpdiaContainer::MiddleSoftKeyL();
+ void MiddleSoftKeyL();
/**
* Shows the ViewNumber note.
@@ -172,7 +172,7 @@
void VoiceMailDialogLaunched( TBool aBool );
- CAknLongTapDetector& CSpdiaContainer::LongTapDetectorL();
+ CAknLongTapDetector& LongTapDetectorL();
/**
* refresh the dialog in speeddial view
*/
--- a/phonebookui/Speeddial/speeddialgsplugin/inc/speeddialgsplugin.h Sun Mar 14 13:08:38 2010 +0000
+++ b/phonebookui/Speeddial/speeddialgsplugin/inc/speeddialgsplugin.h Mon Mar 29 12:25:48 2010 +0100
@@ -128,7 +128,7 @@
*/
CSpeeddialGsPlugin();
- void CSpeeddialGsPlugin::LaunchEasAppL();
+ void LaunchEasAppL();
protected:
/**
--- a/predictivesearch/PcsAlgorithm/Algorithm2/inc/CPcsKeyMap.h Sun Mar 14 13:08:38 2010 +0000
+++ b/predictivesearch/PcsAlgorithm/Algorithm2/inc/CPcsKeyMap.h Mon Mar 29 12:25:48 2010 +0100
@@ -74,7 +74,7 @@
/**
* Returns the pool Id for a key
*/
- TInt CPcsKeyMap::PoolIdForCharacter(const TChar& aChar);
+ TInt PoolIdForCharacter(const TChar& aChar);
/**
* Returns total number of pools
*/
--- a/presencecache/presencecacheserver2/inc/presencecachebuddystore.h Sun Mar 14 13:08:38 2010 +0000
+++ b/presencecache/presencecacheserver2/inc/presencecachebuddystore.h Mon Mar 29 12:25:48 2010 +0100
@@ -165,7 +165,7 @@
* @param aOtherIdentity other identity object
* @return ETrue if identity matches.
*/
- TBool CPresenceCacheBuddyStore::EqualsIdentity(
+ TBool EqualsIdentity(
const TDesC& aOtherIdentity ) const;
/**
--- a/presencecache/presencecacheutils/inc/presencecachebuddyinfo.h Sun Mar 14 13:08:38 2010 +0000
+++ b/presencecache/presencecacheutils/inc/presencecachebuddyinfo.h Mon Mar 29 12:25:48 2010 +0100
@@ -172,7 +172,7 @@
*/
void ConstructL();
- void CPresenceCacheBuddyInfo::DoSet16BitValueL(
+ void DoSet16BitValueL(
const TDesC& aKey,
const TDesC& aValue );