FCL/sf/mw/remoteconn: comparison mtpdataproviders/mtpimagedp/src/cmtpimagedpobjectpropertymgr.cpp

equal deleted inserted replaced

-:2c19c7cf5550
+:c20dd21d1eb4
 #include "cmtpimagedpthumbnailcreator.h"
 #include "mtpimagedppanic.h"
 #include "mtpimagedputilits.h"
 #include "mtpimagedpconst.h"
 #include "mtpdebug.h"
+#include "OstTraceDefinitions.h"
-// Class constants.
+#ifdef OST_TRACE_COMPILER_IN_USE
-__FLOG_STMT(_LIT8(KComponent,"MTPImageDpPropertyMgr");)
+#include "cmtpimagedpobjectpropertymgrTraces.h"
+#endif
 // Indicate how many cache can be stored
 const TUint KCacheThreshold = 16;
 /**
 iFramework(aFramework),
 iDataProvider(aDataProvider),
 iFs(aFramework.Fs()),
 iObjectMgr(aFramework.ObjectMgr())
 {
-__FLOG_OPEN(KMTPSubsystem, KComponent);
 }
 void CMTPImageDpObjectPropertyMgr::ConstructL(MMTPDataProviderFramework& /*aFramework*/)
 {
-__FLOG(_L8("CMTPImageDpObjectPropertyMgr::ConstructL - Entry"));
 iMetaDataSession = CMdESession::NewL(*this);
-__FLOG(_L8("CMTPImageDpObjectPropertyMgr::ConstructL - Exit"));
 }
 CMTPImageDpObjectPropertyMgr::~CMTPImageDpObjectPropertyMgr()
 {
-__FLOG(_L8("CMTPImageDpObjectPropertyMgr::~CMTPImageDpObjectPropertyMgr - Entry"));
+OstTraceFunctionEntry0( CMTPIMAGEDPOBJECTPROPERTYMGR_CMTPIMAGEDPOBJECTPROPERTYMGR_DES_ENTRY );
 delete iObject;
 delete iMetaDataSession;
 delete iThumbnailCache.iThumbnailData;
 //Clear propreties cache map
 ClearAllCache();
 iPropretiesCacheMap.Close();
-__FLOG(_L8("CMTPImageDpObjectPropertyMgr::~CMTPImageDpObjectPropertyMgr - Exit"));
+OstTraceFunctionExit0( CMTPIMAGEDPOBJECTPROPERTYMGR_CMTPIMAGEDPOBJECTPROPERTYMGR_DES_EXIT );
-__FLOG_CLOSE;
 }
 void CMTPImageDpObjectPropertyMgr::SetCurrentObjectL(CMTPObjectMetaData& aObjectInfo, TBool aRequireForModify, TBool aSaveToCache)
 {
-__FLOG(_L8(">> CMTPImageDpObjectPropertyMgr::SetCurrentObjectL"));
+OstTraceFunctionEntry0( CMTPIMAGEDPOBJECTPROPERTYMGR_SETCURRENTOBJECTL_ENTRY );
 iObjectInfo = &aObjectInfo;
 /**
 * Image DP property manager will not directly modify properties which stored in the MdS
 */
 if (aSaveToCache)
 {
 TUint objectHandle = iObjectInfo->Uint(CMTPObjectMetaData::EHandle);
 if (FindPropertiesCache(objectHandle))
 {
-__FLOG_VA((_L16("SetCurrentObjectL - find object in cache:%u"), objectHandle));
+OstTrace1( TRACE_NORMAL, CMTPIMAGEDPOBJECTPROPERTYMGR_SETCURRENTOBJECTL,
+"SetCurrentObjectL - find object in cache:%u", objectHandle );
 iCurrentPropertiesCache->ResetL();
 }
 else
 {
 if (iPropretiesCacheMap.Count() > KCacheThreshold)
 {
 // Find the first object handle from cache map and then destory it
 RHashMap<TUint, CMTPImagePropertiesCache*>::TIter iter(iPropretiesCacheMap);
 DestroyPropertiesCahce(*iter.NextKey());
-__FLOG_VA((_L16("SetCurrentObjectL - destory object:%u"), objectHandle));
+OstTrace1( TRACE_NORMAL, DUP1_CMTPIMAGEDPOBJECTPROPERTYMGR_SETCURRENTOBJECTL,
+"SetCurrentObjectL - destory object:%u", objectHandle );
 }
 iCurrentPropertiesCache = CMTPImagePropertiesCache::NewL();
 iPropretiesCacheMap.Insert(objectHandle, iCurrentPropertiesCache);
-__FLOG_VA((_L16("SetCurrentObjectL - create new object:%u"), objectHandle));
+OstTrace1( TRACE_NORMAL, DUP2_CMTPIMAGEDPOBJECTPROPERTYMGR_SETCURRENTOBJECTL,
-}
+"SetCurrentObjectL - create new object:%u", objectHandle );
 }
 }
