# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1263838893 -7200
# Node ID b1602a5ab0a3c86cff0a24dab4595a13d2b3364f
# Parent  4a81900cd18bfcea35e124184f38b034a564b5fd
Revision: 201001
Kit: 201003

diff -r 4a81900cd18b -r b1602a5ab0a3 vtengines/videoteleng/Inc/Base/CVtEngAccessoryHandler.h
--- a/vtengines/videoteleng/Inc/Base/CVtEngAccessoryHandler.h	Thu Jan 07 12:47:29 2010 +0200
+++ b/vtengines/videoteleng/Inc/Base/CVtEngAccessoryHandler.h	Mon Jan 18 20:21:33 2010 +0200
@@ -22,7 +22,7 @@
 
 //  INCLUDES
 #include    <e32base.h>
-#include    <accpolaccessorymode.h>
+#include    <AccPolAccessoryMode.h>
 #include    <accessoryserver.h>
 #include    <accessorymode.h>
 
diff -r 4a81900cd18b -r b1602a5ab0a3 vtengines/videoteleng/Inc/Base/CVtEngSATClient.h
--- a/vtengines/videoteleng/Inc/Base/CVtEngSATClient.h	Thu Jan 07 12:47:29 2010 +0200
+++ b/vtengines/videoteleng/Inc/Base/CVtEngSATClient.h	Mon Jan 18 20:21:33 2010 +0200
@@ -23,7 +23,7 @@
 //  INCLUDES
 #include <e32base.h>
 #include <e32std.h>
-#include <rsatrefresh.h>
+#include <RSatRefresh.h>
 #include <rsatsession.h>
 
 
diff -r 4a81900cd18b -r b1602a5ab0a3 vtengines/videoteleng/Inc/Base/cvtengmdtrcommandsender.h
--- a/vtengines/videoteleng/Inc/Base/cvtengmdtrcommandsender.h	Thu Jan 07 12:47:29 2010 +0200
+++ b/vtengines/videoteleng/Inc/Base/cvtengmdtrcommandsender.h	Mon Jan 18 20:21:33 2010 +0200
@@ -22,7 +22,7 @@
 //  INCLUDES
 
 #include <e32cmn.h>
-#include <mediatorcommandinitiator.h>
+#include <MediatorCommandInitiator.h>
 #include "MVtEngEventObserver.h"
 
 // FORWARD DECLARATIONS
diff -r 4a81900cd18b -r b1602a5ab0a3 vtengines/videoteleng/Inc/Base/cvtengmdtrmessagelistener.h
--- a/vtengines/videoteleng/Inc/Base/cvtengmdtrmessagelistener.h	Thu Jan 07 12:47:29 2010 +0200
+++ b/vtengines/videoteleng/Inc/Base/cvtengmdtrmessagelistener.h	Mon Jan 18 20:21:33 2010 +0200
@@ -22,7 +22,7 @@
 //  INCLUDES
 
 //#include <e32cmn.h>
-#include <mediatorcommandresponder.h>
+#include <MediatorCommandResponder.h>
 #include <mediatoreventconsumer.h>
 #include "MVtEngEventObserver.h"
 #include  "CVtEngStateManager.h"
diff -r 4a81900cd18b -r b1602a5ab0a3 vtengines/videoteleng/Inc/Media/CVtEngDrawNGA.h
--- a/vtengines/videoteleng/Inc/Media/CVtEngDrawNGA.h	Thu Jan 07 12:47:29 2010 +0200
+++ b/vtengines/videoteleng/Inc/Media/CVtEngDrawNGA.h	Mon Jan 18 20:21:33 2010 +0200
@@ -21,7 +21,7 @@
 
 //  INCLUDES
 //#include <videorenderer.h>
-#include <posting_surface.h>
+#include <Posting_Surface.h>
 #include <posting_surface_factory.h>
 #include <pixelformats.h>
 //#include <videoframebuffer.h>
diff -r 4a81900cd18b -r b1602a5ab0a3 vtengines/videoteleng/Inc/Media/TVtEngRenderConfigDP.h
--- a/vtengines/videoteleng/Inc/Media/TVtEngRenderConfigDP.h	Thu Jan 07 12:47:29 2010 +0200
+++ b/vtengines/videoteleng/Inc/Media/TVtEngRenderConfigDP.h	Mon Jan 18 20:21:33 2010 +0200
@@ -23,7 +23,7 @@
 //  INCLUDES
 #include "TVtEngRenderConfig.h"
 #include "TVtEngRenderingDP.h"
