# HG changeset patch # User Peter Fordham # Date 1269035197 25200 # Node ID 5072fb0f5b46a0ff138b38ee9f76791e2319d200 # Parent deb88a0cda3736310eb2ef3eea81a3a787f576ea Bug 2312 - Fix various GCCE compiler compatibility issues. diff -r deb88a0cda37 -r 5072fb0f5b46 ccservices/cmsservices/cmscontactor/inc/cmsselectiondialog.h --- a/ccservices/cmsservices/cmscontactor/inc/cmsselectiondialog.h Fri Mar 19 14:44:38 2010 -0700 +++ b/ccservices/cmsservices/cmscontactor/inc/cmsselectiondialog.h Fri Mar 19 14:46:37 2010 -0700 @@ -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. diff -r deb88a0cda37 -r 5072fb0f5b46 ccservices/cmsservices/cmsengine/Server/inc/cmsserverasynccontact.h --- a/ccservices/cmsservices/cmsengine/Server/inc/cmsserverasynccontact.h Fri Mar 19 14:44:38 2010 -0700 +++ b/ccservices/cmsservices/cmsengine/Server/inc/cmsserverasynccontact.h Fri Mar 19 14:46:37 2010 -0700 @@ -218,7 +218,7 @@ * @return TCmsDefaultAttributeTypes CMS's default type. */ CCmsContactFieldItem::TCmsDefaultAttributeTypes - CCmsServerAsyncContact::MatchTypesToInternalEnum( + MatchTypesToInternalEnum( TVPbkDefaultType aDefaultType ); /** diff -r deb88a0cda37 -r 5072fb0f5b46 logsui/EngineInc/CLogsEngine.h --- a/logsui/EngineInc/CLogsEngine.h Fri Mar 19 14:44:38 2010 -0700 +++ b/logsui/EngineInc/CLogsEngine.h Fri Mar 19 14:46:37 2010 -0700 @@ -227,7 +227,7 @@ * * @return strings used by Log database */ - IMPORT_C TLogsEventStrings CLogsEngine::LogDbStrings(); + IMPORT_C TLogsEventStrings LogDbStrings(); /** * Returns reference to CLogClient. diff -r deb88a0cda37 -r 5072fb0f5b46 phonebookengines/VirtualPhonebook/VPbkSimStoreImpl/inc/CMultipleReadCmd.h --- a/phonebookengines/VirtualPhonebook/VPbkSimStoreImpl/inc/CMultipleReadCmd.h Fri Mar 19 14:44:38 2010 -0700 +++ b/phonebookengines/VirtualPhonebook/VPbkSimStoreImpl/inc/CMultipleReadCmd.h Fri Mar 19 14:46:37 2010 -0700 @@ -124,7 +124,7 @@ /** * C++ constructor. */ - CMultipleReadCmd::CMultipleReadCmd( CBasicStore& aBasicStore, + CMultipleReadCmd( CBasicStore& aBasicStore, TInt& aIndexToRead ); /** diff -r deb88a0cda37 -r 5072fb0f5b46 phonebookui/Phonebook2/UIControls/src/cpbk2predictiveviewstack.cpp --- a/phonebookui/Phonebook2/UIControls/src/cpbk2predictiveviewstack.cpp Fri Mar 19 14:44:38 2010 -0700 +++ b/phonebookui/Phonebook2/UIControls/src/cpbk2predictiveviewstack.cpp Fri Mar 19 14:46:37 2010 -0700 @@ -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 ); } } diff -r deb88a0cda37 -r 5072fb0f5b46 phonebookui/Phonebook2/ccapplication/ccapp/inc/ccapppluginloader.h --- a/phonebookui/Phonebook2/ccapplication/ccapp/inc/ccapppluginloader.h Fri Mar 19 14:44:38 2010 -0700 +++ b/phonebookui/Phonebook2/ccapplication/ccapp/inc/ccapppluginloader.h Fri Mar 19 14:46:37 2010 -0700 @@ -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. diff -r deb88a0cda37 -r 5072fb0f5b46 phonebookui/Speeddial/inc/SpdiaContainer.h --- a/phonebookui/Speeddial/inc/SpdiaContainer.h Fri Mar 19 14:44:38 2010 -0700 +++ b/phonebookui/Speeddial/inc/SpdiaContainer.h Fri Mar 19 14:46:37 2010 -0700 @@ -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 */ diff -r deb88a0cda37 -r 5072fb0f5b46 phonebookui/Speeddial/speeddialgsplugin/inc/speeddialgsplugin.h --- a/phonebookui/Speeddial/speeddialgsplugin/inc/speeddialgsplugin.h Fri Mar 19 14:44:38 2010 -0700 +++ b/phonebookui/Speeddial/speeddialgsplugin/inc/speeddialgsplugin.h Fri Mar 19 14:46:37 2010 -0700 @@ -128,7 +128,7 @@ */ CSpeeddialGsPlugin(); - void CSpeeddialGsPlugin::LaunchEasAppL(); + void LaunchEasAppL(); protected: /** diff -r deb88a0cda37 -r 5072fb0f5b46 predictivesearch/PcsAlgorithm/Algorithm2/inc/CPcsKeyMap.h --- a/predictivesearch/PcsAlgorithm/Algorithm2/inc/CPcsKeyMap.h Fri Mar 19 14:44:38 2010 -0700 +++ b/predictivesearch/PcsAlgorithm/Algorithm2/inc/CPcsKeyMap.h Fri Mar 19 14:46:37 2010 -0700 @@ -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 */ diff -r deb88a0cda37 -r 5072fb0f5b46 presencecache/presencecacheserver2/inc/presencecachebuddystore.h --- a/presencecache/presencecacheserver2/inc/presencecachebuddystore.h Fri Mar 19 14:44:38 2010 -0700 +++ b/presencecache/presencecacheserver2/inc/presencecachebuddystore.h Fri Mar 19 14:46:37 2010 -0700 @@ -165,7 +165,7 @@ * @param aOtherIdentity other identity object * @return ETrue if identity matches. */ - TBool CPresenceCacheBuddyStore::EqualsIdentity( + TBool EqualsIdentity( const TDesC& aOtherIdentity ) const; /** diff -r deb88a0cda37 -r 5072fb0f5b46 presencecache/presencecacheutils/inc/presencecachebuddyinfo.h --- a/presencecache/presencecacheutils/inc/presencecachebuddyinfo.h Fri Mar 19 14:44:38 2010 -0700 +++ b/presencecache/presencecacheutils/inc/presencecachebuddyinfo.h Fri Mar 19 14:46:37 2010 -0700 @@ -172,7 +172,7 @@ */ void ConstructL(); - void CPresenceCacheBuddyInfo::DoSet16BitValueL( + void DoSet16BitValueL( const TDesC& aKey, const TDesC& aValue );