+}
-__FLOG(_L8("<< CMTPImageDpObjectPropertyMgr::SetCurrentObjectL"));
+OstTraceFunctionExit0( CMTPIMAGEDPOBJECTPROPERTYMGR_SETCURRENTOBJECTL_EXIT );
 }
 void CMTPImageDpObjectPropertyMgr::SetPropertyL(TMTPObjectPropertyCode aProperty, const TUint8 aValue)
 {
-__FLOG(_L8(">> CMTPImageDpObjectPropertyMgr::SetPropertyL"));
+OstTraceFunctionEntry0( CMTPIMAGEDPOBJECTPROPERTYMGR_SETPROPERTYL_TUINT8_ENTRY );
 __ASSERT_DEBUG(iObjectInfo, Panic(EMTPImageDpObjectNull));
 if (aProperty == EMTPObjectPropCodeNonConsumable)
 {
 iObjectInfo->SetUint(CMTPObjectMetaData::ENonConsumable, aValue);
 }
 else
 {
+OstTrace1( TRACE_ERROR, CMTPIMAGEDPOBJECTPROPERTYMGR_SETPROPERTYL,
+"property code %d not equal to EMTPObjectPropCodeNonConsumable", aProperty );
 User::Leave(EMTPRespCodeObjectPropNotSupported);
 }
-__FLOG(_L8("<< CMTPImageDpObjectPropertyMgr::SetPropertyL"));
+OstTraceFunctionExit0( CMTPIMAGEDPOBJECTPROPERTYMGR_SETPROPERTYL_TUINT8_EXIT );
 }
 void CMTPImageDpObjectPropertyMgr::SetPropertyL(TMTPObjectPropertyCode aProperty, const TUint16 aValue)
 {
-__FLOG(_L8(">> CMTPImageDpObjectPropertyMgr::SetPropertyL"));
+OstTraceFunctionEntry0( CMTPIMAGEDPOBJECTPROPERTYMGR_SETPROPERTYL_TUINT16_ENTRY );
 __ASSERT_DEBUG(iObjectInfo, Panic(EMTPImageDpObjectNull));
 switch(aProperty)
 {
 case EMTPObjectPropCodeObjectFormat:
 iObjectInfo->SetUint(CMTPObjectMetaData::EFormatCode, aValue);
 break;
 case EMTPObjectPropCodeProtectionStatus://this property does not supported by image dp
 //nothing to do
 break;
+case EMTPObjectPropCodeHidden:
+{
+		__ASSERT_ALWAYS(( EMTPHidden == aValue )||( EMTPVisible == aValue ), User::Leave(KErrArgument));
+TEntry entry;
+		User::LeaveIfError(iFramework.Fs().Entry(iObjectInfo->DesC(CMTPObjectMetaData::ESuid), entry));
+if (( EMTPHidden == aValue ) && ( !entry.IsHidden()))
+{
+entry.iAtt &= ~KEntryAttHidden;
+entry.iAtt |= KEntryAttHidden;
+User::LeaveIfError(iFramework.Fs().SetAtt(iObjectInfo->DesC(CMTPObjectMetaData::ESuid), entry.iAtt, ~entry.iAtt));
+}
+else if (( EMTPVisible == aValue )&&( entry.IsHidden()))
+{
+entry.iAtt &= ~KEntryAttHidden;
+User::LeaveIfError(iFramework.Fs().SetAtt(iObjectInfo->DesC(CMTPObjectMetaData::ESuid), entry.iAtt, ~entry.iAtt));
+}
+}
+break;
 default:
 //nothing to do
 break;
 }
-__FLOG(_L8("<< CMTPImageDpObjectPropertyMgr::SetPropertyL"));
+OstTraceFunctionExit0( CMTPIMAGEDPOBJECTPROPERTYMGR_SETPROPERTYL_TUINT16_EXIT );
 }
 void CMTPImageDpObjectPropertyMgr::SetPropertyL(TMTPObjectPropertyCode aProperty, const TUint32 aValue)
 {
-__FLOG(_L8(">> CMTPImageDpObjectPropertyMgr::SetPropertyL"));
+OstTraceFunctionEntry0( CMTPIMAGEDPOBJECTPROPERTYMGR_SETPROPERTYL_TUINT32_ENTRY );
 __ASSERT_DEBUG(iObjectInfo, Panic(EMTPImageDpObjectNull));
 switch(aProperty)
 {
 case EMTPObjectPropCodeStorageID:
 break;
 default:
 //nothing to do
 break;
 }
-__FLOG(_L8("<< CMTPImageDpObjectPropertyMgr::SetPropertyL"));
+OstTraceFunctionExit0( CMTPIMAGEDPOBJECTPROPERTYMGR_SETPROPERTYL_TUINT32_EXIT );
 }
 void CMTPImageDpObjectPropertyMgr::SetPropertyL(TMTPObjectPropertyCode aProperty, const TDesC& aValue)
 {
-__FLOG(_L8(">> CMTPImageDpObjectPropertyMgr::SetPropertyL"));
+OstTraceFunctionEntry0( CMTPIMAGEDPOBJECTPROPERTYMGR_SETPROPERTYL_TDESC_ENTRY );
 __ASSERT_DEBUG(iObjectInfo, Panic(EMTPImageDpObjectNull));
 switch(aProperty)
 {
 case EMTPObjectPropCodeObjectFileName:
 newUri.Append(oldUri.DriveAndPath());
 newUri.Append(aValue);
 newUri.Trim();
 //ask fs to rename file, leave if err returned from fs
-User::LeaveIfError(iFs.Rename(oldUri.FullName(), newUri));
+LEAVEIFERROR(iFs.Rename(oldUri.FullName(), newUri),
+OstTraceExt3( TRACE_ERROR, CMTPIMAGEDPOBJECTPROPERTYMGR_TDESC_SETPROPERTYL,
+"Rename %S to %S failed! error code %d", oldUri.FullName(), newUri, munged_err ));
 iObjectInfo->SetDesCL(CMTPObjectMetaData::ESuid, newUri);
 CleanupStack::PopAndDestroy(&newUri);
 }
 break;
 default:
 //nothing to do
 break;
 }
