--- a/photosgallery/viewframework/tvout/src/glxtv.cpp Wed Apr 14 15:57:24 2010 +0300
+++ b/photosgallery/viewframework/tvout/src/glxtv.cpp Tue Apr 27 16:37:53 2010 +0300
@@ -159,9 +159,9 @@
TRACER("CGlxTv::CGlxTvOutCenRepMonitor::ConstructL");
CActiveScheduler::Add( this );
#ifdef __MARM
- CGSServerEngine* aGSServerEngine= CGSServerEngine::NewLC();
- iSettingsTVAspectRatio = aGSServerEngine->AspectRatioL();
- CleanupStack::Pop(aGSServerEngine);
+ CGSServerEngine* gsServerEngine= CGSServerEngine::NewLC();
+ iSettingsTVAspectRatio = gsServerEngine->AspectRatioL();
+ CleanupStack::Pop(gsServerEngine);
#else
iSettingsTVAspectRatio = 0;
#endif
@@ -388,9 +388,9 @@
iAspectRatio = KErrNotFound;
#ifdef __MARM
- CGSServerEngine* aGSServerEngine = CGSServerEngine::NewLC();
- iAspectRatio = aGSServerEngine->AspectRatioL();
- CleanupStack::Pop(aGSServerEngine);
+ CGSServerEngine* gsServerEngine = CGSServerEngine::NewLC();
+ iAspectRatio = gsServerEngine->AspectRatioL();
+ CleanupStack::Pop(gsServerEngine);
User::LeaveIfError( iAspectRatio );
#else
iAspectRatio = 0;