equal
deleted
inserted
replaced
158 //EMTPObjectPropCodeNonConsumable |
158 //EMTPObjectPropCodeNonConsumable |
159 CMTPTypeObjectPropDesc* nonConsumable = ServiceNonConsumableL(); |
159 CMTPTypeObjectPropDesc* nonConsumable = ServiceNonConsumableL(); |
160 CleanupStack::PushL(nonConsumable); |
160 CleanupStack::PushL(nonConsumable); |
161 frmCap->AppendL(nonConsumable); |
161 frmCap->AppendL(nonConsumable); |
162 CleanupStack::Pop(nonConsumable); |
162 CleanupStack::Pop(nonConsumable); |
|
163 |
|
164 //Hidden |
|
165 CMTPTypeObjectPropDesc* hidden = ServiceHiddenL(); |
|
166 CleanupStack::PushL( hidden ); |
|
167 frmCap->AppendL( hidden ); |
|
168 CleanupStack::Pop( hidden ); |
163 |
169 |
164 iCapabilityList->AppendL(frmCap); |
170 iCapabilityList->AppendL(frmCap); |
165 CleanupStack::Pop(frmCap); |
171 CleanupStack::Pop(frmCap); |
166 CleanupStack::Pop(interDesc); |
172 CleanupStack::Pop(interDesc); |
167 } |
173 } |
225 //EMTPObjectPropCodeNonConsumable |
231 //EMTPObjectPropCodeNonConsumable |
226 CMTPTypeObjectPropDesc* nonConsumable = ServiceNonConsumableL(); |
232 CMTPTypeObjectPropDesc* nonConsumable = ServiceNonConsumableL(); |
227 CleanupStack::PushL(nonConsumable); |
233 CleanupStack::PushL(nonConsumable); |
228 frmCap->AppendL(nonConsumable); |
234 frmCap->AppendL(nonConsumable); |
229 CleanupStack::Pop(nonConsumable); |
235 CleanupStack::Pop(nonConsumable); |
|
236 //Hidden |
|
237 CMTPTypeObjectPropDesc* hidden = ServiceHiddenL(); |
|
238 CleanupStack::PushL( hidden ); |
|
239 frmCap->AppendL( hidden ); |
|
240 CleanupStack::Pop( hidden ); |
230 |
241 |
231 iCapabilityList->AppendL(frmCap); |
242 iCapabilityList->AppendL(frmCap); |
232 CleanupStack::Pop(frmCap); |
243 CleanupStack::Pop(frmCap); |
233 CleanupStack::Pop(interDesc); |
244 CleanupStack::Pop(interDesc); |
234 } |
245 } |
293 CleanupStack::PopAndDestroy(expectedForm); |
304 CleanupStack::PopAndDestroy(expectedForm); |
294 |
305 |
295 return ret; |
306 return ret; |
296 } |
307 } |
297 |
308 |
|
309 CMTPTypeObjectPropDesc* CMTPGetFormatCapabilities::ServiceHiddenL() |
|
310 { |
|
311 CMTPTypeObjectPropDescEnumerationForm* expectedForm = CMTPTypeObjectPropDescEnumerationForm::NewL(EMTPTypeUINT16); |
|
312 CleanupStack::PushL(expectedForm); |
|
313 TUint16 values[] = {EMTPVisible, EMTPHidden}; |
|
314 TUint numValues((sizeof(values) / sizeof(values[0]))); |
|
315 for (TUint i = 0; i < numValues; i++) |
|
316 { |
|
317 TMTPTypeUint16 data(values[i]); |
|
318 expectedForm->AppendSupportedValueL(data); |
|
319 } |
|
320 CMTPTypeObjectPropDesc* ret = CMTPTypeObjectPropDesc::NewL(EMTPObjectPropCodeHidden, *expectedForm); |
|
321 CleanupStack::PopAndDestroy(expectedForm); |
|
322 |
|
323 return ret; |
|
324 } |
|
325 |
298 TMTPResponseCode CMTPGetFormatCapabilities::CheckRequestL() |
326 TMTPResponseCode CMTPGetFormatCapabilities::CheckRequestL() |
299 { |
327 { |
300 TMTPResponseCode response = CMTPRequestProcessor::CheckRequestL(); |
328 TMTPResponseCode response = CMTPRequestProcessor::CheckRequestL(); |
301 if( EMTPRespCodeOK != response ) |
329 if( EMTPRespCodeOK != response ) |
302 return response; |
330 return response; |