-__FLOG(_L8("<< CMTPImageDpObjectPropertyMgr::SetPropertyL"));
+OstTraceFunctionExit0( CMTPIMAGEDPOBJECTPROPERTYMGR_SETPROPERTYL_TDESC_EXIT );
 }
 void CMTPImageDpObjectPropertyMgr::GetPropertyL(TMTPObjectPropertyCode aProperty, TUint8 &aValue)
 {
-__FLOG(_L8(">> CMTPImageDpObjectPropertyMgr::GetPropertyL"));
+OstTraceFunctionEntry0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYL_TUINT8_ENTRY );
 __ASSERT_DEBUG(iObjectInfo, Panic(EMTPImageDpObjectNull));
 if (aProperty == EMTPObjectPropCodeNonConsumable)
 {
 aValue = iObjectInfo->Uint(CMTPObjectMetaData::ENonConsumable);
 }
 else
 {
+OstTrace1( TRACE_ERROR, CMTPIMAGEDPOBJECTPROPERTYMGR_TUINT8_GETPROPERTYL,
+"property code %d not equal to EMTPObjectPropCodeNonConsumable", aProperty );
 User::Leave(EMTPRespCodeObjectPropNotSupported);
 }
-__FLOG(_L8("<< CMTPImageDpObjectPropertyMgr::GetPropertyL"));
+OstTraceFunctionExit0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYL_TUINT8_EXIT );
 }
 void CMTPImageDpObjectPropertyMgr::GetPropertyL(TMTPObjectPropertyCode aProperty, TUint16 &aValue)
 {
-__FLOG(_L8(">> CMTPImageDpObjectPropertyMgr::GetPropertyL"));
+OstTraceFunctionEntry0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYL_TUINT16_ENTRY );
 __ASSERT_DEBUG(iObjectInfo, Panic(EMTPImageDpObjectNull));
 TEntry entry;
 switch(aProperty)
 {
 case EMTPObjectPropCodeObjectFormat:
 else
 {
 aValue = EMTPProtectionNoProtection;
 }
 }
 break;
