--- a/harvester/composerplugins/imagecomposer/src/imagecomposerao.cpp	Mon Jan 18 20:34:07 2010 +0200
+++ b/harvester/composerplugins/imagecomposer/src/imagecomposerao.cpp	Tue Jan 26 12:13:20 2010 +0200
@@ -134,7 +134,7 @@
     const TInt itemsCount = aItems.Count();
     for ( TInt i = 0; i < itemsCount; ++i )
         {
-        TInt res = iNextItemsSkip.FindInOrder( aItems[i],
+        const TInt res = iNextItemsSkip.FindInOrder( aItems[i],
         		TLinearOrder<TItemId>( CImageComposerAO::CompareTItemIds ) );
         if ( res != KErrNotFound && res >= 0 )
             {
@@ -472,7 +472,6 @@
         
         if ( !iMdeObject->OpenForModifications() )
             {
-            // we have get version
             const TItemId objectId = iMdeObject->Id();
             delete iMdeObject;
             iMdeObject = NULL;
@@ -517,18 +516,17 @@
 
         CMdEPropertyDef& lastModDatePropDef = iImageObjectDef->GetPropertyDefL(
         		Object::KLastModifiedDateProperty );
-            {
-            CMdEProperty* lastModDateProp = NULL;
-            iMdeObject->Property( lastModDatePropDef, lastModDateProp, 0 );
+        
+        CMdEProperty* lastModDateProp = NULL;
+        iMdeObject->Property( lastModDatePropDef, lastModDateProp, 0 );
 
-            if ( lastModDateProp )
-                {
-                lastModDateProp->SetTimeValueL( fileEntry.iModified );
-                }
-            else
-                {
-                iMdeObject->AddTimePropertyL( lastModDatePropDef, fileEntry.iModified );
-                }
+        if ( lastModDateProp )
+            {
+            lastModDateProp->SetTimeValueL( fileEntry.iModified );
+            }
+        else
+            {
+            iMdeObject->AddTimePropertyL( lastModDatePropDef, fileEntry.iModified );
             }
         iSession->CommitObjectL( *iMdeObject );
         iNextItemsSkip.InsertInOrder( iMdeObject->Id(),