FCL/sf/mw/homescreensrv: comparison taskswitcher/server/src/tsstorage.cpp

equal deleted inserted replaced

-:efda7c0771b9
+:7b66bc3c6dc9
 if( !IsSupported(aFunction) )
 {
 User::Leave( KErrCorrupt );
 }
 CTsModelItemKeyMsg* msg = CTsModelItemKeyMsg::NewLC( aDataStream );
-OpenTaskMessage == aFunction ? LaunchL( msg->Key() ) : CloseL( msg->Key() );
+OpenTaskMessage == aFunction ? Launch( msg->Key() ) : Close( msg->Key() );
 CleanupStack::PopAndDestroy( msg );
 }
 // -----------------------------------------------------------------------------
 /**
 // -----------------------------------------------------------------------------
 /**
 * Interface implementation
 * @see MTsModel::DisplayNameL(TInt)
 */
-const TDesC& CTsStorage::DisplayNameL( TInt aOffset ) const
+const TDesC& CTsStorage::DisplayName( TInt aOffset ) const
 {
-return iData[aOffset].DisplayNameL();
+return iData[aOffset].DisplayName();
 }
 // -----------------------------------------------------------------------------
 /**
 * Interface implementation
 * @see MTsModel::IconHandleL(TInt)
 */
-TInt CTsStorage::IconHandleL( TInt aOffset ) const
+TInt CTsStorage::IconHandle( TInt aOffset ) const
 {
-return iData[aOffset].IconHandleL();
+return iData[aOffset].IconHandle();
 }
 // -----------------------------------------------------------------------------
 /**
 * Interface implementation
 * @see MTsModel::TimestampL(TInt)
 */
-TTime CTsStorage::TimestampL( TInt aOffset ) const
+TTime CTsStorage::Timestamp( TInt aOffset ) const
 {
-return iData[aOffset].TimestampL();
+return iData[aOffset].Timestamp();
 }
 // -----------------------------------------------------------------------------
 /**
 * Interface implementation
 * @see MTsModel::TimestampUpdateL(TInt)
 */
-TTime CTsStorage::TimestampUpdateL( TInt offset ) const
+TTime CTsStorage::TimestampUpdate( TInt offset ) const
 {
-return iData[offset].TimestampUpdateL();
+return iData[offset].TimestampUpdate();
 }
 // -----------------------------------------------------------------------------
 /**
 * Interface implementation
-* @see MTsModel::KeyL(TInt)
+* @see MTsModel::Key(TInt)
 */
-TTsModelItemKey CTsStorage::KeyL( TInt aoffset ) const
+TTsEntryKey CTsStorage::Key( TInt aoffset ) const
 {
-return iData[aoffset].KeyL();
+return iData[aoffset].Key();
 }
 // -----------------------------------------------------------------------------
 /**
 * Interface implementation
-* @see MTsModel::IsActiveL(TInt)
+* @see MTsModel::IsActive(TInt)
 */
-TBool CTsStorage::IsActiveL( TInt aOffset ) const
+TBool CTsStorage::IsActive( TInt aOffset ) const
 {
-return iData[aOffset].IsActiveL();
+return iData[aOffset].IsActive();
 }
 // -----------------------------------------------------------------------------
 /**
 * Interface implementation
 * @see MTsModel::IsClosableL(TInt)
 */
-TBool CTsStorage::IsClosableL( TInt aOffset ) const
+TBool CTsStorage::IsClosable( TInt aOffset ) const
 {
-return iData[aOffset].IsClosableL();
+return iData[aOffset].IsClosable();
 }
 // -----------------------------------------------------------------------------
 /**
 * Interface implementation
 * @see MTsModel::IsMandatoryL(TInt) const
 */
-TBool CTsStorage::IsMandatoryL( TInt aOffset ) const
+TBool CTsStorage::IsMandatory( TInt aOffset ) const
 {
-return iData[aOffset].IsMandatoryL();
+return iData[aOffset].IsMandatory();
 }
 // -----------------------------------------------------------------------------
 /**
 * Interface implementation
-* @see MTsModel::CloseL(TTsModelItemKey)
+* @see MTsModel::Close(TTsModelItemKey)
 */
-TBool CTsStorage::CloseL( TTsModelItemKey aKey ) const
+TBool CTsStorage::Close( TTsEntryKey aKey ) const
 {
-return FindL(aKey).CloseL();
+TBool retVal(EFalse);
-}
+TRAP_IGNORE(retVal = FindL(aKey).Close())
+return retVal;
-// -----------------------------------------------------------------------------
+}
-/**
-* Interface implementation
+// -----------------------------------------------------------------------------
-* @see MTsModel::launchL(TTsModelItemKey)
+/**
-*/
+* Interface implementation
-TBool CTsStorage::LaunchL(TTsModelItemKey aKey) const
+* @see MTsModel::Launch(TTsModelItemKey)
-{
+*/
-return FindL(aKey).LaunchL();
+TBool CTsStorage::Launch(TTsEntryKey aKey) const
-}
+{
+TBool retVal(EFalse);
-// -----------------------------------------------------------------------------
+TRAP_IGNORE(retVal = FindL(aKey).Launch())
-TTsModelItem CTsStorage::FindL( TTsModelItemKey aKey ) const
+return retVal;
+}
+// -----------------------------------------------------------------------------
+TTsModelItem CTsStorage::FindL( TTsEntryKey aKey ) const
 {
 for( TInt offset(0); offset < iData.Count(); ++offset )
 {
-if( iData[offset].KeyL() == aKey )
+if( iData[offset].Key() == aKey )
 {
 return iData[offset];
 }
 }
 User::Leave(KErrNotFound);
 for( TInt prev(0); prev < iData.Count(); ++prev )
 {
 for( TInt next(prev + 1); next < iData.Count(); ++next )
 {
 const TTsModelItem prevItem(iData[prev]), nextItem(iData[next]);
-if( ( !prevItem.IsMandatoryL() && nextItem.IsMandatoryL() ) ||
+if( ( !prevItem.IsMandatory() && nextItem.IsMandatory() ) ||
-( prevItem.TimestampL() < nextItem.TimestampL() && prevItem.IsMandatoryL() == nextItem.IsMandatoryL() ) )
+( prevItem.Timestamp() < nextItem.Timestamp() && prevItem.IsMandatory() == nextItem.IsMandatory() ) )
 {
 iData.Remove(prev);
 iData.InsertL(nextItem, prev);
 iData.Remove(next);
 // -----------------------------------------------------------------------------
 void CTsStorage::TrimDataL()
 {
 const TInt lastItemOffset(iData.Count() -1);
-if(KTsDataLimit <= lastItemOffset && !iData[lastItemOffset].IsMandatoryL())
+if(KTsDataLimit <= lastItemOffset && !iData[lastItemOffset].IsMandatory())
 {
 iData.Remove(lastItemOffset);
 TrimDataL();
 }
 }

changeset 127	7b66bc3c6dc9
parent 119	50e220be30d1