+case EMTPObjectPropCodeHidden:
+{
+TInt err = iFs.Entry(iObjectInfo->DesC(CMTPObjectMetaData::ESuid), entry);
+if ( err == KErrNone && entry.IsHidden())
+{
+aValue = EMTPHidden;
+}
+else
+{
+aValue = EMTPVisible;
+}
+}
+break;
 default:
 aValue = 0;//initialization
 //ingore the failure if we can't get properties form MdS
 TRAP_IGNORE(GetPropertyFromMdsL(aProperty, &aValue));
 break;
 }
-__FLOG(_L8("<< CMTPImageDpObjectPropertyMgr::GetPropertyL"));
+OstTraceFunctionExit0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYL_TUINT16_EXIT );
 }
 void CMTPImageDpObjectPropertyMgr::GetPropertyL(TMTPObjectPropertyCode aProperty, TUint32 &aValue, TBool alwaysCreate/* = ETrue*/)
 {
-__FLOG(_L8(">> CMTPImageDpObjectPropertyMgr::GetPropertyL"));
+OstTraceFunctionEntry0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYL_TUINT32_ENTRY );
 __ASSERT_DEBUG(iObjectInfo, Panic(EMTPImageDpObjectNull));
 switch(aProperty)
 {
 case EMTPObjectPropCodeStorageID:
 aValue = iObjectInfo->Uint(CMTPObjectMetaData::EParentHandle);
 break;
 case EMTPObjectPropCodeRepresentativeSampleSize:
 {
-__FLOG_VA((_L16("Query smaple size from MdS - URI:%S"), &iObjectInfo->DesC(CMTPObjectMetaData::ESuid)));
+OstTraceExt1( TRACE_NORMAL, CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYL_TUINT32,
+"Query smaple size from MdS - URI:%S", iObjectInfo->DesC(CMTPObjectMetaData::ESuid) );
 ClearThumnailCache();
 /**
 * try to query thumbnail from TNM, and then store thumbnail to cache
 */
 TEntry fileEntry;
 aValue = 0;//initialization
 //ingore the failure if we can't get properties form MdS
 TRAP_IGNORE(GetPropertyFromMdsL(aProperty, &aValue));
 break;
 }
-__FLOG(_L8("<< CMTPImageDpObjectPropertyMgr::GetPropertyL"));
+OstTraceFunctionExit0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYL_TUINT32_EXIT );
 }
 void CMTPImageDpObjectPropertyMgr::GetPropertyL(TMTPObjectPropertyCode aProperty, TUint64& aValue)
 {
-__FLOG(_L8(">> CMTPImageDpObjectPropertyMgr::GetPropertyL"));
+OstTraceFunctionEntry0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYL_TUINT64_ENTRY );
 __ASSERT_DEBUG(iObjectInfo, Panic(EMTPImageDpObjectNull));
 if (aProperty == EMTPObjectPropCodeObjectSize)
 {
 TEntry entry;
 iFs.Entry(iObjectInfo->DesC(CMTPObjectMetaData::ESuid), entry);
 aValue = entry.FileSize();
 }
 else
 {
+OstTrace1( TRACE_ERROR, CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYL_TUINT64,
+"property code %d not equal to EMTPObjectPropCodeObjectSize", aProperty );
 User::Leave(EMTPRespCodeObjectPropNotSupported);
 }
