equal
deleted
inserted
replaced
15 * |
15 * |
16 * |
16 * |
17 */ |
17 */ |
18 |
18 |
19 #include "WidgetEntry.h" |
19 #include "WidgetEntry.h" |
20 #include "WidgetRegistryConstants.h" |
20 #include "widgetregistryconstants.h" |
21 #include <s32file.h> |
21 #include <s32file.h> |
22 #include <f32file.h> |
22 #include <f32file.h> |
23 #include <APGTASK.H> |
23 #include <APGTASK.H> |
24 //#include <widgetappdefs.rh> |
24 //#include <widgetappdefs.rh> |
25 |
25 |
172 if ( ( EWidgetPropTypeUnknown == (*this)[EWidgetPropertyListVersion].iType ) |
172 if ( ( EWidgetPropTypeUnknown == (*this)[EWidgetPropertyListVersion].iType ) |
173 || ( (KWidgetPropertyListVersion32 != (*this)[EWidgetPropertyListVersion] ) && (KWidgetPropertyListVersion71 != (*this)[EWidgetPropertyListVersion] )) ) |
173 || ( (KWidgetPropertyListVersion32 != (*this)[EWidgetPropertyListVersion] ) && (KWidgetPropertyListVersion71 != (*this)[EWidgetPropertyListVersion] )) ) |
174 { |
174 { |
175 User::Leave( KErrCorrupt ); |
175 User::Leave( KErrCorrupt ); |
176 } |
176 } |
177 |
177 // Read only until the ENokiaWidget for the 3.2 widgets |
|
178 TInt propertyIdCount = (*this)[EWidgetPropertyListVersion] == KWidgetPropertyListVersion32 ? ENokiaWidget+1 : EWidgetPropertyIdCount; |
178 // fill property values array |
179 // fill property values array |
179 for ( TInt i = 1; i < EWidgetPropertyIdCount; ++i ) |
180 for ( TInt i = 1; i < propertyIdCount; ++i ) |
180 { |
181 { |
181 (*this)[i].DeserializeL( aReadStream ); |
182 (*this)[i].DeserializeL( aReadStream ); |
182 } |
183 } |
183 } |
184 } |
184 |
185 |