--- a/phoneclientserver/phoneserver/Src/ImageHandler/CPhSrvSubSessionImageHandler.cpp Tue Aug 31 15:45:17 2010 +0300
+++ b/phoneclientserver/phoneserver/Src/ImageHandler/CPhSrvSubSessionImageHandler.cpp Wed Sep 01 12:15:03 2010 +0100
@@ -19,12 +19,12 @@
// INCLUDE FILES
-#include "cphsrvsubsessionimagehandler.h"
-#include "cphsrvsession.h"
-#include "cphsrvserver.h"
+#include "CPhSrvSubSessionImageHandler.h"
+#include "CPhSrvSession.h"
+#include "CPhSrvServer.h"
#include <e32property.h>
-#include <phclttypes.h>
-#include "phsrvdebuginfo.h"
+#include <PhCltTypes.h>
+#include "PhSrvDebugInfo.h"
// CONSTANTS
_LIT( KPhSrvImageDriveRom, "z:" );
@@ -532,8 +532,8 @@
// Load the images from file.
const TBool loadDefaultImage = aImages.iType == EPhCltTypeVTDefault;
DoReadVTImagesL( loadDefaultImage );
-
- // Copy handles.
+
+ // Copy handles.
aImages.iImageCount = iVTBitMaps.Count();
for ( TInt i = 0; i < aImages.iImageCount; i++ )
{
@@ -562,7 +562,7 @@
aDefaultImage, path );
#ifdef __PHENG_DEBUG_INFO__
- TPtr ptr = searchPath->Des(); // temp pointer to avoid lvalue compile warning
+ TPtr ptr = searchPath->Des(); // temp pointer to avoid lvalue compile warning
RDebug::Print( _L(
"CPhSrvSubSessionImageHandler::ReadVT: %S"), ( &ptr ));
#endif
@@ -721,9 +721,8 @@
bitMap );
aImages.iImages[ EPhCltExtOperatorLogoIndex ] = bitMap->Handle();
aImages.iImageCount = 1;
- CleanupStack::PushL(logoContainer);
- iOperatorLogos.AppendL( logoContainer );
- CleanupStack::Pop(logoContainer);
+ iOperatorLogos.Append( logoContainer );
+
CleanupStack::Pop( bitMap );
CleanupStack::PopAndDestroy( hbuf );