-#include <posting_surface.h>
+#include <Posting_Surface.h>
 
 // FORWARD DECLARATIONS
 
diff -r 4a81900cd18b -r b1602a5ab0a3 vtengines/videoteleng/Src/Base/CVtEngSettings.cpp
--- a/vtengines/videoteleng/Src/Base/CVtEngSettings.cpp	Thu Jan 07 12:47:29 2010 +0200
+++ b/vtengines/videoteleng/Src/Base/CVtEngSettings.cpp	Mon Jan 18 20:21:33 2010 +0200
@@ -24,7 +24,7 @@
 #include    "VtEngUtils.h"
 #include    "VtEngPanic.h"
 #include    <telincallvolcntrlcrkeys.h>
-#include    <rphcltserver.h>
+#include    <RPhCltServer.h>
 #include    <cphcltimagehandler.h>
 #include    <videotelephonyinternalcrkeys.h>
 #include    <logsdomaincrkeys.h>
diff -r 4a81900cd18b -r b1602a5ab0a3 vtengines/videoteleng/Src/Base/cvtengmediatorservice.cpp
--- a/vtengines/videoteleng/Src/Base/cvtengmediatorservice.cpp	Thu Jan 07 12:47:29 2010 +0200
+++ b/vtengines/videoteleng/Src/Base/cvtengmediatorservice.cpp	Mon Jan 18 20:21:33 2010 +0200
@@ -25,7 +25,7 @@
 #include    "VtEngUtils.h"
 #include    "CVtEngSettings.h"
 #include    <cvtlogger.h>
-#include    <mediatorcommandresponder.h>
+#include    <MediatorCommandResponder.h>
 #include    <mediatordomainuids.h>
 #include    <videotelcontrolmediatorapi.h> 
 #include    <videoteltophonecommandsapi.h>
diff -r 4a81900cd18b -r b1602a5ab0a3 vtengines/vtmediatorplugin/inc/cvtmediatorplugin.h
--- a/vtengines/vtmediatorplugin/inc/cvtmediatorplugin.h	Thu Jan 07 12:47:29 2010 +0200
+++ b/vtengines/vtmediatorplugin/inc/cvtmediatorplugin.h	Mon Jan 18 20:21:33 2010 +0200
@@ -20,7 +20,7 @@
 #define C_VTMEDIATORPLUGIN_H
 
 // INCLUDES
-#include <mediatorpluginbase.h>
+#include <MediatorPluginBase.h>
 #include <mediatornotifications.h>
 #include <mediatoreventconsumer.h>
 #include <mediatoreventprovider.h>
diff -r 4a81900cd18b -r b1602a5ab0a3 vtengines/vtmediatorplugin/src/cvtmediatorplugin.cpp
--- a/vtengines/vtmediatorplugin/src/cvtmediatorplugin.cpp	Thu Jan 07 12:47:29 2010 +0200
+++ b/vtengines/vtmediatorplugin/src/cvtmediatorplugin.cpp	Mon Jan 18 20:21:33 2010 +0200
@@ -22,7 +22,7 @@
 #include <apacmdln.h>
 #include <apaflrec.h>
 #include <apgcli.h>
-#include <mediatordomainuids.h>
+#include <MediatorDomainUIDs.h>
 #include <eikdll.h>
 #include <apgcli.h>
 #include <apgwgnam.h>
diff -r 4a81900cd18b -r b1602a5ab0a3 vtprotocolplugins/DisplaySink/inc/TDisplaySinkParamsDP.h
--- a/vtprotocolplugins/DisplaySink/inc/TDisplaySinkParamsDP.h	Thu Jan 07 12:47:29 2010 +0200
+++ b/vtprotocolplugins/DisplaySink/inc/TDisplaySinkParamsDP.h	Mon Jan 18 20:21:33 2010 +0200
@@ -22,7 +22,7 @@
 // INCLUDE FILES
 
 #include "mdisplaysink.h"
-#include <posting_surface.h>
+#include <Posting_Surface.h>
 
 // CLASS DECLARATION
 
