FCL/sf/app/photos: comparison ui/uiengine/medialists/src/glxlistwindow.cpp

equal deleted inserted replaced

-:f291796e213d
+:fb37077c270f
 {
 iObjects.ReserveL( aMaxCount );
 }
 /** Preparet the window to accept items */
-void Initialize( const CGlxListWindow::TRange& aRange, TInt aTotalSize )
+void InitializeL( const CGlxListWindow::TRange& aRange, TInt aTotalSize )
 {
 __TEST_INVARIANT;
 iTotalSize = aTotalSize;
 // use GlxListUtils::NormalizedIndex instead of Normalize to avoid
 // add sufficient number of new null pointers
 for ( TInt i = iObjects.Count(); i < aRange.iLength; i++ )
 {
 // Append cannot fail since reservation has been made
-( void ) iObjects.Append( NULL );
+( void ) iObjects.AppendL( NULL );
 }
 // remove unnecessary pointers
 for ( TInt i = iObjects.Count() - 1; i >= aRange.iLength; i-- )
 {
 // -----------------------------------------------------------------------------
 // Cleans up remaining objects in the window
 // -----------------------------------------------------------------------------
 //
-EXPORT_C void CGlxListWindow::Cleanup()
+EXPORT_C void CGlxListWindow::CleanupL()
 	{
-	TRACER("CGlxListWindow::Cleanup");
+	TRACER("CGlxListWindow::CleanupL");
 // make the window empty. this will clean up all remaining objects.
-Update( TChange( KErrNotFound, 0, EChangeObjectsRemoved, 0, iWindow->TotalSize() - 1 ) );
+UpdateL( TChange( KErrNotFound, 0, EChangeObjectsRemoved, 0, iWindow->TotalSize() - 1 ) );
 	}
 // -----------------------------------------------------------------------------
 // SetRangeOffsetsL
 // -----------------------------------------------------------------------------
 // create enough new objects into the unused objects pool
 // objects are either in the main window or in the pool
 for ( TInt i = iWindow->Size() + iUnusedObjects.Count(); i < maxObjectCount; i++ )
 {
 // cannot fail since reservation made above
-( void ) iUnusedObjects.Append( iObjectFactory.CreateObjectL() );
+( void )iUnusedObjects.AppendL( iObjectFactory.CreateObjectL() );
 }
-	Update( TChange( aFocusIndex, aTotalSize, EChangeNone, 0, 0 ) );
+	UpdateL( TChange( aFocusIndex, aTotalSize, EChangeNone, 0, 0 ) );
 	}
 // -----------------------------------------------------------------------------
 // Iterator
 // -----------------------------------------------------------------------------
 // -----------------------------------------------------------------------------
 // SetFocusIndexL
 // -----------------------------------------------------------------------------
 // DEPRICATED
-EXPORT_C void CGlxListWindow::SetFocusIndex( TInt aFocusIndex )
+EXPORT_C void CGlxListWindow::SetFocusIndexL( TInt aFocusIndex )
 	{
-	TRACER("CGlxListWindow::SetFocusIndex");
+	TRACER("CGlxListWindow::SetFocusIndexL");
-	SetFocusIndex( aFocusIndex, iWindow->TotalSize() );
+	SetFocusIndexL( aFocusIndex, iWindow->TotalSize() );
 	}
 // -----------------------------------------------------------------------------
 // SetFocusIndexL
 // -----------------------------------------------------------------------------
 //
-EXPORT_C void CGlxListWindow::SetFocusIndex( TInt aFocusIndex, TInt aTotalSize )
+EXPORT_C void CGlxListWindow::SetFocusIndexL( TInt aFocusIndex, TInt aTotalSize )
 	{
-	TRACER("CGlxListWindow::SetFocusIndex");
+	TRACER("CGlxListWindow::SetFocusIndexL");
 	__ASSERT_DEBUG( ( 0 <= aFocusIndex && aFocusIndex < aTotalSize ) ||
 ( KErrNotFound == aFocusIndex && 0 == aTotalSize ),
 Panic( EGlxPanicIllegalArgument ) );
 __TEST_INVARIANT;
-	Update( TChange( aFocusIndex, aTotalSize, EChangeNone, 0, 0 ) );
+	UpdateL( TChange( aFocusIndex, aTotalSize, EChangeNone, 0, 0 ) );
 __TEST_INVARIANT;
 	}
 // -----------------------------------------------------------------------------
 // AddObjects
 // -----------------------------------------------------------------------------
 // DEPRICATED
-EXPORT_C void CGlxListWindow::AddObjects( TInt aFirstNewIndex, TInt aLastNewIndex )
+EXPORT_C void CGlxListWindow::AddObjectsL( TInt aFirstNewIndex, TInt aLastNewIndex )
 	{
-	TRACER("CGlxListWindow::AddObjects");
+	TRACER("CGlxListWindow::AddObjectsL");
 	TInt newItemCount = aLastNewIndex - aFirstNewIndex + 1;
 	TInt newTotalSize = iWindow->TotalSize() + newItemCount;
 	// Check if it is necessary to move focus
 		// Move focus, so that the focus stays on the same item that was
 		// focused before items were added
 		newFocusIndex += newItemCount;
 		}
-AddObjects( newFocusIndex, newTotalSize, aFirstNewIndex, aLastNewIndex );
+AddObjectsL( newFocusIndex, newTotalSize, aFirstNewIndex, aLastNewIndex );
 	}
 // -----------------------------------------------------------------------------
 // AddObjects
 // -----------------------------------------------------------------------------
 //
