--- a/btobexprofiles/obexreceiveservices/mtmuiinfrared/src/irmtmuidata.cpp Fri Jun 11 13:48:51 2010 +0300
+++ b/btobexprofiles/obexreceiveservices/mtmuiinfrared/src/irmtmuidata.cpp Wed Jun 23 18:23:52 2010 +0300
@@ -29,7 +29,6 @@
#include <mtmdef.hrh> //kuidmtmquerymaxbodysizevalue etc
#include <mtmuidsdef.hrh> //kuidmtmquerymaxbodysizevalue etc
#endif
-#include <Obexutils.rsg>
#include <obexutilsmessagehandler.h>
#include "debug.h"
@@ -84,7 +83,8 @@
const TMsvEntry& /*aContext*/) const
{
FLOG( _L( "[CIrMtmUiData] CIrMtmUiData: OperationSupportedL\t" ) );
- return TObexUtilsUiLayer::OperationNotSupported();
+ //todo: This was returning avkon resource Id of sting "This item is not available".
+ return 0;
}
// ---------------------------------------------------------
@@ -147,12 +147,13 @@
// ---------------------------------------------------------
//
const CBaseMtmUiData::CBitmapArray& CIrMtmUiData::ContextIcon(
- const TMsvEntry& aContext,
+ const TMsvEntry& /*aContext*/,
TInt /*aStateFlags*/) const
{
- TInt icon = TObexUtilsUiLayer::ContextIcon( aContext, EInfrared );
- return *iIconArrays->At( icon/2 );
+ TInt icon = 0;
+ //todo: This function will not work as iIconArrays is not populated might cause panic.
+ return *iIconArrays->At( icon );
}
// ---------------------------------------------------------
@@ -164,7 +165,7 @@
{
FLOG( _L( "[CIrMtmUiData] CIrMtmUiData: PopulateArraysL\t" ) );
- TObexUtilsUiLayer::CreateIconsL( KUidMsgTypeIrUID, iIconArrays );
+ //todo: Was populating iIconArrays which should be removed.
}
// ---------------------------------------------------------
@@ -172,12 +173,10 @@
// Gives resource filename.
// ---------------------------------------------------------
//
-void CIrMtmUiData::GetResourceFileName(TFileName& aFileName) const
+void CIrMtmUiData::GetResourceFileName(TFileName& /*aFileName*/) const
{
FLOG( _L( "[CIrMtmUiData] CIrMtmUiData: GetResourceFileName\t" ) );
- aFileName = KObexUtilsFileDrive;
- aFileName += KDC_RESOURCE_FILES_DIR;
- aFileName += KObexUtilsResourceFileName;
+ //todo: This was returning avkon resource file, which is not required now.
}
// ---------------------------------------------------------
@@ -198,7 +197,8 @@
return ( aParent.iMtm.iUid == KMsvLocalServiceIndexEntryIdValue );
}
// --- Can't create other types ---
- aReasonResourceId = TObexUtilsUiLayer::OperationNotSupported();
+ //todo: This was using avkon resource Id of sting "This item is not available".
+ aReasonResourceId = 0;
return EFalse;
}
@@ -220,7 +220,8 @@
return ETrue;
}
}
- aReasonResourceId = TObexUtilsUiLayer::OperationNotSupported();
+ //todo: This was using avkon resource Id of sting "This item is not available".
+ aReasonResourceId = 0;
return EFalse;
}
@@ -242,7 +243,8 @@
return ETrue;
}
}
- aReasonResourceId = TObexUtilsUiLayer::OperationNotSupported();
+ //todo: This was using avkon resource Id of sting "This item is not available".
+ aReasonResourceId = 0;
return EFalse;
}
@@ -264,7 +266,8 @@
return ETrue;
}
}
- aReasonResourceId = TObexUtilsUiLayer::OperationNotSupported();
+ //todo: This was using avkon resource Id of sting "This item is not available".
+ aReasonResourceId = 0;
return EFalse;
}
@@ -278,7 +281,8 @@
TInt& aReasonResourceId ) const
{
FLOG( _L( "[CIrMtmUiData] CIrMtmUiData: CanEditEntryL\t" ) );
- aReasonResourceId = TObexUtilsUiLayer::OperationNotSupported();
+ //todo: This was using avkon resource Id of sting "This item is not available".
+ aReasonResourceId = 0;
if( CheckEntry( aContext ) )
{
if ( ( aContext.iType.iUid == KUidMsvMessageEntryValue ) ||
@@ -301,7 +305,8 @@
TInt& aReasonResourceId ) const
{
FLOG( _L( "[CIrMtmUiData] CIrMtmUiData: CanDeleteServiceL\t" ) );
- aReasonResourceId = TObexUtilsUiLayer::OperationNotSupported();
+ //todo: This was using avkon resource Id of sting "This item is not available".
+ aReasonResourceId = 0;
return EFalse;
}
@@ -314,7 +319,8 @@
const TMsvEntry& /*aContext*/,
TInt& aReasonResourceId ) const
{
- aReasonResourceId = TObexUtilsUiLayer::OperationNotSupported();
+ //todo: This was using avkon resource Id of sting "This item is not available".
+ aReasonResourceId = 0;
return EFalse;
}
@@ -327,7 +333,8 @@
const TMsvEntry& /*aContext*/,
TInt& aReasonResourceId ) const
{
- aReasonResourceId = TObexUtilsUiLayer::OperationNotSupported();
+ //todo: This was using avkon resource Id of sting "This item is not available".
+ aReasonResourceId = 0;
return EFalse;
}
@@ -340,7 +347,8 @@
const TMsvEntry& /*aContext*/,
TInt& aReasonResourceId ) const
{
- aReasonResourceId = TObexUtilsUiLayer::OperationNotSupported();
+ //todo: This was using avkon resource Id of sting "This item is not available".
+ aReasonResourceId = 0;
return EFalse;
}
@@ -353,7 +361,8 @@
const TMsvEntry& /*aContext*/,
TInt& aReasonResourceId ) const
{
- aReasonResourceId = TObexUtilsUiLayer::OperationNotSupported();
+ //todo: This was using avkon resource Id of sting "This item is not available".
+ aReasonResourceId = 0;
return EFalse; // Not Ok to do
}
@@ -366,7 +375,8 @@
const TMsvEntry& /*aContext*/,
TInt& aReasonResourceId ) const
{
- aReasonResourceId = TObexUtilsUiLayer::OperationNotSupported();
+ //todo: This was using avkon resource Id of sting "This item is not available".
+ aReasonResourceId = 0;
return EFalse; // Not Ok to do
}
@@ -391,7 +401,8 @@
const TMsvEntry& /*aContext*/, TInt& aReasonResourceId ) const
{
// No way of sending a message from the outbox, so no need to cancel.
- aReasonResourceId = TObexUtilsUiLayer::OperationNotSupported();
+ //todo: This was using avkon resource Id of sting "This item is not available".
+ aReasonResourceId = 0;
return EFalse;
}
@@ -404,8 +415,9 @@
{
FLOG( _L( "[CIrMtmUiData] CIrMtmUiData: StatusTextL\t" ) );
TBuf<80> buffer;
- TInt resourceId = R_IR_SEND_PROGRESS_SENDING;
- TObexUtilsUiLayer::ReadResourceL( buffer, resourceId );
+ //todo: Need to use localised string.
+ _LIT(KText, "Sending");
+ buffer.Copy(KText);
HBufC* ptr;
ptr = buffer.AllocL();
return ptr;