diff -r 4a81900cd18b -r b1602a5ab0a3 vtprotocolplugins/DisplaySink/src/CVtImage.cpp
--- a/vtprotocolplugins/DisplaySink/src/CVtImage.cpp	Thu Jan 07 12:47:29 2010 +0200
+++ b/vtprotocolplugins/DisplaySink/src/CVtImage.cpp	Mon Jan 18 20:21:33 2010 +0200
@@ -59,6 +59,7 @@
             break;
 
         case EColor16MA:
+        case EColor16MAP:
             mode = EVtColor16MA;
             break;
 
diff -r 4a81900cd18b -r b1602a5ab0a3 vtprotocolplugins/DisplaySink/src/CVtImageConverter.cpp
--- a/vtprotocolplugins/DisplaySink/src/CVtImageConverter.cpp	Thu Jan 07 12:47:29 2010 +0200
+++ b/vtprotocolplugins/DisplaySink/src/CVtImageConverter.cpp	Mon Jan 18 20:21:33 2010 +0200
@@ -163,6 +163,19 @@
 	return rgb;
 	}
 
+// -----------------------------------------------------------------------------
+// VSReadColor16MAP( TAny*& aSource )
+// (other items were commented in a header).
+// -----------------------------------------------------------------------------
+//
+TRgb VSReadColor16MAP( TAny*& aSource )
+  {
+	TUint32* s = static_cast< TUint32* >( aSource );
+	TRgb rgb( TRgb::Color16MAP( *s++ ) );
+	aSource = s;
+	return rgb;
+  }
+
 // ============================ MEMBER FUNCTIONS ===============================
 
 /**
@@ -1766,6 +1779,10 @@
         case EColor16MA:
 			DoProcess( VSReadColor16MA );
 			break;
+			
+        case EColor16MAP:
+        	DoProcess( VSReadColor16MAP );
+        	break;
 
 		default:
 			User::Leave( KErrNotSupported );
@@ -1808,7 +1825,8 @@
 	    ( iSource->DisplayMode() != EColor64K ) &&
 	    ( iSource->DisplayMode() != EColor16M ) &&
 	    ( iSource->DisplayMode() != EColor16MU ) &&
-	    ( iSource->DisplayMode() != EColor16MA ) )
+	    ( iSource->DisplayMode() != EColor16MA ) &&
+	    ( iSource->DisplayMode() != EColor16MAP ) )
 		{
 		User::Leave( KErrNotSupported );
 		}
diff -r 4a81900cd18b -r b1602a5ab0a3 vtprotocolplugins/VideoSource/src/CVSStillImageDataProvider.cpp
--- a/vtprotocolplugins/VideoSource/src/CVSStillImageDataProvider.cpp	Thu Jan 07 12:47:29 2010 +0200
+++ b/vtprotocolplugins/VideoSource/src/CVSStillImageDataProvider.cpp	Mon Jan 18 20:21:33 2010 +0200
@@ -22,7 +22,7 @@
 #include <bautils.h>
 #include <imageconversion.h>
 #include <cvtimageconverter.h>
-#include <rphcltserver.h>
+#include <RPhCltServer.h>
 #include <cphcltimagehandler.h>
 #include <w32std.h>
 
diff -r 4a81900cd18b -r b1602a5ab0a3 vtprotocolplugins/VideoSource/src/cmultiframeprovider.cpp
--- a/vtprotocolplugins/VideoSource/src/cmultiframeprovider.cpp	Thu Jan 07 12:47:29 2010 +0200
+++ b/vtprotocolplugins/VideoSource/src/cmultiframeprovider.cpp	Mon Jan 18 20:21:33 2010 +0200
@@ -19,7 +19,7 @@
 // INCLUDE FILES
 #include <imageconversion.h>
 #include <cvtimageconverter.h>
-#include <rphcltserver.h>
+#include <RPhCltServer.h>
 #include <cphcltimagehandler.h>
 #include <bautils.h>
 
diff -r 4a81900cd18b -r b1602a5ab0a3 vtuis/videotelui/inc/CVtUiActivateBtHfDialog.h
--- a/vtuis/videotelui/inc/CVtUiActivateBtHfDialog.h	Thu Jan 07 12:47:29 2010 +0200
+++ b/vtuis/videotelui/inc/CVtUiActivateBtHfDialog.h	Mon Jan 18 20:21:33 2010 +0200
@@ -21,7 +21,7 @@
 #define CVTUIACTIVATEBTHFDIALOG_H
 
 //  INCLUDES
-#include    <aknwaitdialog.h>
+#include    <AknWaitDialog.h>
 #include    <mvtengcommandobserver.h>
 #include    <mvtengaudio.h>
 
diff -r 4a81900cd18b -r b1602a5ab0a3 vtuis/videotelui/inc/CVtUiAllowVideoDialog.h
--- a/vtuis/videotelui/inc/CVtUiAllowVideoDialog.h	Thu Jan 07 12:47:29 2010 +0200
+++ b/vtuis/videotelui/inc/CVtUiAllowVideoDialog.h	Mon Jan 18 20:21:33 2010 +0200
@@ -21,7 +21,7 @@
 #define CVTUIALLOWVIDEODIALOG_H
 
 //  INCLUDES
-#include    <aknquerydialog.h>
+#include    <AknQueryDialog.h>
 
 // CLASS DECLARATION
 
diff -r 4a81900cd18b -r b1602a5ab0a3 vtuis/videotelui/inc/CVtUiAppUi.h
--- a/vtuis/videotelui/inc/CVtUiAppUi.h	Thu Jan 07 12:47:29 2010 +0200
+++ b/vtuis/videotelui/inc/CVtUiAppUi.h	Mon Jan 18 20:21:33 2010 +0200
@@ -28,7 +28,7 @@
 #include    <tvtengrenderingdsa.h>
 #include    <tvtengrenderingdp.h>
 #include    <tvtengrenderingnga.h>
-#include    <aknprogressdialog.h>
+#include    <AknProgressDialog.h>
 #include    <mvtengaudio.h>
 #include    <remconcoreapi.h>
 
diff -r 4a81900cd18b -r b1602a5ab0a3 vtuis/videotelui/inc/CVtUiContextControl.h
--- a/vtuis/videotelui/inc/CVtUiContextControl.h	Thu Jan 07 12:47:29 2010 +0200
+++ b/vtuis/videotelui/inc/CVtUiContextControl.h	Mon Jan 18 20:21:33 2010 +0200
@@ -21,7 +21,7 @@
 #define CVTUICONTEXTCONTROL_H
 
 //  INCLUDES
-#include    <aknwseventobserver.h>
+#include    <AknWsEventObserver.h>
 #include    "cvtuivideocontrolbase.h"
 
 // FORWARDS
diff -r 4a81900cd18b -r b1602a5ab0a3 vtuis/videotelui/inc/CVtUiDoc.h
--- a/vtuis/videotelui/inc/CVtUiDoc.h	Thu Jan 07 12:47:29 2010 +0200
+++ b/vtuis/videotelui/inc/CVtUiDoc.h	Mon Jan 18 20:21:33 2010 +0200
@@ -21,7 +21,7 @@
 #define CVTUIDOC_H
 
 //  INCLUDES
-#include    <akndoc.h>
+#include    <AknDoc.h>
 
 // CLASS DECLARATION
 
diff -r 4a81900cd18b -r b1602a5ab0a3 vtuis/videotelui/inc/CVtUiMutedControl.h
--- a/vtuis/videotelui/inc/CVtUiMutedControl.h	Thu Jan 07 12:47:29 2010 +0200
+++ b/vtuis/videotelui/inc/CVtUiMutedControl.h	Mon Jan 18 20:21:33 2010 +0200
@@ -22,7 +22,7 @@
 
 //  INCLUDES
 #include    <coecntrl.h>
-#include    <aknutils.h>
+#include    <AknUtils.h>
 
 // CLASS DECLARATION
 
diff -r 4a81900cd18b -r b1602a5ab0a3 vtuis/videotelui/inc/CVtUiNaviPaneControl.h
--- a/vtuis/videotelui/inc/CVtUiNaviPaneControl.h	Thu Jan 07 12:47:29 2010 +0200
+++ b/vtuis/videotelui/inc/CVtUiNaviPaneControl.h	Mon Jan 18 20:21:33 2010 +0200
@@ -22,7 +22,7 @@
 
 //  INCLUDES
 #include    <coecntrl.h>
-#include    <aknutils.h>
+#include    <AknUtils.h>
 
 // CONSTANTS
 
diff -r 4a81900cd18b -r b1602a5ab0a3 vtuis/videotelui/inc/VtUiLayout.h
--- a/vtuis/videotelui/inc/VtUiLayout.h	Thu Jan 07 12:47:29 2010 +0200
+++ b/vtuis/videotelui/inc/VtUiLayout.h	Mon Jan 18 20:21:33 2010 +0200
@@ -24,7 +24,7 @@
 //  INCLUDES
 #include    "videotelui.hrh"
 #include    <e32base.h>
-#include    <aknutils.h>
+#include    <AknUtils.h>
 
 // FORWARD DECLARATIONS
 class TAknsItemID;
diff -r 4a81900cd18b -r b1602a5ab0a3 vtuis/videotelui/inc/cvtuiappshutter.h
--- a/vtuis/videotelui/inc/cvtuiappshutter.h	Thu Jan 07 12:47:29 2010 +0200
+++ b/vtuis/videotelui/inc/cvtuiappshutter.h	Mon Jan 18 20:21:33 2010 +0200
@@ -21,7 +21,7 @@
 
 #include <babitflags.h>
 
-#include 	<mphcltemergencycallobserver.h>
+#include 	<MPhCltEmergencyCallObserver.h>
 #include    <cphcltemergencycall.h>
 #include    <rphcltserver.h>
 
diff -r 4a81900cd18b -r b1602a5ab0a3 vtuis/videotelui/inc/cvtuivideocontrolbase.h
--- a/vtuis/videotelui/inc/cvtuivideocontrolbase.h	Thu Jan 07 12:47:29 2010 +0200
+++ b/vtuis/videotelui/inc/cvtuivideocontrolbase.h	Mon Jan 18 20:21:33 2010 +0200
@@ -20,7 +20,7 @@
 #define C_VTUIVIDEOCONTROLBASE_H
 
 #include    <coecntrl.h>
-#include    <aknutils.h>
+#include    <AknUtils.h>
 #include    <babitflags.h>
 
 #include    "MVtUiVideoWindow.h"
diff -r 4a81900cd18b -r b1602a5ab0a3 vtuis/videotelui/inc/features/numberentry/CVtUiNumberEntryControl.h
--- a/vtuis/videotelui/inc/features/numberentry/CVtUiNumberEntryControl.h	Thu Jan 07 12:47:29 2010 +0200
+++ b/vtuis/videotelui/inc/features/numberentry/CVtUiNumberEntryControl.h	Mon Jan 18 20:21:33 2010 +0200
@@ -22,7 +22,7 @@
 
 //  INCLUDES
 #include    <coecntrl.h>
-#include    <aknutils.h>
+#include    <AknUtils.h>
 
 #include    "mvtuicomponent.h"
 #include    "tvtuicomponentstate.h"
diff -r 4a81900cd18b -r b1602a5ab0a3 vtuis/videotelui/inc/features/prefs/cvtuiprefsettinglistbase.h
--- a/vtuis/videotelui/inc/features/prefs/cvtuiprefsettinglistbase.h	Thu Jan 07 12:47:29 2010 +0200
+++ b/vtuis/videotelui/inc/features/prefs/cvtuiprefsettinglistbase.h	Mon Jan 18 20:21:33 2010 +0200
@@ -19,7 +19,7 @@
 #ifndef C_VTUIPEFSETTINGLISTBASE_H
 #define C_VTUIPEFSETTINGLISTBASE_H
 
-#include    <akntransparentcamerasettingpage.h>
+#include    <AknTransparentCameraSettingPage.h>
 #include    "mvtuicommandui.h"
 #include    "cvtuifeaturebase.h"
 #include    "mvtuicomponent.h"
diff -r 4a81900cd18b -r b1602a5ab0a3 vtuis/videotelui/inc/features/prefs/cvtuitransparentsettingpage.h
--- a/vtuis/videotelui/inc/features/prefs/cvtuitransparentsettingpage.h	Thu Jan 07 12:47:29 2010 +0200
+++ b/vtuis/videotelui/inc/features/prefs/cvtuitransparentsettingpage.h	Mon Jan 18 20:21:33 2010 +0200
@@ -19,7 +19,7 @@
 #ifndef CVTUITRANSPARENTSETTINGPAGE_H
 #define CVTUITRANSPARENTSETTINGPAGE_H
 
-#include <akntransparentcamerasettingpage.h>
+#include <AknTransparentCameraSettingPage.h>
 
 class MVtUiSettingPageObserver;
 class CAknsBasicBackgroundControlContext;
diff -r 4a81900cd18b -r b1602a5ab0a3 vtuis/videotelui/src/CVtUiBlankControl.cpp
--- a/vtuis/videotelui/src/CVtUiBlankControl.cpp	Thu Jan 07 12:47:29 2010 +0200
+++ b/vtuis/videotelui/src/CVtUiBlankControl.cpp	Mon Jan 18 20:21:33 2010 +0200
@@ -19,7 +19,7 @@
 
 // INCLUDE FILES
 #include    "CVtUiBlankControl.h"
-#include    <aknsutils.h>
+#include    <AknsUtils.h>
 
 // ============================ MEMBER FUNCTIONS ===============================
 
diff -r 4a81900cd18b -r b1602a5ab0a3 vtuis/videotelui/src/CVtUiRemoteVideoControl.cpp
--- a/vtuis/videotelui/src/CVtUiRemoteVideoControl.cpp	Thu Jan 07 12:47:29 2010 +0200
+++ b/vtuis/videotelui/src/CVtUiRemoteVideoControl.cpp	Mon Jan 18 20:21:33 2010 +0200
@@ -20,7 +20,7 @@
 // INCLUDE FILES
 #include    <cvtlogger.h>
 #include   <eikdef.h>
-#include    <aknincallbubblenotify.h>
+#include    <AknIncallBubbleNotify.h>
 #include    <aknslayeredbackgroundcontrolcontext.h>
 #include    <aknutils.h>
 #include    <aknnavi.h>
diff -r 4a81900cd18b -r b1602a5ab0a3 vtuis/videotelui/src/VtUiUtility.cpp
--- a/vtuis/videotelui/src/VtUiUtility.cpp	Thu Jan 07 12:47:29 2010 +0200
+++ b/vtuis/videotelui/src/VtUiUtility.cpp	Mon Jan 18 20:21:33 2010 +0200
@@ -23,7 +23,7 @@
 #include    <featmgr.h>
 #include    <mvtengmedia.h>
 #include    <cvtlogger.h>
-#include    <aknutils.h>
+#include    <AknUtils.h>
 #include 	"tVtuifeaturevariation.h"
 
 // Characters to open number entry.
diff -r 4a81900cd18b -r b1602a5ab0a3 vtuis/videotelui/src/cvtuivideocontrolbase.cpp
--- a/vtuis/videotelui/src/cvtuivideocontrolbase.cpp	Thu Jan 07 12:47:29 2010 +0200
+++ b/vtuis/videotelui/src/cvtuivideocontrolbase.cpp	Mon Jan 18 20:21:33 2010 +0200
@@ -18,7 +18,7 @@
 
 #include    <cvtlogger.h>
 #include    <featmgr.h>
-#include    <aknsdrawutils.h>
+#include    <AknsDrawUtils.h>
 #include    <aknsutils.h>
 #include    <aknbiditextutils.h>
 #include    <stringloader.h>
diff -r 4a81900cd18b -r b1602a5ab0a3 vtuis/videotelui/src/features/dialer/cvtuidialer.cpp
--- a/vtuis/videotelui/src/features/dialer/cvtuidialer.cpp	Thu Jan 07 12:47:29 2010 +0200
+++ b/vtuis/videotelui/src/features/dialer/cvtuidialer.cpp	Mon Jan 18 20:21:33 2010 +0200
@@ -16,7 +16,7 @@
 */
 
 