-EXPORT_C void CGlxListWindow::AddObjects( TInt aFocusIndex,
+EXPORT_C void CGlxListWindow::AddObjectsL( TInt aFocusIndex,
 TInt aTotalSize, TInt aFirstNewIndex, TInt aLastNewIndex )
 	{
-	TRACER("CGlxListWindow::AddObjects");
+	TRACER("CGlxListWindow::AddObjectsL");
 __ASSERT_DEBUG( 0 <= aFirstNewIndex && aFirstNewIndex <= aLastNewIndex &&
 aLastNewIndex < aTotalSize &&
 0 <= aFocusIndex && aFocusIndex < aTotalSize,
 Panic( EGlxPanicIllegalArgument ) );
 __TEST_INVARIANT;
-	Update( TChange( aFocusIndex, aTotalSize, EChangeObjectsAdded,
+	UpdateL( TChange( aFocusIndex, aTotalSize, EChangeObjectsAdded,
 aFirstNewIndex, aLastNewIndex ) );
 __TEST_INVARIANT;
 	}
 // -----------------------------------------------------------------------------
 // RemoveObjects
 // -----------------------------------------------------------------------------
 // DEPRICATED
-EXPORT_C void CGlxListWindow::RemoveObjects( TInt aFirstRemovedIndex, TInt aLastRemovedIndex )
+EXPORT_C void CGlxListWindow::RemoveObjectsL( TInt aFirstRemovedIndex, TInt aLastRemovedIndex )
 	{
-	TRACER("CGlxListWindow::RemoveObjects");
+	TRACER("CGlxListWindow::RemoveObjectsL");
 	TInt itemsRemovedCount = aLastRemovedIndex - aFirstRemovedIndex + 1;
 	TInt newTotalSize = iWindow->TotalSize() - itemsRemovedCount;
 	TInt newFocusIndex = iFocusIndex;
 	    		newFocusIndex = 0;
 	    		}
 	    	}
 	    }
-	RemoveObjects( newFocusIndex, newTotalSize, aFirstRemovedIndex, aLastRemovedIndex );
+	RemoveObjectsL( newFocusIndex, newTotalSize, aFirstRemovedIndex, aLastRemovedIndex );
 	}
 // -----------------------------------------------------------------------------
 // RemoveObjects
 // -----------------------------------------------------------------------------
 //
