equal
deleted
inserted
replaced
36 namespace Simple = S60MCprSimpleSelectActivity; |
36 namespace Simple = S60MCprSimpleSelectActivity; |
37 |
37 |
38 DECLARE_DEFINE_CUSTOM_NODEACTIVITY( ECFActivitySelect, |
38 DECLARE_DEFINE_CUSTOM_NODEACTIVITY( ECFActivitySelect, |
39 S60MCprSelect, |
39 S60MCprSelect, |
40 TCFSelector::TSelect, |
40 TCFSelector::TSelect, |
41 CSelectNextLayerActivity::NewL ) |
41 CS60SelectActivity::NewL ) |
42 |
42 |
43 // Reply from TAwaitingSelectNextLayer if no choices, otherwise accept |
43 // Reply from TAwaitingSelectNextLayer if no choices, otherwise accept |
44 FIRST_NODEACTIVITY_ENTRY( TAwaitingSelectNextLayer, |
44 FIRST_NODEACTIVITY_ENTRY( TAwaitingSelectNextLayer, |
45 Simple::TChooseBestIAPRequiredOrNoTagOrSetChosenApActive ) |
45 Simple::TChooseBestIAPRequiredOrNoTagOrSetChosenApActive ) |
46 |
46 |
115 namespace S60MCprSimpleSelectActivity |
115 namespace S60MCprSimpleSelectActivity |
116 { |
116 { |
117 DECLARE_DEFINE_CUSTOM_NODEACTIVITY( ECFActivitySelect, |
117 DECLARE_DEFINE_CUSTOM_NODEACTIVITY( ECFActivitySelect, |
118 MCprSimpleSelect, |
118 MCprSimpleSelect, |
119 TCFSelector::TSimpleSelect, |
119 TCFSelector::TSimpleSelect, |
120 CSelectNextLayerActivity::NewL ) |
120 S60MCprSelectActivity::CS60SelectActivity::NewL ) |
121 // Reply from TAwaitingSelectNextLayer if no choices, otherwise accept |
121 // Reply from TAwaitingSelectNextLayer if no choices, otherwise accept |
122 FIRST_NODEACTIVITY_ENTRY( S60MCprSimpleSelectActivity::TAwaitingSelectNextLayer, |
122 FIRST_NODEACTIVITY_ENTRY( S60MCprSimpleSelectActivity::TAwaitingSelectNextLayer, |
123 S60MCprSimpleSelectActivity::TChooseBestIAPRequiredOrNoTagOrSetChosenApActive ) |
123 S60MCprSimpleSelectActivity::TChooseBestIAPRequiredOrNoTagOrSetChosenApActive ) |
124 // Execute ChooseBestIAPL() to MPM to resolve the most preferred IAP. |
124 // Execute ChooseBestIAPL() to MPM to resolve the most preferred IAP. |
125 NODEACTIVITY_ENTRY( S60MCprStates::KChooseBestIAPRequired, |
125 NODEACTIVITY_ENTRY( S60MCprStates::KChooseBestIAPRequired, |