48 // --------------------------------------------------------------------------- |
48 // --------------------------------------------------------------------------- |
49 // |
49 // |
50 // --------------------------------------------------------------------------- |
50 // --------------------------------------------------------------------------- |
51 // |
51 // |
52 CCaSrvManager* CCaSrvManager::NewLC( CCaStorageProxy& aCaStorageProxy, |
52 CCaSrvManager* CCaSrvManager::NewLC( CCaStorageProxy& aCaStorageProxy, |
|
53 Usif::RSoftwareComponentRegistry* aSoftwareRegistry, |
53 CCaSrvEngUtils* aUtils ) |
54 CCaSrvEngUtils* aUtils ) |
54 { |
55 { |
55 CCaSrvManager* self = new ( ELeave ) CCaSrvManager(); |
56 CCaSrvManager* self = new ( ELeave ) CCaSrvManager(); |
56 CleanupStack::PushL( self ); |
57 CleanupStack::PushL( self ); |
57 self->ConstructL( aCaStorageProxy, aUtils ); |
58 self->ConstructL( aCaStorageProxy, aSoftwareRegistry, aUtils); |
58 return self; |
59 return self; |
59 } |
60 } |
60 |
61 |
61 // --------------------------------------------------------------------------- |
62 // --------------------------------------------------------------------------- |
62 // |
63 // |
63 // --------------------------------------------------------------------------- |
64 // --------------------------------------------------------------------------- |
64 // |
65 // |
65 EXPORT_C CCaSrvManager* CCaSrvManager::NewL( |
66 EXPORT_C CCaSrvManager* CCaSrvManager::NewL( CCaStorageProxy& aCaStorageProxy, |
66 CCaStorageProxy& aCaStorageProxy, CCaSrvEngUtils* aUtils ) |
67 Usif::RSoftwareComponentRegistry* aSoftwareRegistry, |
|
68 CCaSrvEngUtils* aUtils ) |
67 { |
69 { |
68 CCaSrvManager* self = CCaSrvManager::NewLC( aCaStorageProxy, aUtils ); |
70 CCaSrvManager* self = CCaSrvManager::NewLC( aCaStorageProxy, |
|
71 aSoftwareRegistry, aUtils ); |
69 CleanupStack::Pop(); // self; |
72 CleanupStack::Pop(); // self; |
70 return self; |
73 return self; |
71 } |
74 } |
72 |
75 |
73 // --------------------------------------------------------------------------- |
76 // --------------------------------------------------------------------------- |
74 // |
77 // |
75 // --------------------------------------------------------------------------- |
78 // --------------------------------------------------------------------------- |
76 // |
79 // |
77 void CCaSrvManager::ConstructL( CCaStorageProxy& aCaStorageProxy, |
80 void CCaSrvManager::ConstructL( CCaStorageProxy& aCaStorageProxy, |
|
81 Usif::RSoftwareComponentRegistry* aSoftwareRegistry, |
78 CCaSrvEngUtils* aUtils ) |
82 CCaSrvEngUtils* aUtils ) |
79 { |
83 { |
80 iPluginParams = new TPluginParams(); |
84 iPluginParams = new TPluginParams(); |
81 iPluginParams->storageProxy = &aCaStorageProxy; |
85 iPluginParams->storageProxy = &aCaStorageProxy; |
82 iPluginParams->engUtils = aUtils; |
86 iPluginParams->engUtils = aUtils; |
83 |
87 iPluginParams->softwareRegistry = aSoftwareRegistry; |
84 LoadPluginsL(); |
88 LoadPluginsL(); |
85 } |
89 } |
86 |
90 |
87 // --------------------------------------------------------------------------- |
91 // --------------------------------------------------------------------------- |
88 // |
92 // |