-#include <aknutils.h>
+#include <AknUtils.h>
 #include <peninputcmdparam.h>
 #include <cvtlogger.h>
 
diff -r 4a81900cd18b -r b1602a5ab0a3 vtuis/videotelui/src/features/dialer/cvtuidialercontainer.cpp
--- a/vtuis/videotelui/src/features/dialer/cvtuidialercontainer.cpp	Thu Jan 07 12:47:29 2010 +0200
+++ b/vtuis/videotelui/src/features/dialer/cvtuidialercontainer.cpp	Mon Jan 18 20:21:33 2010 +0200
@@ -18,7 +18,7 @@
 
 #include    <cvtlogger.h>
 #include    <cvideodtmfdialer.h>
-#include    <aknsdrawutils.h>
+#include    <AknsDrawUtils.h>
 #include    <aknsutils.h>
 #include    <aknlayoutscalable_apps.cdl.h>
 #include    <aknlayoutscalable_avkon.cdl.h>
diff -r 4a81900cd18b -r b1602a5ab0a3 vtuis/videotelui/src/features/prefs/cvtuicontrastpopup.cpp
--- a/vtuis/videotelui/src/features/prefs/cvtuicontrastpopup.cpp	Thu Jan 07 12:47:29 2010 +0200
+++ b/vtuis/videotelui/src/features/prefs/cvtuicontrastpopup.cpp	Mon Jan 18 20:21:33 2010 +0200
@@ -17,7 +17,7 @@
 
 
 