-__FLOG(_L8("<< CMTPImageDpObjectPropertyMgr::GetPropertyL"));
+OstTraceFunctionExit0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYL_TUINT64_EXIT );
 }
 void CMTPImageDpObjectPropertyMgr::GetPropertyL(TMTPObjectPropertyCode aProperty, TMTPTypeUint128& aValue)
 {
-__FLOG(_L8(">> CMTPImageDpObjectPropertyMgr::GetPropertyL"));
+OstTraceFunctionEntry0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYL_TMTPTYPEUINT128_ENTRY );
 __ASSERT_DEBUG(iObjectInfo, Panic(EMTPImageDpObjectNull));
 if (aProperty == EMTPObjectPropCodePersistentUniqueObjectIdentifier)
 {
 TUint32 handle = iObjectInfo->Uint(CMTPObjectMetaData::EHandle);
 aValue = iObjectMgr.PuidL(handle);
 }
 else
 {
+OstTrace1( TRACE_ERROR, CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYL_TMTPTYPEUINT128,
+"property code %d not equal to EMTPObjectPropCodeObjectSize", aProperty );
 User::Leave(EMTPRespCodeObjectPropNotSupported);
 }
-__FLOG(_L8("<< CMTPImageDpObjectPropertyMgr::GetPropertyL"));
+OstTraceFunctionExit0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYL_TMTPTYPEUINT128_EXIT );
 }
 void CMTPImageDpObjectPropertyMgr::GetPropertyL(TMTPObjectPropertyCode aProperty, CMTPTypeString& aValue)
 {
-__FLOG(_L8(">> CMTPImageDpObjectPropertyMgr::GetPropertyL"));
+OstTraceFunctionEntry0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYL_CMTPTYPESTRING_ENTRY );
 __ASSERT_DEBUG(iObjectInfo, Panic(EMTPImageDpObjectNull));
 switch(aProperty)
 {
 case EMTPObjectPropCodeObjectFileName:
 {
 TFileName name;
-User::LeaveIfError(BaflUtils::MostSignificantPartOfFullName(iObjectInfo->DesC(CMTPObjectMetaData::ESuid), name));
+LEAVEIFERROR(BaflUtils::MostSignificantPartOfFullName(iObjectInfo->DesC(CMTPObjectMetaData::ESuid), name),
+OstTraceExt2( TRACE_ERROR, DUP1_CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYL,
+"Can't get most significant part of %S! error code %d", iObjectInfo->DesC(CMTPObjectMetaData::ESuid), munged_err));
 aValue.SetL(name);
 }
 break;
 case EMTPObjectPropCodeName:
 default:
 //ingore the failure if we can't get properties form MdS
 TRAP_IGNORE(GetPropertyFromMdsL(aProperty, &aValue));
 break;
 }
-__FLOG(_L8("<< CMTPImageDpObjectPropertyMgr::GetPropertyL"));
+OstTraceFunctionExit0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYL_CMTPTYPESTRING_EXIT );
 }
 void CMTPImageDpObjectPropertyMgr::GetPropertyL(TMTPObjectPropertyCode aProperty, CMTPTypeArray& aValue, TBool alwaysCreate /*= ETrue*/)
 {
-__FLOG(_L8(">> CMTPImageDpObjectPropertyMgr::GetPropertyL -- SmapleData"));
+OstTraceFunctionEntry0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYL_CMTPTYPEARRAY_ENTRY );
 if (aProperty == EMTPObjectPropCodeRepresentativeSampleData)
 {
 HBufC8* tnBuf = Thumbnail(iObjectInfo->Uint(CMTPObjectMetaData::EHandle));
 if (tnBuf != NULL)
 }
 }
 }
 else
 {
+OstTrace1( TRACE_ERROR, CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYL_CMTPTYPEARRAY,
+"property code %d not equal to EMTPObjectPropCodeRepresentativeSampleData", aProperty );
 User::Leave(EMTPRespCodeObjectPropNotSupported);
 }
