# HG changeset patch # User William Roberts # Date 1268572431 0 # Node ID 5e70f222339871226297c6f8095abbdb71f5e825 # Parent 7b661a6e51d059dd407e2129a1735dd049615f9c# Parent ea4b2e4f7cacae15dca8cdbfd9aa6448c9f80262 Automatic merge from PDK_3.0.h diff -r ea4b2e4f7cac -r 5e70f2223398 browserutilities/downloadmgr/DownloadMgrServEng/Inc/HttpDownload.h --- a/browserutilities/downloadmgr/DownloadMgrServEng/Inc/HttpDownload.h Fri Feb 19 23:55:03 2010 +0200 +++ b/browserutilities/downloadmgr/DownloadMgrServEng/Inc/HttpDownload.h Sun Mar 14 13:13:51 2010 +0000 @@ -968,12 +968,12 @@ * Notifies gallery about new file * @param aFileName file name */ - void CHttpDownload::NotifyMediaGalleryL( const TDesC& aFileName ); + void NotifyMediaGalleryL( const TDesC& aFileName ); /** * ConvertDownloadNameUniqueL */ - void CHttpDownload::ConvertDownloadNameUniqueL( HBufC*& filePath, + void ConvertDownloadNameUniqueL( HBufC*& filePath, HBufC*& fileName, HBufC*& fileExtn); diff -r ea4b2e4f7cac -r 5e70f2223398 browserutilities/feedsengine/FeedsServer/Server/inc/FeedsDatabase.h --- a/browserutilities/feedsengine/FeedsServer/Server/inc/FeedsDatabase.h Fri Feb 19 23:55:03 2010 +0200 +++ b/browserutilities/feedsengine/FeedsServer/Server/inc/FeedsDatabase.h Sun Mar 14 13:13:51 2010 +0000 @@ -88,7 +88,7 @@ * @return ETrue if the feed was resolved. */ - TBool CFeedsDatabase::FeedIdFromEntryIdL(const TInt& aEntryId, TInt aFolderListId, TInt& aFeedId); + TBool FeedIdFromEntryIdL(const TInt& aEntryId, TInt aFolderListId, TInt& aFeedId); /** * Returns the feed id of the entry id with the given feed. @@ -99,7 +99,7 @@ * @param aEntryId The feed's folder item id * @return ETrue if the feed was resolved. */ - TBool CFeedsDatabase::EntryIdFromFeedIdL(const TInt& aFeedId, TInt aFolderListId, TInt& aEntryId); + TBool EntryIdFromFeedIdL(const TInt& aFeedId, TInt aFolderListId, TInt& aEntryId); /** * Return the folder list ID of the feed with the given feed-id. @@ -162,7 +162,7 @@ * @param aFolderItemId The resulting folder-item-id, if found. * @return ETrue if a folder item with this name was found. */ - TBool CFeedsDatabase::FindFolderItemL(TInt& aFolderListId, const TDesC& aName, + TBool FindFolderItemL(TInt& aFolderListId, const TDesC& aName, TInt& aFolderItemId); /** diff -r ea4b2e4f7cac -r 5e70f2223398 webengine/osswebengine/JavaScriptCore/wtf/symbian/limits --- a/webengine/osswebengine/JavaScriptCore/wtf/symbian/limits Fri Feb 19 23:55:03 2010 +0200 +++ b/webengine/osswebengine/JavaScriptCore/wtf/symbian/limits Sun Mar 14 13:13:51 2010 +0000 @@ -57,15 +57,15 @@ template<> struct numeric_limits { - static long long min() { return -9223372036854775807; } - static long long max() { return 9223372036854775807; } + static long long min() { return -9223372036854775807LL; } + static long long max() { return 9223372036854775807LL; } static const bool is_signed = true; }; template<> struct numeric_limits { - static unsigned long long max() { return 18446744073709551615; } + static unsigned long long max() { return 18446744073709551615ULL; } static const bool is_signed = false; }; } diff -r ea4b2e4f7cac -r 5e70f2223398 webengine/osswebengine/JavaScriptCore/wtf/symbian/snprintf.c --- a/webengine/osswebengine/JavaScriptCore/wtf/symbian/snprintf.c Fri Feb 19 23:55:03 2010 +0200 +++ b/webengine/osswebengine/JavaScriptCore/wtf/symbian/snprintf.c Sun Mar 14 13:13:51 2010 +0000 @@ -153,8 +153,8 @@ } PrintfArgValue; -void flushbuffer(PrintfTarget *target); -int dopr(PrintfTarget *target, const char *format, va_list args); +static void flushbuffer(PrintfTarget *target); +static int dopr(PrintfTarget *target, const char *format, va_list args); EXPORT_C int diff -r ea4b2e4f7cac -r 5e70f2223398 webengine/osswebengine/MemoryManager/Inc/MemoryManager.h --- a/webengine/osswebengine/MemoryManager/Inc/MemoryManager.h Fri Feb 19 23:55:03 2010 +0200 +++ b/webengine/osswebengine/MemoryManager/Inc/MemoryManager.h Sun Mar 14 13:13:51 2010 +0000 @@ -306,7 +306,7 @@ * @param * @return */ - IMPORT_C static void MemoryManager::CreateFastAllocator(); + IMPORT_C static void CreateFastAllocator(); /** * Initialize MemoryManager library. Special case if CreateFastAllocator is @@ -316,7 +316,7 @@ * @param * @return */ - IMPORT_C static void MemoryManager::InitFastAllocator(); + IMPORT_C static void InitFastAllocator(); /** * initialize the OOM handler in the memorypool diff -r ea4b2e4f7cac -r 5e70f2223398 webengine/osswebengine/WebCore/platform/PlatformKeyboardEvent.h --- a/webengine/osswebengine/WebCore/platform/PlatformKeyboardEvent.h Fri Feb 19 23:55:03 2010 +0200 +++ b/webengine/osswebengine/WebCore/platform/PlatformKeyboardEvent.h Sun Mar 14 13:13:51 2010 +0000 @@ -61,7 +61,7 @@ public: #if PLATFORM(SYMBIAN) String text() const; -#elif +#else String text() const { return m_text; } #endif //PLATFORM(SYMBIAN) String unmodifiedText() const { return m_unmodifiedText; } diff -r ea4b2e4f7cac -r 5e70f2223398 webengine/osswebengine/WebCore/platform/symbian/FormFillController.cpp --- a/webengine/osswebengine/WebCore/platform/symbian/FormFillController.cpp Fri Feb 19 23:55:03 2010 +0200 +++ b/webengine/osswebengine/WebCore/platform/symbian/FormFillController.cpp Sun Mar 14 13:13:51 2010 +0000 @@ -43,7 +43,7 @@ FormFillController::FormFillController() : m_popup(0), m_callback(0), m_inputElement(0), m_formDB(0), m_passwdDB(0) { - m_searchTimer = new Timer(this, FormFillController::fireSearch); + m_searchTimer = new Timer(this, &FormFillController::fireSearch); } FormFillController::~FormFillController() diff -r ea4b2e4f7cac -r 5e70f2223398 webengine/osswebengine/WebKit/s60/plugins/NpnImplementation.cpp --- a/webengine/osswebengine/WebKit/s60/plugins/NpnImplementation.cpp Fri Feb 19 23:55:03 2010 +0200 +++ b/webengine/osswebengine/WebKit/s60/plugins/NpnImplementation.cpp Sun Mar 14 13:13:51 2010 +0000 @@ -369,7 +369,7 @@ case NPNVisOfflineBool: // Tells whether offline mode is enabled; // true=offline mode enabled, false=not enabled - case NPNNetworkAccess: + case NPNNetworkAccess: { PluginWin* pluginWin = (PluginWin*)aInstance->ndata; TInt apId = -1; if (pluginWin) { @@ -377,7 +377,7 @@ } *((TInt*) aRetValue) = apId; break; - + } case NPNVGenericParameter: { PluginWin* pluginWin = (PluginWin*)aInstance->ndata; if (pluginWin) { diff -r ea4b2e4f7cac -r 5e70f2223398 webengine/osswebengine/cache/inc/HttpCacheLookupTable.h --- a/webengine/osswebengine/cache/inc/HttpCacheLookupTable.h Fri Feb 19 23:55:03 2010 +0200 +++ b/webengine/osswebengine/cache/inc/HttpCacheLookupTable.h Sun Mar 14 13:13:51 2010 +0000 @@ -106,7 +106,7 @@ * @param * @return */ - TInt CHttpCacheLookupTable::ListFiles( RPointerArray& aFilenameList ); + TInt ListFiles( RPointerArray& aFilenameList ); /** * diff -r ea4b2e4f7cac -r 5e70f2223398 webengine/pagescaler/src/minimap.cpp --- a/webengine/pagescaler/src/minimap.cpp Fri Feb 19 23:55:03 2010 +0200 +++ b/webengine/pagescaler/src/minimap.cpp Sun Mar 14 13:13:51 2010 +0000 @@ -118,10 +118,10 @@ void CMinimap::ConstructL() { iGenerator = CMinimapGenerator::NewL(*this); - iUpdateCbTimer = CMinimapTimer::NewL(*this, &UpdateCbTimerCbL, CActive::EPriorityStandard - 1 ); - iUpdateTimer = CMinimapTimer::NewL(*this, &UpdateTimerCbL); - iVisibilityTimer = CMinimapTimer::NewL(*this, &VisibilityTimerCbL); - iFadeTimer = CMinimapTimer::NewL(*this, &UpdateTransparency); + iUpdateCbTimer = CMinimapTimer::NewL(*this, &CMinimap::UpdateCbTimerCbL, CActive::EPriorityStandard - 1 ); + iUpdateTimer = CMinimapTimer::NewL(*this, &CMinimap::UpdateTimerCbL); + iVisibilityTimer = CMinimapTimer::NewL(*this, &CMinimap::VisibilityTimerCbL); + iFadeTimer = CMinimapTimer::NewL(*this, &CMinimap::UpdateTransparency); SetRelativePosition(KDefaultOffsetX,KDefaultOffsetY,KDefaultPosition); } diff -r ea4b2e4f7cac -r 5e70f2223398 webengine/webkitutils/stmgesturefw/src/stateengine.cpp --- a/webengine/webkitutils/stmgesturefw/src/stateengine.cpp Fri Feb 19 23:55:03 2010 +0200 +++ b/webengine/webkitutils/stmgesturefw/src/stateengine.cpp Sun Mar 14 13:13:51 2010 +0000 @@ -39,12 +39,12 @@ not behave correctly. */ -/*! Add macro with token pasting to make creation of the state machine tables easier +/*! Add macro without token pasting to make creation of the state machine tables easier and removing the necessity to write the classname twice. Maybe there would be some better way to do this using templates and typedefs? */ -#define CND(x) isF -#define ACT(x) aF +#define CND(x) isF +#define ACT(x) aF /********************************************************************************* * empty statedef as a dummy entry diff -r ea4b2e4f7cac -r 5e70f2223398 webengine/webkitutils/stmgesturefw/src/statemachine.cpp --- a/webengine/webkitutils/stmgesturefw/src/statemachine.cpp Fri Feb 19 23:55:03 2010 +0200 +++ b/webengine/webkitutils/stmgesturefw/src/statemachine.cpp Sun Mar 14 13:13:51 2010 +0000 @@ -155,9 +155,9 @@ for (int i = 0; i < KMaxNumberOfPointers; i++) { m_impl[i] = new(ELeave) CStateEngine(m_config, this, i) ; - m_holdTimer[i] = CCallbackTimer::NewL(*this, handleholdTimer, 0, i, ETrue); - m_touchTimer[i] = CCallbackTimer::NewL(*this, handletouchTimer, 0, i, ETrue); - m_suppressTimer[i] = CCallbackTimer::NewL(*this, handlesuppressTimer, 0, i, ETrue); + m_holdTimer[i] = CCallbackTimer::NewL(*this, &CStateMachine::handleholdTimer, 0, i, ETrue); + m_touchTimer[i] = CCallbackTimer::NewL(*this, &CStateMachine::handletouchTimer, 0, i, ETrue); + m_suppressTimer[i] = CCallbackTimer::NewL(*this, &CStateMachine::handlesuppressTimer, 0, i, ETrue); } m_coeEnv = CCoeEnv::Static(); diff -r ea4b2e4f7cac -r 5e70f2223398 webengine/widgetinstaller/Src/WidgetInstaller.cpp --- a/webengine/widgetinstaller/Src/WidgetInstaller.cpp Fri Feb 19 23:55:03 2010 +0200 +++ b/webengine/widgetinstaller/Src/WidgetInstaller.cpp Sun Mar 14 13:13:51 2010 +0000 @@ -471,7 +471,7 @@ } break; - case EWidgetPropTypeInt: + case EWidgetPropTypeInt: { TLex toInt( value->Des() ); TInt k; if ( KErrNone != toInt.Val( k ) ) @@ -480,13 +480,15 @@ } if ( propId == EBlanketPermGranted ) backupBlanketPerm = k; - break; + } + break; - case EWidgetPropTypeString: + case EWidgetPropTypeString:{ *(backupPropertyValues[propId]) = *value; - break; + } + break; - case EWidgetPropTypeUid: + case EWidgetPropTypeUid: { TLex toUid( value->Des() ); TInt u; diff -r ea4b2e4f7cac -r 5e70f2223398 webengine/widgetregistry/Server/inc/WidgetRegistry.h --- a/webengine/widgetregistry/Server/inc/WidgetRegistry.h Fri Feb 19 23:55:03 2010 +0200 +++ b/webengine/widgetregistry/Server/inc/WidgetRegistry.h Sun Mar 14 13:13:51 2010 +0000 @@ -149,7 +149,7 @@ /** * return serialized value of property aId for the widget aUid or leave */ - CBufFlat* CWidgetRegistry::GetWidgetPropertyValueL( + CBufFlat* GetWidgetPropertyValueL( const TUid& aUid, TWidgetPropertyId aId, TInt aMaxLength ); diff -r ea4b2e4f7cac -r 5e70f2223398 webengine/wmlengine/src/MVC/include/MVCScroll.h --- a/webengine/wmlengine/src/MVC/include/MVCScroll.h Fri Feb 19 23:55:03 2010 +0200 +++ b/webengine/wmlengine/src/MVC/include/MVCScroll.h Sun Mar 14 13:13:51 2010 +0000 @@ -135,7 +135,7 @@ /** * Method returns the first sibling box whose width and height are not zero */ - NW_LMgr_Box_t* CMVCScroll::GetFirstSiblingBox (NW_LMgr_Box_t* box); + NW_LMgr_Box_t* GetFirstSiblingBox (NW_LMgr_Box_t* box); private: // Private methods and member variables /** diff -r ea4b2e4f7cac -r 5e70f2223398 webengine/wmlengine/src/lmgr/include/ObjectUtils.h --- a/webengine/wmlengine/src/lmgr/include/ObjectUtils.h Fri Feb 19 23:55:03 2010 +0200 +++ b/webengine/wmlengine/src/lmgr/include/ObjectUtils.h Sun Mar 14 13:13:51 2010 +0000 @@ -200,7 +200,7 @@ * * @return void */ - static void ObjectUtils::RemoveAttributeL( CDesCArray& aNameArray, + static void RemoveAttributeL( CDesCArray& aNameArray, CDesCArray& aValueArray, const TDesC& aName ); /** @@ -210,7 +210,7 @@ * * @return the associated content type of NULL if no association exists. */ - static TDesC* ObjectUtils::GetAssociatedContentType(const TDesC& aClassId); + static TDesC* GetAssociatedContentType(const TDesC& aClassId); /** * Returns the source param name associated with the given class-id. @@ -219,7 +219,7 @@ * * @return the associated source param name of NULL if no association exists. */ - static TDesC* ObjectUtils::GetAssociatedSourceParamName(const TDesC& aClassId); + static TDesC* GetAssociatedSourceParamName(const TDesC& aClassId); /** * General purpose panic function for Object related errors. @@ -237,7 +237,7 @@ * @param aUrl The uri with file name and extension. * @return the content type of the uri */ - static HBufC* ObjectUtils::GetContentTypeByUrl(const TDesC* aUri); + static HBufC* GetContentTypeByUrl(const TDesC* aUri); private: // Private Methods /** @@ -289,7 +289,7 @@ * (either KParamName or KContentType) * @return the value or NULL on out of memory. */ - static TDesC* ObjectUtils::GetClassidAssociation(const TDesC& aClassId, + static TDesC* GetClassidAssociation(const TDesC& aClassId, TInt aValueSelector); }; diff -r ea4b2e4f7cac -r 5e70f2223398 webengine/wmlengine/src/wmlcontrol/include/WmlControl.h --- a/webengine/wmlengine/src/wmlcontrol/include/WmlControl.h Fri Feb 19 23:55:03 2010 +0200 +++ b/webengine/wmlengine/src/wmlcontrol/include/WmlControl.h Sun Mar 14 13:13:51 2010 +0000 @@ -97,7 +97,7 @@ // Sets the WmlLink void SetWmlLink(TBool aLink) { iWmlLink = aLink; } // Returns to the Browser Control info about the wml page - HBufC* CWmlControl::PageInfoLC(TBrCtlDefs::TBrCtlPageInfo aBrCtlPageInfo); + HBufC* PageInfoLC(TBrCtlDefs::TBrCtlPageInfo aBrCtlPageInfo); /** * Update a Browser setting