-#include    <aknvolumepopup.h>
+#include    <AknVolumePopup.h>
 #include    "cvtuicontrastpopup.h"
 #include    <cvtlogger.h>
 #include	"tvtuilocalvariation.h"
diff -r 4a81900cd18b -r b1602a5ab0a3 vtuis/videotelui/src/features/prefs/cvtuivideoquality.cpp
--- a/vtuis/videotelui/src/features/prefs/cvtuivideoquality.cpp	Thu Jan 07 12:47:29 2010 +0200
+++ b/vtuis/videotelui/src/features/prefs/cvtuivideoquality.cpp	Mon Jan 18 20:21:33 2010 +0200
@@ -17,7 +17,7 @@
 
 
 #include    <badesca.h>
-#include    <akniconarray.h>
+#include    <AknIconArray.h>
 #include    <aknsutils.h>
 #include    <stringloader.h>
 #include    <aknlists.h>
diff -r 4a81900cd18b -r b1602a5ab0a3 vtuis/videotelui/src/features/toolbar/cvtuitoolbarbase.cpp
--- a/vtuis/videotelui/src/features/toolbar/cvtuitoolbarbase.cpp	Thu Jan 07 12:47:29 2010 +0200
+++ b/vtuis/videotelui/src/features/toolbar/cvtuitoolbarbase.cpp	Mon Jan 18 20:21:33 2010 +0200
@@ -21,7 +21,7 @@
 #include    <cvtlogger.h>
 #include    <akntoolbar.h>
 #include    <featmgr.h>
