--- a/telephonyprotocols/pdplayer/inc/PDPProvision.h	Fri Apr 16 16:12:37 2010 +0300
+++ b/telephonyprotocols/pdplayer/inc/PDPProvision.h	Mon May 03 13:37:20 2010 +0300
@@ -1,5 +1,5 @@
 /**
-* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -30,6 +30,7 @@
 #include <etelqos.h>
 #include <comms-infras/metadata.h>
 #include <metadatabase.h>		// TMDBElementId
+#include "pdp.hrh"
 
 namespace ESock 
 	{
@@ -45,7 +46,7 @@
 public:
     enum 
     {
-    EUid = 0x102822E0,  //Same as PDPSCPR, who's gonna use it.
+    EUid = PDPScprImplUid,  //Same as PDPSCPR, who's gonna use it.
     ETypeId = 1,
     };
 	
@@ -65,7 +66,6 @@
 private:
     TInt InitialiseScratchContext(TUint32 aConfigRel) const;
     void RetrieveAuthenticationInfoL(RPacketContext::TProtocolConfigOptionV2& aProtocolConfigOption, ESock::CCommsDatIapView* aIapView);
-    void CreateChallengeAndResponseForChapL(RPacketContext::TProtocolConfigOptionV2& aProtocolConfigOption);
 
 public:
     //RPacketContext::TContextConfigGPRS iGprsConfig;
@@ -88,7 +88,7 @@
 public:
     enum 
     {
-    EUid = 0x102822E0,  //Same as PDPSCPR, who's gonna use it.
+    EUid = PDPScprImplUid,  //Same as PDPSCPR, who's gonna use it.
     ETypeId = 2,
     };
     
@@ -111,7 +111,7 @@
 public:
     enum 
     {
-    EUid = 0x102822E0,  //Same as PDPSCPR, who's gonna use it.
+    EUid = PDPScprImplUid,  //Same as PDPSCPR, who's gonna use it.
     ETypeId = 3,
     };
 	static CDefaultPacketQoSProvision* NewL(ESock::CCommsDatIapView* aIapView);
@@ -132,7 +132,7 @@
 public:
     enum 
     {
-    EUid = 0x102822E0,  //Same as PDPSCPR, who's gonna use it.
+    EUid = PDPScprImplUid,  //Same as PDPSCPR, who's gonna use it.
     ETypeId = 4,
     };
 	static CImsExtProvision* NewLC(ESock::CCommsDatIapView* aIapView);