# HG changeset patch # User Stefan Karlsson # Date 1269790605 -3600 # Node ID de67232427718b5b4cc643076b6f77a220b576ae # Parent 5ca6302404804616f6aea92216d4619f85d59151 Fixed "extra qualification" syntax errors. diff -r 5ca630240480 -r de6723242771 appinstaller/AppMngr2/SWInstAdapter/inc/cswinstadapter.h --- a/appinstaller/AppMngr2/SWInstAdapter/inc/cswinstadapter.h Wed Mar 24 07:27:50 2010 +0000 +++ b/appinstaller/AppMngr2/SWInstAdapter/inc/cswinstadapter.h Sun Mar 28 16:36:45 2010 +0100 @@ -388,13 +388,13 @@ void CompleteOutstandingCmdsL(); private: // New methods - void CSWInstAdapter::FillNodeInfoL( MSmlDmDDFObject& aDDFObject, - TSmlDmAccessTypes& aAccessTypes, - MSmlDmDDFObject::TScope aScope, - MSmlDmDDFObject::TDFFormat aFormat, - MSmlDmDDFObject::TOccurence aOccurence, - const TDesC8& aDescription, - const TDesC8& aMIMEType ); + void FillNodeInfoL( MSmlDmDDFObject& aDDFObject, + TSmlDmAccessTypes& aAccessTypes, + MSmlDmDDFObject::TScope aScope, + MSmlDmDDFObject::TDFFormat aFormat, + MSmlDmDDFObject::TOccurence aOccurence, + const TDesC8& aDescription, + const TDesC8& aMIMEType ); private: // Constructor /** * Symbian 2nd phase constructor diff -r 5ca630240480 -r de6723242771 iaupdate/IAD/ui/inc/iaupdatesettingdialog.h --- a/iaupdate/IAD/ui/inc/iaupdatesettingdialog.h Wed Mar 24 07:27:50 2010 +0000 +++ b/iaupdate/IAD/ui/inc/iaupdatesettingdialog.h Sun Mar 28 16:36:45 2010 +0100 @@ -251,7 +251,7 @@ { public: static CIAUpdateAccessPointSettingItem* - CIAUpdateAccessPointSettingItem::NewL( TInt aSettingId, TInt& aAccessPointId ); + NewL( TInt aSettingId, TInt& aAccessPointId ); ~CIAUpdateAccessPointSettingItem(); private: CIAUpdateAccessPointSettingItem ( TInt aSettingId, TInt& aAccessPointId ); diff -r 5ca630240480 -r de6723242771 iaupdate/IAD/ui/inc/iaupdateuicontroller.h --- a/iaupdate/IAD/ui/inc/iaupdateuicontroller.h Wed Mar 24 07:27:50 2010 +0000 +++ b/iaupdate/IAD/ui/inc/iaupdateuicontroller.h Sun Mar 28 16:36:45 2010 +0100 @@ -517,7 +517,7 @@ * the self update. In other words, self update related data * has not been handled yet. Else EFalse. */ - TBool CIAUpdateUiController::RestartedFromSelfUpdate(); + TBool RestartedFromSelfUpdate(); /** * Writes the possible parameter information into the temporary diff -r 5ca630240480 -r de6723242771 ncdengine/provider/client/inc/ncdnodemanagerproxy.h --- a/ncdengine/provider/client/inc/ncdnodemanagerproxy.h Wed Mar 24 07:27:50 2010 +0000 +++ b/ncdengine/provider/client/inc/ncdnodemanagerproxy.h Sun Mar 28 16:36:45 2010 +0100 @@ -142,7 +142,7 @@ * @exception Leave KErrNotFound if aForceCreate has been set as EFalse, * and the node was not created. */ - CNcdNodeProxy& CNcdNodeManagerProxy::CreateSchemeNodeL( + CNcdNodeProxy& CreateSchemeNodeL( const CNcdNodeIdentifier& aMetadataIdentifier, TNcdSchemeNodeType aType, TBool aRemoveOnDisconnect, diff -r 5ca630240480 -r de6723242771 ncdengine/provider/inc/ncddelay.h --- a/ncdengine/provider/inc/ncddelay.h Wed Mar 24 07:27:50 2010 +0000 +++ b/ncdengine/provider/inc/ncddelay.h Sun Mar 28 16:36:45 2010 +0100 @@ -36,7 +36,7 @@ * @param aCallBack Function that gets called after the timer goes off. * @return COsmDelay* Pointer to the created COsmDelay object. */ - static CNcdDelay* CNcdDelay::NewL( TCallBack aCallBack ); + static CNcdDelay* NewL( TCallBack aCallBack ); private: diff -r 5ca630240480 -r de6723242771 ncdengine/provider/protocol/inc/ncd_cp_clientconfigurationimpl.h --- a/ncdengine/provider/protocol/inc/ncd_cp_clientconfigurationimpl.h Wed Mar 24 07:27:50 2010 +0000 +++ b/ncdengine/provider/protocol/inc/ncd_cp_clientconfigurationimpl.h Sun Mar 28 16:36:45 2010 +0100 @@ -34,7 +34,7 @@ TInt CookieCount() const; MNcdConfigurationProtocolCookie& CookieL( TInt aIndex ) const; TInt DetailCount() const; - const MNcdConfigurationProtocolDetail& CNcdConfigurationProtocolClientConfigurationImpl::DetailL( TInt aIndex ) const; + const MNcdConfigurationProtocolDetail& DetailL( TInt aIndex ) const; private: CNcdConfigurationProtocolClientConfigurationImpl(); diff -r 5ca630240480 -r de6723242771 ncdengine/provider/server/inc/ncdbaseoperation.h --- a/ncdengine/provider/server/inc/ncdbaseoperation.h Wed Mar 24 07:27:50 2010 +0000 +++ b/ncdengine/provider/server/inc/ncdbaseoperation.h Sun Mar 28 16:36:45 2010 +0100 @@ -631,7 +631,7 @@ } private: - CNcdAsyncRunner::CNcdAsyncRunner( CNcdBaseOperation* aOperation) + CNcdAsyncRunner( CNcdBaseOperation* aOperation) : CActive(EPriorityStandard), iOperation( aOperation ) { CActiveScheduler::Add(this); diff -r 5ca630240480 -r de6723242771 ncdengine/provider/server/inc/ncdnodeidentifier.h --- a/ncdengine/provider/server/inc/ncdnodeidentifier.h Wed Mar 24 07:27:50 2010 +0000 +++ b/ncdengine/provider/server/inc/ncdnodeidentifier.h Sun Mar 28 16:36:45 2010 +0100 @@ -307,7 +307,7 @@ * aObject1 > aObject2 * @note Only node id, namespace and client UID are used for comparison */ - static TInt CNcdNodeIdentifier::CompareOrderByUid( + static TInt CompareOrderByUid( const CNcdNodeIdentifier& aObject1, const CNcdNodeIdentifier& aObject2 ); diff -r 5ca630240480 -r de6723242771 ncdengine/provider/server/inc/ncdnodemanager.h --- a/ncdengine/provider/server/inc/ncdnodemanager.h Wed Mar 24 07:27:50 2010 +0000 +++ b/ncdengine/provider/server/inc/ncdnodemanager.h Sun Mar 28 16:36:45 2010 +0100 @@ -310,8 +310,8 @@ * @param aNodeIdentfier The identifier that identifies the parent of this node. * @return CNcdNode& Reference to the node that was found. */ - CNcdNodeItem& CNcdNodeManager::CreateNodeItemL( CNcdNodeFactory::TNcdNodePurpose aNodePurpose, - const CNcdNodeIdentifier& aNodeIdentifier ); + CNcdNodeItem& CreateNodeItemL( CNcdNodeFactory::TNcdNodePurpose aNodePurpose, + const CNcdNodeIdentifier& aNodeIdentifier ); /** @@ -325,9 +325,9 @@ * @param aMetaDataIdentifier The identifier of metadata of this node. * @return CNcdNode& Reference to the node that was found. */ - CNcdNodeItem& CNcdNodeManager::CreateNodeItemL( CNcdNodeFactory::TNcdNodePurpose aNodePurpose, - const CNcdNodeIdentifier& aParentNodeIdentifier, - const CNcdNodeIdentifier& aMetaDataIdentifier ); + CNcdNodeItem& CreateNodeItemL( CNcdNodeFactory::TNcdNodePurpose aNodePurpose, + const CNcdNodeIdentifier& aParentNodeIdentifier, + const CNcdNodeIdentifier& aMetaDataIdentifier ); /** @@ -346,10 +346,10 @@ * if root folder should be created. * @return CNcdNode& Reference to the node that was found. */ - CNcdNodeFolder& CNcdNodeManager::CreateNodeFolderL( CNcdNodeFactory::TNcdNodePurpose aNodePurpose, - const CNcdNodeIdentifier& aNodeIdentifier, - CNcdNodeFactory::TNcdNodeType aFolderType - = CNcdNodeFactory::ENcdNodeFolder ); + CNcdNodeFolder& CreateNodeFolderL( CNcdNodeFactory::TNcdNodePurpose aNodePurpose, + const CNcdNodeIdentifier& aNodeIdentifier, + CNcdNodeFactory::TNcdNodeType aFolderType + = CNcdNodeFactory::ENcdNodeFolder ); /** * Creates a folder node accroding to the given type information. * Adds the created node into the cache. If node already exists @@ -363,11 +363,11 @@ * if root folder should be created. * @return CNcdNode& Reference to the node that was found. */ - CNcdNodeFolder& CNcdNodeManager::CreateNodeFolderL( CNcdNodeFactory::TNcdNodePurpose aNodePurpose, - const CNcdNodeIdentifier& aParentNodeIdentifier, - const CNcdNodeIdentifier& aMetaDataIdentifier, - CNcdNodeFactory::TNcdNodeType aFolderType - = CNcdNodeFactory::ENcdNodeFolder ); + CNcdNodeFolder& CreateNodeFolderL( CNcdNodeFactory::TNcdNodePurpose aNodePurpose, + const CNcdNodeIdentifier& aParentNodeIdentifier, + const CNcdNodeIdentifier& aMetaDataIdentifier, + CNcdNodeFactory::TNcdNodeType aFolderType + = CNcdNodeFactory::ENcdNodeFolder ); /** * Uses FolderL to search an existing folder. If the folder is not diff -r 5ca630240480 -r de6723242771 ncdengine/provider/server/inc/ncdsubscriptiongroup.h --- a/ncdengine/provider/server/inc/ncdsubscriptiongroup.h Wed Mar 24 07:27:50 2010 +0000 +++ b/ncdengine/provider/server/inc/ncdsubscriptiongroup.h Sun Mar 28 16:36:45 2010 +0100 @@ -263,8 +263,7 @@ * * @param aMessage Used to send data back to proxy. */ - void CNcdSubscriptionGroup::IconDataRequestL( - MCatalogsBaseMessage& aMessage ) const; + void IconDataRequestL( MCatalogsBaseMessage& aMessage ) const; /** * This function writes the object data to the stream. The given array diff -r 5ca630240480 -r de6723242771 ncdengine/provider/server/inc/ncdsubscriptionmanagerimpl.h --- a/ncdengine/provider/server/inc/ncdsubscriptionmanagerimpl.h Wed Mar 24 07:27:50 2010 +0000 +++ b/ncdengine/provider/server/inc/ncdsubscriptionmanagerimpl.h Sun Mar 28 16:36:45 2010 +0100 @@ -324,7 +324,7 @@ * @param aContext Not used. * @exception Leave with System wide error code. */ - void CNcdSubscriptionManager::CompleteSubscriptionsDataL( + void CompleteSubscriptionsDataL( TUid aClientUid, RPointerArray& aServersGroups, MCatalogsContext* aContext, diff -r 5ca630240480 -r de6723242771 ncdengine/provider/server/inc/ncdsubscriptionoperationimpl.h --- a/ncdengine/provider/server/inc/ncdsubscriptionoperationimpl.h Wed Mar 24 07:27:50 2010 +0000 +++ b/ncdengine/provider/server/inc/ncdsubscriptionoperationimpl.h Sun Mar 28 16:36:45 2010 +0100 @@ -338,7 +338,7 @@ /** * @see CNcdBaseOperation::ChangeToPreviousStateL(); */ - void CNcdSubscriptionOperation::ChangeToPreviousStateL(); + void ChangeToPreviousStateL(); /** * Cancels the suboperations.