+OstTraceFunctionExit0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYL_CMTPTYPEARRAY_EXIT );
 }
 void CMTPImageDpObjectPropertyMgr::GetPropertyFromMdsL(TMTPObjectPropertyCode aProperty, TAny* aValue)
 {
-__FLOG(_L8(">> CMTPImageDpObjectPropertyMgr::GetPropertyFromMdsL"));
+OstTraceFunctionEntry0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYFROMMDSL_ENTRY );
 TInt err = KErrNone;
 if (iCacheHit)
 {
 // locale independent YYYYMMSSThhmmss, as required by the MTP spec
 _LIT(KTimeFormat, "%F%Y%M%DT%H%T%S");
 mdeProperty->TimeValueL().FormatL(timeValue, KTimeFormat);
 (*(static_cast<CMTPTypeString*>(aValue))).SetL(timeValue);
-__FLOG_VA((_L16("GetPropertyFromMdsL - from MdS: URI:%S, DateCreated:%S"), &iObjectInfo->DesC(CMTPObjectMetaData::ESuid), &timeValue));
+OstTraceExt2( TRACE_NORMAL, CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYFROMMDSL,
+"GetPropertyFromMdsL - from MdS: URI:%S, DateCreated:%S",
+iObjectInfo->DesC(CMTPObjectMetaData::ESuid), timeValue );
 }
 }
 }
 break;
 default:
 //nothing to do
 break;
 }
 }
-__FLOG(_L8("<< CMTPImageDpObjectPropertyMgr::GetPropertyFromMdsL"));
+OstTraceFunctionExit0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYFROMMDSL_EXIT );
 }
 TBool CMTPImageDpObjectPropertyMgr::GetYear(const TDesC& aDateString, TInt& aYear) const
 {
-__FLOG(_L8(">> CMTPImageDpObjectPropertyMgr::GetYear"));
+OstTraceFunctionEntry0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETYEAR_ENTRY );
 aYear = 0;
 TLex dateBuf(aDateString.Left(4));
-__FLOG(_L8("<< CMTPImageDpObjectPropertyMgr::GetYear"));
+	OstTraceFunctionExit0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETYEAR_EXIT );
 return dateBuf.Val(aYear) == KErrNone;
 }
 TBool CMTPImageDpObjectPropertyMgr::GetMonth(const TDesC& aDateString, TMonth& aMonth) const
 {
-__FLOG(_L8(">> CMTPImageDpObjectPropertyMgr::GetMonth"));
+OstTraceFunctionEntry0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETMONTH_ENTRY );
 TBool result = EFalse;
 aMonth = EJanuary;
 TInt month = 0;
 TLex dateBuf(aDateString.Mid(4, 2));
 if(dateBuf.Val(month) == KErrNone && month > 0 && month < 13)
 {
 month--;
 aMonth = (TMonth)month;
 result = ETrue;
 }
-__FLOG(_L8("<< CMTPImageDpObjectPropertyMgr::GetMonth"));
+OstTraceFunctionExit0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETMONTH_EXIT );
 return result;
 }
 TBool CMTPImageDpObjectPropertyMgr::GetDay(const TDesC& aDateString, TInt& aDay) const
 {
-__FLOG(_L8(">> CMTPImageDpObjectPropertyMgr::GetDay"));
+OstTraceFunctionEntry0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETDAY_ENTRY );
 TBool result = EFalse;
 aDay = 0;
 TLex dateBuf(aDateString.Mid(6, 2));
 if(dateBuf.Val(aDay) == KErrNone && aDay > 0 && aDay < 32)
 {
 aDay--;
 result = ETrue;
 }
-__FLOG(_L8("<< CMTPImageDpObjectPropertyMgr::GetDay"));
+OstTraceFunctionExit0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETDAY_EXIT );
 return result;
 }
 TBool CMTPImageDpObjectPropertyMgr::GetHour(const TDesC& aDateString, TInt& aHour) const
 {
-__FLOG(_L8(">> CMTPImageDpObjectPropertyMgr::GetHour"));
+OstTraceFunctionEntry0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETHOUR_ENTRY );
 aHour = 0;
 TLex dateBuf(aDateString.Mid(9, 2));
-__FLOG(_L8("<< CMTPImageDpObjectPropertyMgr::GetHour"));
+	OstTraceFunctionExit0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETHOUR_EXIT );
 return (dateBuf.Val(aHour) == KErrNone && aHour >=0 && aHour < 60);
 }
 TBool CMTPImageDpObjectPropertyMgr::GetMinute(const TDesC& aDateString, TInt& aMinute) const
 {
-__FLOG(_L8(">> CMTPImageDpObjectPropertyMgr::GetMinute"));
+OstTraceFunctionEntry0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETMINUTE_ENTRY );
 aMinute = 0;
 TLex dateBuf(aDateString.Mid(11, 2));
