FCL/sf/mw/homescreensrv: comparison contentstorage/caclient/s60/src/caobjectadapter.cpp

equal deleted inserted replaced

-:e492551a0d54
+:9d806967057c
 #include "cainnerquery.h"
 #include "caquery.h"
 #include "camenuiconutility.h"
 #include "canotifierfilter.h"
 #include "cainnernotifierfilter.h"
 static  QImage::Format TDisplayMode2Format(TDisplayMode mode)
 {
 QImage::Format format;
-switch(mode) {
+switch (mode) {
 case EGray2:
 format = QImage::Format_MonoLSB;
 break;
 case EColor256:
 case EGray256:
 break;
 }
 return format;
 }
-QPixmap fromSymbianCFbsBitmap(CFbsBitmap* aBitmap)
+QPixmap fromSymbianCFbsBitmap(CFbsBitmap *aBitmap)
 {
 aBitmap->BeginDataAccess();
-uchar *data = (uchar*)aBitmap->DataAddress();
+uchar *data = (uchar *)aBitmap->DataAddress();
 TSize size = aBitmap->SizeInPixels();
 TDisplayMode displayMode = aBitmap->DisplayMode();
 // QImage format must match to bitmap format
 QImage image(data, size.iWidth, size.iHeight, TDisplayMode2Format(displayMode));
 aBitmap->EndDataAccess();
 // No data copying happens because image format matches native OpenVG format.
 // So QPixmap actually points to CFbsBitmap data.
 return QPixmap::fromImage(image);
 }
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
 void CaObjectAdapter::convertL(const CaEntry &fromEntry,
 CCaInnerEntry &toEntry)
 {
 toEntry.SetId(fromEntry.id());
 toEntry.SetTextL(convertToDescriptor(fromEntry.text()));
 toEntry.SetDescriptionL(convertToDescriptor(fromEntry.description()));
 toEntry.SetEntryTypeNameL(
 convertToDescriptor(fromEntry.entryTypeName()));
-toEntry.SetFlags(static_cast<TUint> (fromEntry.flags()));
+toEntry.SetFlags(static_cast<TUint>(fromEntry.flags()));
-toEntry.SetRole(static_cast<TUint> (fromEntry.role()));
+toEntry.SetRole(static_cast<TUint>(fromEntry.role()));
 const CaIconDescription fromIconDescription =
 fromEntry.iconDescription();
 toEntry.SetIconDataL(
 static_cast<TInt>(fromIconDescription.skinMinorId()),
 convertToDescriptor(fromIconDescription.filename()));
 const QMap<QString, QString> attributesMap = fromEntry.attributes();
-foreach (QString key, attributesMap.keys()) {
+foreach(QString key, attributesMap.keys()) {
 if (key == applicationUidAttributeName()) {
 const TInt32 uid = attributesMap.value(key).toInt();
 toEntry.SetUid(uid);
-}
+} else {
-else {
 toEntry.AddAttributeL(
 convertToDescriptor(key),
 convertToDescriptor(attributesMap.value(key)));
 }
 }
 //----------------------------------------------------------------------------
 //
 //----------------------------------------------------------------------------
 void CaObjectAdapter::convertL(const CaQuery &fromQuery,
 CCaInnerQuery &toQuery)
 {
 toQuery.SetParentId(fromQuery.parentId());
 toQuery.SetFlagsOn(static_cast<TUint>(fromQuery.flagsOn()));
 toQuery.SetCount(fromQuery.count());
 const QStringList list = fromQuery.entryTypeNames();
 CDesC16ArrayFlat *sourceList =
-new (ELeave)CDesC16ArrayFlat(KDefaultGranularity);
+new(ELeave)CDesC16ArrayFlat(KDefaultGranularity);
 CleanupStack::PushL(sourceList);
-foreach (const QString str, list) {
+foreach(const QString str, list) {
 sourceList->AppendL(convertToDescriptor(str));
 }
 toQuery.SetEntryTypeNames(sourceList);
 //----------------------------------------------------------------------------
 //
 //----------------------------------------------------------------------------
 void CaObjectAdapter::convert(const CCaInnerEntry &fromEntry,
 CaEntry &toEntry)
 {
 toEntry.setId(fromEntry.GetId());
 toEntry.setText(convertToString(fromEntry.GetText()));
 toEntry.setIconDescription(iconDescription);
 const RCaEntryAttrArray &attributesArray = fromEntry.GetAttributes();
 if (toEntry.entryTypeName() == applicationEntryName()
 || toEntry.entryTypeName() == widgetEntryName()) {
 toEntry.setAttribute(applicationUidAttributeName(),
 QString::number(fromEntry.GetUid()));
 }
 const int attributesArrayCount = attributesArray.Count();
 for (int i = 0; i < attributesArrayCount; ++i) {
 const CCaEntryAttribute *const attribute = attributesArray[i];
 toEntry.setAttribute(convertToString(attribute->Name()),
 convertToString(attribute->Value()));
 }
 }
 //----------------------------------------------------------------------------
 // !!! Warning: returns wrapper to internal QString representation which may
 // get invalid before returned TPtrC object gets out of scope
 //----------------------------------------------------------------------------
 const TPtrC CaObjectAdapter::convertToDescriptor(const QString &string)
 {
-const TPtrC result(reinterpret_cast<const TUint16*> (string.utf16()));
+const TPtrC result(reinterpret_cast<const TUint16 *>(string.utf16()));
 return result;
 }
 //----------------------------------------------------------------------------
 //
 //----------------------------------------------------------------------------
 //
 //----------------------------------------------------------------------------
 void CaObjectAdapter::convertL(const CaNotifierFilter &notifierFilter,
 CCaInnerNotifierFilter &source)
 {
 source.SetParentId(static_cast<TInt>(notifierFilter.getParentId()));
 RArray<TInt> idsList;
 CleanupClosePushL(idsList);
 break;
 default:
 source.SetEntryRole(ENoneEntryRole);
 break;
 }
-CDesC16ArrayFlat *typeNames = new (ELeave) CDesC16ArrayFlat(
+CDesC16ArrayFlat *typeNames = new(ELeave) CDesC16ArrayFlat(
 KDefaultGranularity);
 CleanupStack::PushL(typeNames);
 const QStringList stringList = notifierFilter.getTypeNames();
 //----------------------------------------------------------------------------
 //
 //----------------------------------------------------------------------------
 void CaObjectAdapter::convertL(
 const RPointerArray<CCaInnerEntry> &fromEntriesArray,
-QList<CaEntry*> &toEntryList)
+QList<CaEntry *> &toEntryList)
 {
 for (int i = 0; i < fromEntriesArray.Count(); ++i) {
 CaEntry *const toEntry = new CaEntry(
 static_cast<EntryRole>(fromEntriesArray[i]->GetRole()));
 //----------------------------------------------------------------------------
 //
 //----------------------------------------------------------------------------
 void CaObjectAdapter::convertL(const QList<int> &entryIdList,
 RArray<TInt> &source)
 {
-foreach(int id, entryIdList)
+foreach(int id, entryIdList) {
-{
+source.AppendL(static_cast<TInt>(id));
-source.AppendL(static_cast<TInt>(id));
+}
-}
 }
 //----------------------------------------------------------------------------
 //
 //----------------------------------------------------------------------------
 void CaObjectAdapter::convertL(const RArray<TInt> &innerEntryIdList,
 QList<int> &idList)
 {
 for (TInt i = 0; i < innerEntryIdList.Count(); ++i) {
 idList.append(innerEntryIdList[i]);
 }
 }
 //----------------------------------------------------------------------------
 //
 //----------------------------------------------------------------------------
 HbIcon CaObjectAdapter::makeIcon(const CaEntry &entry, const QSize &size)
 {
 HbIcon icon;
 TRAPD(leaveCode, icon = makeIconL(entry, size));
 USE_QDEBUG_IF(leaveCode) << "CaObjectAdapter::makeIcon leaveCode:"
 << leaveCode;
 return icon;
 }
 //----------------------------------------------------------------------------
 // -----------------------------------------------------------------------------
 // copying compressed bitmap
 //----------------------------------------------------------------------------
 CFbsBitmap *CaObjectAdapter::copyBitmapLC(CFbsBitmap *input)
 {
-CFbsBitmap *bmp = new (ELeave) CFbsBitmap();
+CFbsBitmap *bmp = new(ELeave) CFbsBitmap();
 CleanupStack::PushL(bmp);
 bmp->Create(input->SizeInPixels(), input->DisplayMode());
 CFbsBitmapDevice *bitmapDevice = CFbsBitmapDevice::NewL(bmp);
 CleanupStack::PushL(bitmapDevice);
 CleanupStack::PushL(aknIcon);
 //need to disable compression to properly convert the bitmap
 AknIconUtils::DisableCompression(aknIcon->Bitmap());
 AknIconUtils::SetSize(aknIcon->Bitmap(), TSize(size.width(),
 size.height()), EAspectRatioPreservedAndUnusedSpaceRemoved);
 if (aknIcon->Bitmap()->Header().iCompression
 == ENoBitmapCompression) {
 pixmap = fromSymbianCFbsBitmap(aknIcon->Bitmap());
 QPixmap mask = fromSymbianCFbsBitmap(
 aknIcon->Mask());
 pixmap.setAlphaChannel(mask);
-}
+} else { // we need special handling for icons in 9.2 (NGA)
-else // we need special handling for icons in 9.2 (NGA)
+// let's hope that in future it will be in QT code
-{ // let's hope that in future it will be in QT code
 CFbsBitmap *temp(NULL);
 temp = copyBitmapLC(aknIcon->Bitmap());
 pixmap = fromSymbianCFbsBitmap(temp);
 CleanupStack::PopAndDestroy();
 temp = copyBitmapLC(aknIcon->Mask());
 //----------------------------------------------------------------------------
 void CaObjectAdapter::convert(
 CaNotifierPrivate::NotifierType src,
 CCaInnerNotifierFilter::TNotifierType &dest)
 {
-switch(src){
+switch (src) {
 case CaNotifierPrivate::EntryChangedWithIdNotifierType:
 dest = CCaInnerNotifierFilter::EEntryChangedWithId;
 break;
 case CaNotifierPrivate::EntryChangedWithEntryNotifierType:
 dest = CCaInnerNotifierFilter::EEntryChangedWithEntry;
 //
 //----------------------------------------------------------------------------
 void CaObjectAdapter::convert(
 TChangeType src, ChangeType &dest)
 {
-switch(src){
+switch (src) {
 case EAddChangeType:
 dest = AddChangeType;
 break;
 case ERemoveChangeType:
 dest = RemoveChangeType;
 SortAttribute sortAttribute, Qt::SortOrder sortOrder)
 {
 CCaInnerQuery::TSortAttribute sortCode(CCaInnerQuery::Default);
 switch (sortAttribute) {
-case NameSortAttribute:
+case NameSortAttribute: {
-{
 sortCode = (sortOrder == Qt::AscendingOrder) ? CCaInnerQuery::Name
 : CCaInnerQuery::NameDesc;
 break;
 }
-case CreatedTimestampSortAttribute:
+case CreatedTimestampSortAttribute: {
-{
 sortCode = (sortOrder == Qt::AscendingOrder)
 ? CCaInnerQuery::CreatedTimestamp
 : CCaInnerQuery::CreatedTimestampDesc;
 break;
 }
-case MostUsedSortAttribute:
+case MostUsedSortAttribute: {
-{
 sortCode = (sortOrder == Qt::AscendingOrder)
 ? CCaInnerQuery::MostUsed : CCaInnerQuery::MostUsedDesc;
 break;
 }
-case LastUsedSortAttribute:
+case LastUsedSortAttribute: {
-{
 sortCode = (sortOrder == Qt::AscendingOrder)
 ? CCaInnerQuery::LastUsed : CCaInnerQuery::LastUsedDesc;
 break;
 }
-case DefaultSortAttribute:
+case DefaultSortAttribute: {
-{
 sortCode = (sortOrder == Qt::AscendingOrder)
 ? CCaInnerQuery::Default : CCaInnerQuery::DefaultDesc;
 break;
 }
 }
 return sortCode;
 //----------------------------------------------------------------------------
 //
 //----------------------------------------------------------------------------
 void CaObjectAdapter::setId(CaEntry &entry,
 int id)
 {
 entry.setId(id);
 }

changeset 87	9d806967057c
parent 86	e492551a0d54
child 88	7f0462e8c3da