--- a/mpdata/src/mpmpxcollectiondata_p.cpp	Fri Jun 25 17:21:37 2010 -0500
+++ b/mpdata/src/mpmpxcollectiondata_p.cpp	Fri Jul 09 16:27:03 2010 -0500
@@ -622,7 +622,7 @@
     if ( !iContainerMedia->IsSupported( KMPXMediaGeneralId ) ) {
         User::Leave(KErrNotFound);
     }
-    return iContainerMedia->ValueTObjectL<TInt>( KMPXMediaGeneralId );
+    return iContainerMedia->ValueTObjectL<TMPXItemId>( KMPXMediaGeneralId );
 }
 
 /*!
@@ -634,7 +634,7 @@
     if ( !currentMedia->IsSupported( KMPXMediaGeneralId ) ) {
         User::Leave(KErrNotFound);
     }
-    return currentMedia->ValueTObjectL<TInt>( KMPXMediaGeneralId );
+    return currentMedia->ValueTObjectL<TMPXItemId>( KMPXMediaGeneralId );
 }
 
 /*!
@@ -649,7 +649,7 @@
     if ( !song->IsSupported( KMPXMediaGeneralId ) ) {
         User::Leave(KErrNotFound);
     }
-    return song->ValueTObjectL<TInt>( KMPXMediaGeneralId );
+    return song->ValueTObjectL<TMPXItemId>( KMPXMediaGeneralId );
 }
 
 /*!
@@ -671,7 +671,7 @@
     if ( !iCachedRemovedItem || !iCachedRemovedItem->IsSupported( KMPXMediaGeneralId ) ) {
         User::Leave(KErrNotFound);
     }
-    return ( itemId == iCachedRemovedItem->ValueTObjectL<TInt>( KMPXMediaGeneralId ) );
+    return ( itemId == TInt( iCachedRemovedItem->ValueTObjectL<TMPXItemId>( KMPXMediaGeneralId ) ) );
 }
 
 /*!