-__FLOG(_L8("<< CMTPImageDpObjectPropertyMgr::GetMinute"));
+	OstTraceFunctionExit0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETMINUTE_EXIT );
 return (dateBuf.Val(aMinute) == KErrNone && aMinute >=0 && aMinute < 60);
 }
 TBool CMTPImageDpObjectPropertyMgr::GetSecond(const TDesC& aDateString, TInt& aSecond) const
 {
-__FLOG(_L8(">> CMTPImageDpObjectPropertyMgr::GetSecond"));
+OstTraceFunctionEntry0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETSECOND_ENTRY );
 aSecond = 0;
 TLex dateBuf(aDateString.Mid(13, 2));
-__FLOG(_L8("<< CMTPImageDpObjectPropertyMgr::GetSecond"));
+	OstTraceFunctionExit0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETSECOND_EXIT );
 return (dateBuf.Val(aSecond) == KErrNone && aSecond >= 0 && aSecond < 60);
 }
 TBool CMTPImageDpObjectPropertyMgr::GetTenthSecond(const TDesC& aDateString, TInt& aTenthSecond) const
 {
-__FLOG(_L8(">> CMTPImageDpObjectPropertyMgr::GetTenthSecond"));
+OstTraceFunctionEntry0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETTENTHSECOND_ENTRY );
 TBool result = EFalse;
 aTenthSecond = 0;
 TInt dotPos = aDateString.Find(_L("."));
 if(dotPos != KErrNotFound && dotPos < aDateString.Length() - 1)
 {
 }
 else
 {
 result = ETrue;
 }
-__FLOG(_L8("<< CMTPImageDpObjectPropertyMgr::GetTenthSecond"));
+OstTraceFunctionExit0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETTENTHSECOND_EXIT );
 return result;
 }
 /*
 * Convert the MTP datatime string to TTime:
 ||!GetHour(aTimeString,hour)
 ||!GetMinute(aTimeString,minute)
 ||!GetSecond(aTimeString,second)
 ||!GetTenthSecond(aTimeString,tenthSecond))
 {
+OstTrace0( TRACE_ERROR, CMTPIMAGEDPOBJECTPROPERTYMGR_CONVERTMTPTIMESTR2TTIMEL, "Failed to extract date/time details!");
 User::Leave(KErrArgument);
 }
 else
 {
 TDateTime dateTime(year, month, day, hour, minute, second, tenthSecond);
 }
 }
 void CMTPImageDpObjectPropertyMgr::RemoveProperty(CMdEObject& aObject, CMdEPropertyDef& aPropDef)
 {
-__FLOG(_L8("CMTPImageDpObjectPropertyMgr::RemoveProperty"));
+OstTraceFunctionEntry0( CMTPIMAGEDPOBJECTPROPERTYMGR_REMOVEPROPERTY_ENTRY );
 TInt index;
 CMdEProperty* property;
 index = aObject.Property(aPropDef, property);
 if (index != KErrNotFound)
 {
 aObject.RemoveProperty(index);
 }
+OstTraceFunctionExit0( CMTPIMAGEDPOBJECTPROPERTYMGR_REMOVEPROPERTY_EXIT );
 }
 /**
 * Store thumbnail into cache
 */
 void CMTPImageDpObjectPropertyMgr::OpenMdeObjectL()
 {
 if (iObject == NULL)
 {
-__FLOG_VA((_L16("OpenMdeObjectL - URI = %S"), &iObjectInfo->DesC(CMTPObjectMetaData::ESuid)));
+		OstTraceExt1( TRACE_NORMAL, CMTPIMAGEDPOBJECTPROPERTYMGR_OPENMDEOBJECTL,
+		        "OpenMdeObjectL - URI = %S", iObjectInfo->DesC(CMTPObjectMetaData::ESuid) );
 CMdENamespaceDef& defaultNamespace = iMetaDataSession->GetDefaultNamespaceDefL();
 CMdEObjectDef& imageObjDef = defaultNamespace.GetObjectDefL( MdeConstants::Image::KImageObject );
 //if we can not open MdS object for getting properties, we will not get properites which stored in MdS

changeset 49	c20dd21d1eb4
parent 41	2c19c7cf5550