-EXPORT_C void CGlxListWindow::RemoveObjects( TInt aFocusIndex,
+EXPORT_C void CGlxListWindow::RemoveObjectsL( TInt aFocusIndex,
 TInt aTotalSize, TInt aFirstRemovedIndex, TInt aLastRemovedIndex )
 	{
-	TRACER("CGlxListWindow::RemoveObjects");
+	TRACER("CGlxListWindow::RemoveObjectsL");
 __ASSERT_DEBUG( 0 <= aFirstRemovedIndex && aFirstRemovedIndex <= aLastRemovedIndex &&
 ( ( 0 <= aFocusIndex && aFocusIndex < aTotalSize ) ||
 ( KErrNotFound == aFocusIndex && aTotalSize == 0 ) ),
 Panic( EGlxPanicIllegalArgument ) );
 __TEST_INVARIANT;
-	Update( TChange( aFocusIndex, aTotalSize, EChangeObjectsRemoved,
+	UpdateL( TChange( aFocusIndex, aTotalSize, EChangeObjectsRemoved,
 aFirstRemovedIndex, aLastRemovedIndex ) );
 __TEST_INVARIANT;
 	}
 // -----------------------------------------------------------------------------
 // Update
 // -----------------------------------------------------------------------------
 //
-void CGlxListWindow::Update( const TChange& aChange )
+void CGlxListWindow::UpdateL( const TChange& aChange )
 	{
-	TRACER("CGlxListWindow::Update");
+	TRACER("CGlxListWindow::UpdateL");
 // (in a list of:  |abcdefghijklm|
 // iWindow:        |----efghi----|
 // iWorkingWindow: undefined state
 // iUnusedObjects: XXX (3 objects, in reality only contains objects if list
 //                      is shorter than max window length)
 // Prepare the working window to accept objects
-iWorkingWindow->Initialize( Range( aChange ), aChange.iNewTotalSize );
+iWorkingWindow->InitializeL( Range( aChange ), aChange.iNewTotalSize );
 // iWindow:        |----efghi----|
 // iWorkingWindow: |------00000--|
 // iUnusedObjects: XXX
 // move unused objects to pool, and reusable objects to working window
-PopulateExistingAndUnuseOld( aChange );
+PopulateExistingAndUnuseOldL( aChange );
 // iWindow:        |----efghi----|
 // iWorkingWindow: |------ghi00--|
 // iUnusedObjects: XXXXX (2 objects added, used to be e and f)
 // -----------------------------------------------------------------------------
 // PopulateExistingAndUnuseOld
 // -----------------------------------------------------------------------------
 //
-void CGlxListWindow::PopulateExistingAndUnuseOld( const TChange& aChange )
+void CGlxListWindow::PopulateExistingAndUnuseOldL( const TChange& aChange )
 {
-TRACER("CGlxListWindow::PopulateExistingAndUnuseOld");
+TRACER("CGlxListWindow::PopulateExistingAndUnuseOldL");
 // move objects that are needed after the change into the working window,
 // and objects that are not needed into the object pool
 TGlxWindowIterator currentWindowIterator = iWindow->Iterator();
 TInt index = 0;
 // do this first, so that the deriving class can access the window
 // by index, if needed
 iObjectFactory.CleanupObject( index, *( *iWindow )[ index ] );
 // add the object to the unused objects pool
 // cannot fail since reservation made
-( void ) iUnusedObjects.Append( ( *iWindow )[ index ] );
+( void )iUnusedObjects.AppendL( ( *iWindow )[ index ] );
 }
 // clear the pointer in the existing window. it is not strictly necessary
 // to do here, but saves a loop from doing it in CGlxDataWindow::Initialize
 ( *iWindow )[ index ] = NULL;
 	}
 // ---------------------------------------------------------------------------
 // Test invariant
 // ---------------------------------------------------------------------------
-void CGlxListWindow::__DbgTestInvariant() const
+EXPORT_C void CGlxListWindow::__DbgTestInvariant() const
 {
 TRACER("CGlxListWindow::__DbgTestInvariant");
 __ASSERT_DEBUG( ( iFocusIndex >= 0 && iFocusIndex < iWindow->TotalSize() ) ||
 ( KErrNotFound == iFocusIndex && 0 == iWindow->TotalSize() ),

changeset 55	fb37077c270f
parent 23	74c9f037fd5d