--- a/mtpdataproviders/mtpimagedp/src/mtpimagedputilits.cpp Mon May 03 13:19:02 2010 +0300
+++ b/mtpdataproviders/mtpimagedp/src/mtpimagedputilits.cpp Fri May 14 16:42:01 2010 +0300
@@ -64,24 +64,17 @@
return aFramework.StorageMgr().FrameworkStorageId(static_cast<TDriveNumber>(driveNumber));
}
-TUint32 MTPImageDpUtilits::FindParentHandleL(MMTPDataProviderFramework& aFramework, CMTPImageDataProvider& aDataProvider, const TDesC& aFullPath)
+TUint32 MTPImageDpUtilits::FindParentHandleL(MMTPDataProviderFramework& aFramework, CMTPImageDataProvider& /*aDataProvider*/, const TDesC& aFullPath)
{
TUint32 parentHandle = KMTPHandleNoParent;
TParsePtrC parse(aFullPath);
if(!parse.IsRoot())
- {
- if (!aDataProvider.GetCacheParentHandle(parse.DriveAndPath(), parentHandle))
- {
- parentHandle = aFramework.ObjectMgr().HandleL(parse.DriveAndPath());
- if (parentHandle != KMTPHandleNone)
- {
- aDataProvider.SetCacheParentHandle(parse.DriveAndPath(), parentHandle);
- }
- }
+ {
+ parentHandle = aFramework.ObjectMgr().HandleL(parse.DriveAndPath());
}
- return parentHandle;
+ return parentHandle;
}
TBool MTPImageDpUtilits::IsNewPicture(const CMTPObjectMetaData& aMetadata)
@@ -100,30 +93,3 @@
aMetadata.SetUint(CMTPObjectMetaData::EFormatSubCode, status);
aFramework.ObjectMgr().ModifyObjectL(aMetadata);
}
-
-TInt MTPImageDpUtilits::GetThumbnailSize(const CMTPObjectMetaData& aMetadata)
- {
- /**
- * query thumbnail size from EFormatSubCode column
- */
- return (aMetadata.Uint(CMTPObjectMetaData::EFormatSubCode) & IMAGE_OBJECT_THUMBNAIL_SIZE_BITMASK);
- }
-
-void MTPImageDpUtilits::UpdateObjectThumbnailSizeL(MMTPDataProviderFramework& aFramework, CMTPObjectMetaData& aMetadata, TInt aThumbnailSize)
- {
- //check thumbnail size whether it is overflow
- if (aThumbnailSize <= IMAGE_OBJECT_THUMBNAIL_SIZE_BITMASK)
- {
- TBool newPic = MTPImageDpUtilits::IsNewPicture(aMetadata);
- if (newPic)
- {
- aMetadata.SetUint(CMTPObjectMetaData::EFormatSubCode, aThumbnailSize);
- }
- else
- {
- aThumbnailSize |= IMAGE_OBJECT_STATUS_BITMASK;
- aMetadata.SetUint(CMTPObjectMetaData::EFormatSubCode, aThumbnailSize);
- }
- aFramework.ObjectMgr().ModifyObjectL(aMetadata);
- }
- }