-#include    <stringloader.h>
+#include    <StringLoader.h>
 #include    <videotelui.rsg>
 #include    "videotelui.hrh"
 #include    "cvtuitoolbarbase.h"
diff -r 4a81900cd18b -r b1602a5ab0a3 vtuis/videotelui/src/features/volume/cvtuivolumepopup.cpp
--- a/vtuis/videotelui/src/features/volume/cvtuivolumepopup.cpp	Thu Jan 07 12:47:29 2010 +0200
+++ b/vtuis/videotelui/src/features/volume/cvtuivolumepopup.cpp	Mon Jan 18 20:21:33 2010 +0200
@@ -16,7 +16,7 @@
 */
 
 
-#include    <aknvolumepopup.h>
+#include    <AknVolumePopup.h>
 #include    <cvtlogger.h>
 #include    "cvtuivolumepopup.h"
 #include    "cvtuifeaturemanager.h"
diff -r 4a81900cd18b -r b1602a5ab0a3 vtuis/videotelui/src/features/zoom/cvtuizoompopup.cpp
--- a/vtuis/videotelui/src/features/zoom/cvtuizoompopup.cpp	Thu Jan 07 12:47:29 2010 +0200
+++ b/vtuis/videotelui/src/features/zoom/cvtuizoompopup.cpp	Mon Jan 18 20:21:33 2010 +0200
@@ -16,7 +16,7 @@
 */
 
 
-#include    <aknvolumepopup.h>
+#include    <AknVolumePopup.h>
 #include    <cvtlogger.h>
 #include    "cvtuizoompopup.h"
 #include    "cvtuifeaturemanager.h"
diff -r 4a81900cd18b -r b1602a5ab0a3 vtuis/videotelui/src/sliders/cvtuipopupbase.cpp
--- a/vtuis/videotelui/src/sliders/cvtuipopupbase.cpp	Thu Jan 07 12:47:29 2010 +0200
+++ b/vtuis/videotelui/src/sliders/cvtuipopupbase.cpp	Mon Jan 18 20:21:33 2010 +0200
@@ -17,7 +17,7 @@
 
 
 #include    <cvtlogger.h>
-#include    <aknutils.h>
+#include    <AknUtils.h>
 #include    <aknvolumepopup.h>
 #include    <fbs.h>