equal
deleted
inserted
replaced
106 apaMaskedBitmap->Mask(), pixmap); |
106 apaMaskedBitmap->Mask(), pixmap); |
107 |
107 |
108 pixmap = pixmap.scaled(size, Qt::KeepAspectRatioByExpanding); |
108 pixmap = pixmap.scaled(size, Qt::KeepAspectRatioByExpanding); |
109 icon = HbIcon(QIcon(pixmap)); |
109 icon = HbIcon(QIcon(pixmap)); |
110 } else { |
110 } else { |
111 HBufC* fileNameFromApparc; |
111 HBufC* fileNameFromApparc = NULL; |
112 TInt err2 = apaLsSession.GetAppIcon(uid,fileNameFromApparc); |
112 TInt err2 = apaLsSession.GetAppIcon(uid,fileNameFromApparc); |
113 CleanupStack::PushL(fileNameFromApparc); |
113 CleanupStack::PushL(fileNameFromApparc); |
114 if (err2 == KErrNone) { |
114 if (err2 == KErrNone) { |
115 QString fileName = XQConversions::s60DescToQString( |
115 QString fileName = XQConversions::s60DescToQString( |
116 fileNameFromApparc->Des()); |
116 fileNameFromApparc->Des()); |
123 icon = HbIcon(QIcon(pixmap)); |
123 icon = HbIcon(QIcon(pixmap)); |
124 } else { |
124 } else { |
125 icon = HbIcon(fileName); |
125 icon = HbIcon(fileName); |
126 } |
126 } |
127 } |
127 } |
128 CleanupStack::Pop(fileNameFromApparc); |
128 CleanupStack::PopAndDestroy(fileNameFromApparc); |
129 } |
129 } |
130 |
|
131 CleanupStack::PopAndDestroy(apaMaskedBitmap); |
130 CleanupStack::PopAndDestroy(apaMaskedBitmap); |
132 } |
131 } |
133 CleanupStack::PopAndDestroy(&apaLsSession); |
132 CleanupStack::PopAndDestroy(&apaLsSession); |
134 |
133 |
135 return icon; |
134 return icon; |