Fixed "extra qualification" syntax errors.
--- a/upnp/upnpstack/controlpointbase/inc/upnpcpbdescriptionagent.h Sun Mar 14 13:12:18 2010 +0000
+++ b/upnp/upnpstack/controlpointbase/inc/upnpcpbdescriptionagent.h Sun Mar 28 16:38:08 2010 +0100
@@ -52,7 +52,7 @@
* Two-phased constructor
* @since S60 v5.0
*/
- static CUpnpCpbDescriptionAgent* CUpnpCpbDescriptionAgent::NewL(
+ static CUpnpCpbDescriptionAgent* NewL(
CUpnpControlPoint& aBaseCP,
MUpnpCpbHttpMessageController& aMessanger,
CUpnpCpbDeviceRepository& aRepository);
@@ -152,14 +152,14 @@
* @since S60 v5.0
* @return ETrue when devices was copied
*/
- TBool CUpnpCpbDescriptionAgent::CopyResult();
+ TBool CopyResult();
/**
* Copy results to repository
*
* @since S60 v5.0
*/
- void CUpnpCpbDescriptionAgent::CopyResultL();
+ void CopyResultL();
/**
* Report discovered devices to the client
--- a/upnp/upnpstack/controlpointbase/inc/upnpcpbdevicelistutils.h Sun Mar 14 13:12:18 2010 +0000
+++ b/upnp/upnpstack/controlpointbase/inc/upnpcpbdevicelistutils.h Sun Mar 28 16:38:08 2010 +0100
@@ -87,7 +87,7 @@
* @param aError result of append function
* @return ETrue if device is added, EFalse if not
*/
- static TBool UpnpCpbDeviceListUtils::AddDevice(
+ static TBool AddDevice(
CUpnpDevice* aDevice, RPointerArray<CUpnpDevice>& aList, TInt& aError);
/**
--- a/upnp/upnpstack/controlpointbase/inc/upnpcpbdevicerepository.h Sun Mar 14 13:12:18 2010 +0000
+++ b/upnp/upnpstack/controlpointbase/inc/upnpcpbdevicerepository.h Sun Mar 28 16:38:08 2010 +0100
@@ -38,7 +38,7 @@
* Two-phased constructor
* @since S60 v5.0
*/
- static CUpnpCpbDeviceRepository* CUpnpCpbDeviceRepository::NewL(
+ static CUpnpCpbDeviceRepository* NewL(
const CDesC8Array& aTargetDeviceTypes );
/**
--- a/upnp/upnpstack/controlpointbase/inc/upnpcpbdiscoveryagent.h Sun Mar 14 13:12:18 2010 +0000
+++ b/upnp/upnpstack/controlpointbase/inc/upnpcpbdiscoveryagent.h Sun Mar 28 16:38:08 2010 +0100
@@ -46,7 +46,7 @@
* Two-phased constructor
* @since S60 v5.0
*/
- static CUpnpCpbDiscoveryAgent* CUpnpCpbDiscoveryAgent::NewL(
+ static CUpnpCpbDiscoveryAgent* NewL(
MUpnpCpbHttpMessageController& aMessanger );
/**
--- a/upnp/upnpstack/controlpointbase/inc/upnpcpbembeddeddevicedescription.h Sun Mar 14 13:12:18 2010 +0000
+++ b/upnp/upnpstack/controlpointbase/inc/upnpcpbembeddeddevicedescription.h Sun Mar 28 16:38:08 2010 +0100
@@ -44,8 +44,8 @@
* @since S60 v5.0
*/
static CUpnpCpbEmbeddedDeviceDescription*
- CUpnpCpbEmbeddedDeviceDescription::NewL(MUpnpCpbHttpMessageController& aMessanger,
- CUpnpCpbDeviceRepository& aRepository);
+ NewL(MUpnpCpbHttpMessageController& aMessanger,
+ CUpnpCpbDeviceRepository& aRepository);
/**
* Start processing device.
@@ -152,7 +152,7 @@
* @param aDevice Target device
* @return TRUE if device is discovered correctly
*/
- TBool CUpnpCpbEmbeddedDeviceDescription::BuildResultListsL(CUpnpDevice* aDevice);
+ TBool BuildResultListsL(CUpnpDevice* aDevice);
/**
* Count result and create Uuids
--- a/upnp/upnpstack/controlpointbase/inc/upnpcpbinitialeventretry.h Sun Mar 14 13:12:18 2010 +0000
+++ b/upnp/upnpstack/controlpointbase/inc/upnpcpbinitialeventretry.h Sun Mar 28 16:38:08 2010 +0100
@@ -36,7 +36,7 @@
public:
// Constructors and destructor
// Ownership of aMessage is passed through
- static CUpnpCpbInitialEventRetry* CUpnpCpbInitialEventRetry::NewLC(
+ static CUpnpCpbInitialEventRetry* NewLC(
CUpnpGenaMessage* aMessage,
CUpnpCpbInitialEventRetryHandler& iOwner );
--- a/upnp/upnpstack/controlpointbase/inc/upnpcpbsimpledevicedescription.h Sun Mar 14 13:12:18 2010 +0000
+++ b/upnp/upnpstack/controlpointbase/inc/upnpcpbsimpledevicedescription.h Sun Mar 28 16:38:08 2010 +0100
@@ -43,9 +43,8 @@
* @since S60 v5.0
*/
static CUpnpCpbSimpleDeviceDescription*
- CUpnpCpbSimpleDeviceDescription::NewL(
- MUpnpCpbHttpMessageController& aMessanger,
- CUpnpCpbDeviceRepository& aRepository);
+ NewL(MUpnpCpbHttpMessageController& aMessanger,
+ CUpnpCpbDeviceRepository& aRepository);
/**
* Start processing device.
--- a/upnp/upnpstack/controlpointbase/inc/upnpserviceinfo.h Sun Mar 14 13:12:18 2010 +0000
+++ b/upnp/upnpstack/controlpointbase/inc/upnpserviceinfo.h Sun Mar 28 16:38:08 2010 +0100
@@ -46,7 +46,7 @@
* @param aControlPoint pointer to Control Point.
* @param aService Upnp Service
*/
- static CUpnpServiceInfo* CUpnpServiceInfo::NewLC(
+ static CUpnpServiceInfo* NewLC(
CUpnpControlPoint* aControlPoint,
CUpnpService* aService );
@@ -169,4 +169,4 @@
#endif // C_CUPNPSERVICEINFO_H
-// End Of File
\ No newline at end of file
+// End Of File
--- a/upnp/upnpstack/dlnawebserver/inc/upnphttpsession.h Sun Mar 14 13:12:18 2010 +0000
+++ b/upnp/upnpstack/dlnawebserver/inc/upnphttpsession.h Sun Mar 28 16:38:08 2010 +0100
@@ -249,7 +249,7 @@
* @param aBuffer Buffer that has been received.
* @return None.
**/
- void CUpnpHttpSession::SinglePostBufferReceivedL( TDesC8& aBuffer );
+ void SinglePostBufferReceivedL( TDesC8& aBuffer );
--- a/upnp/upnpstack/serviceframework/inc/upnpinitialeventqueuemanager.h Sun Mar 14 13:12:18 2010 +0000
+++ b/upnp/upnpstack/serviceframework/inc/upnpinitialeventqueuemanager.h Sun Mar 28 16:38:08 2010 +0100
@@ -73,9 +73,8 @@
* @param aVariableList list of evented variables
* @return number of evented variables
*/
- TInt CUpnpInitialEventQueueManager::FillEventBodyL(
- TDes8& aEvent,
- const RPointerArray<CUpnpStateVariable>& aVariableList );
+ TInt FillEventBodyL( TDes8& aEvent,
+ const RPointerArray<CUpnpStateVariable>& aVariableList );
/**
* Creates event message
* @param aMessage will be encapsulete into http transaction
--- a/upnp/upnpstack_plat/upnp_common_api/inc/upnpicon.h Sun Mar 14 13:12:18 2010 +0000
+++ b/upnp/upnpstack_plat/upnp_common_api/inc/upnpicon.h Sun Mar 28 16:38:08 2010 +0100
@@ -238,7 +238,7 @@
* @param aDepth icon depth
* @param aMimeType icon mime type
*/
- void CUpnpIcon::ConstructL(const TDesC16& aPath, const TDesC8& aUrl, const TInt aWidth, const TInt aHeight, const TInt aDepth, const TDesC8& aMimeType);
+ void ConstructL(const TDesC16& aPath, const TDesC8& aUrl, const TInt aWidth, const TInt aHeight, const TInt aDepth, const TDesC8& aMimeType);
/**
* By default Symbian 2nd phase constructor is private.
@@ -248,7 +248,7 @@
* @param aDepth icon depth
* @param aMimeType icon mime type
*/
- void CUpnpIcon::ConstructL(const TDesC16& aPath, const TInt aWidth, const TInt aHeight, const TInt aDepth, const TDesC8& aMimeType);
+ void ConstructL(const TDesC16& aPath, const TInt aWidth, const TInt aHeight, const TInt aDepth, const TDesC8& aMimeType);
/**
@@ -278,4 +278,4 @@
#endif //C_CUPNPICON_H
-// End of File
\ No newline at end of file
+// End of File
--- a/upnp/upnpstack_plat/upnp_device_api/inc/upnpdevicedescriptionrequest.h Sun Mar 14 13:12:18 2010 +0000
+++ b/upnp/upnpstack_plat/upnp_device_api/inc/upnpdevicedescriptionrequest.h Sun Mar 28 16:38:08 2010 +0100
@@ -64,13 +64,13 @@
IMPORT_C TPtrC8 Uri();
- CUpnpDeviceDescriptionRequest::~CUpnpDeviceDescriptionRequest();
+ ~CUpnpDeviceDescriptionRequest();
private:
- CUpnpDeviceDescriptionRequest::CUpnpDeviceDescriptionRequest( const TInetAddr& aInetAddress );
+ CUpnpDeviceDescriptionRequest( const TInetAddr& aInetAddress );
- void CUpnpDeviceDescriptionRequest::ConstructL( const TDesC8& aUri );
+ void ConstructL( const TDesC8& aUri );
RBuf8 iUri;