diff -r 0a1ad22c7bdc -r 2c7192069824 realtimenetprots/sipfw/ProfileAgent/Server/Src/sipalrmigrationcontroller.h --- a/realtimenetprots/sipfw/ProfileAgent/Server/Src/sipalrmigrationcontroller.h Wed Sep 15 12:36:02 2010 +0300 +++ b/realtimenetprots/sipfw/ProfileAgent/Server/Src/sipalrmigrationcontroller.h Wed Oct 13 14:57:13 2010 +0300 @@ -58,7 +58,7 @@ public: static CSipAlrMigrationController* NewLC(CSipAlrMonitor& aAlrMonitor, - TSipSNAPConfigurationData aSnapData); + TUint32 aSnapId); ~CSipAlrMigrationController(); @@ -71,8 +71,6 @@ public: // New functions TUint32 SnapId() const; - - TUint32 BearerId() const; /** * Check if any profile is using this instance. @@ -118,13 +116,11 @@ TBool aIapWorks); void ResetFlags(); - - private: // Constructors CSipAlrMigrationController(CSipAlrMonitor& aAlrMonitor, - TSipSNAPConfigurationData aSnapData); + TUint32 aSnapId); private: // New functions @@ -147,6 +143,9 @@ RArray iObservers; + // SNAP id that is monitored. Does not change. + const TUint32 iSnapId; + // The IAP id, that was most recently offered to observers with // MSipAlrMigrationObserver::IapAvailableL. TUint32 iOfferedIapId; @@ -164,9 +163,6 @@ // Will be set to EFalse, when ALR monitor notifies about IAP, using // MSipAlrObserver::IapAvailable. TBool iRefreshIssued; - - // This contains the SNAP ID and the Bearer ID configured for the SNAP. - TSipSNAPConfigurationData iSnapData; private: // For testing purposes #ifdef CPPUNIT_TEST