--- a/idlehomescreen/xmluirendering/uiengine/src/xnrootdata.cpp Wed Sep 15 12:00:00 2010 +0300
+++ b/idlehomescreen/xmluirendering/uiengine/src/xnrootdata.cpp Wed Oct 13 14:18:30 2010 +0300
@@ -45,7 +45,6 @@
// Constants
const TInt KScheduleInterval( 2000000 );
-_LIT8( KTemplateViewUID, "0x20026f50" );
// ============================ LOCAL FUNCTIONS ================================
@@ -95,9 +94,6 @@
//
CXnRootData::~CXnRootData()
{
- delete iTemplateViewUid;
- iTemplateViewUid = NULL;
-
if ( iLoadTimer )
{
iLoadTimer->Cancel();
@@ -254,7 +250,7 @@
//
// -----------------------------------------------------------------------------
//
-void CXnRootData::LoadRemainingViewsL()
+void CXnRootData::LoadRemainingViews()
{
if ( iFlags.IsClear( EIsDispose ) )
{
@@ -426,46 +422,6 @@
}
// -----------------------------------------------------------------------------
-// CXnRootData::ViewData()
-// -----------------------------------------------------------------------------
-//
-CXnViewData* CXnRootData::ViewData( CXnNode& aNode ) const
- {
- CXnNode* tmp( &aNode );
- CXnNode* viewNode( NULL );
- while( tmp )
- {
- if ( tmp->ViewNodeImpl() )
- {
- viewNode = tmp;
- break;
- }
- else
- {
- tmp = tmp->Parent();
- }
- }
- if( !viewNode )
- {
- return NULL;
- }
-
- CXnViewData* viewData( NULL );
- for ( TInt i = 0; i < iPluginsData.Count(); i++ )
- {
- CXnViewData* tmpViewdata( static_cast< CXnViewData* >( iPluginsData[i] ) );
- if( tmpViewdata->ViewNode() == viewNode )
- {
- viewData = tmpViewdata;
- break;
- }
- }
-
- return viewData;
- }
-
-
-// -----------------------------------------------------------------------------
// CXnRootData::DestroyViewData()
// Sets view data to be destroyed
// -----------------------------------------------------------------------------
@@ -478,9 +434,10 @@
{
iPluginsData.Remove( index );
- if ( iViewsToDestroy.Find( aViewData ) == KErrNotFound &&
- iViewsToDestroy.Append( aViewData ) == KErrNone )
+ if ( iViewsToDestroy.Find( aViewData ) == KErrNotFound )
{
+ iViewsToDestroy.Append( aViewData );
+
iDestroyTimer->Cancel();
iDestroyTimer->Start( TTimeIntervalMicroSeconds32( 0 ),
@@ -643,28 +600,6 @@
return iMaxPages;
}
-// ---------------------------------------------------------------------------
-// Returns TemplateViewUid
-// ---------------------------------------------------------------------------
-//
-const TDesC8& CXnRootData::TemplateViewUid() const
- {
- const TDesC8& templateViewUid = KTemplateViewUID;
- return iTemplateViewUid ? *iTemplateViewUid : templateViewUid; // qhd uid
- };
-
-// ---------------------------------------------------------------------------
-// Sets TemplateViewUid
-// ---------------------------------------------------------------------------
-//
-void CXnRootData::SetTemplateViewUidL( const TDesC8& aTemplateViewUid )
- {
- delete iTemplateViewUid;
- iTemplateViewUid = NULL;
-
- iTemplateViewUid = aTemplateViewUid.AllocL();
- };
-
// -----------------------------------------------------------------------------
// CXnRootData::RunDestroyL()
//