equal
deleted
inserted
replaced
72 this->countryCode = aOther.countryCode; |
72 this->countryCode = aOther.countryCode; |
73 this->countryName = aOther.countryName; |
73 this->countryName = aOther.countryName; |
74 this->languageCode = aOther.languageCode; |
74 this->languageCode = aOther.languageCode; |
75 this->languageName = aOther.languageName; |
75 this->languageName = aOther.languageName; |
76 this->name = aOther.name; |
76 this->name = aOther.name; |
|
77 this->nickName = aOther.nickName; |
77 this->presetId = aOther.presetId; |
78 this->presetId = aOther.presetId; |
78 this->type = aOther.type; |
79 this->type = aOther.type; |
79 this->iChannelUrlCount = aOther.iChannelUrlCount; |
80 this->iChannelUrlCount = aOther.iChannelUrlCount; |
80 this->uniqID = aOther.uniqID; |
81 this->uniqID = aOther.uniqID; |
81 return *this; |
82 return *this; |
86 aStream>>uniqID>>presetId>>type>>iChannelUrlCount; |
87 aStream>>uniqID>>presetId>>type>>iChannelUrlCount; |
87 |
88 |
88 aStream>>languageCode>>languageName |
89 aStream>>languageCode>>languageName |
89 >>countryCode>>countryName |
90 >>countryCode>>countryName |
90 >>genreName>>genreId |
91 >>genreName>>genreId |
91 >>name>>lastModified |
92 >>name>>nickName>>lastModified |
92 >>advertisementUrl>>advertisementInUse |
93 >>advertisementUrl>>advertisementInUse |
93 >>imgUrl>>description>>shortDesc |
94 >>imgUrl>>description>>shortDesc |
94 >>musicStoreStatus; |
95 >>musicStoreStatus; |
95 |
96 |
96 urlArray.clear(); |
97 urlArray.clear(); |
107 aStream<<uniqID<<presetId<<type<<iChannelUrlCount; |
108 aStream<<uniqID<<presetId<<type<<iChannelUrlCount; |
108 |
109 |
109 aStream<<languageCode<<languageName |
110 aStream<<languageCode<<languageName |
110 <<countryCode<<countryName |
111 <<countryCode<<countryName |
111 <<genreName<<genreId |
112 <<genreName<<genreId |
112 <<name<<lastModified |
113 <<name<<nickName<<lastModified |
113 <<advertisementUrl<<advertisementInUse |
114 <<advertisementUrl<<advertisementInUse |
114 <<imgUrl<<description<<shortDesc |
115 <<imgUrl<<description<<shortDesc |
115 <<musicStoreStatus; |
116 <<musicStoreStatus; |
116 |
117 |
117 for (int i = 0; i < iChannelUrlCount; ++i) |
118 for (int i = 0; i < iChannelUrlCount; ++i) |