--- a/vtprotocolplugins/VideoSource/src/cmultiframeprovider.cpp	Tue Aug 31 15:16:10 2010 +0300
+++ b/vtprotocolplugins/VideoSource/src/cmultiframeprovider.cpp	Wed Sep 01 12:29:12 2010 +0100
@@ -19,8 +19,8 @@
 // INCLUDE FILES
 #include <imageconversion.h>
 #include <cvtimageconverter.h>
-#include <rphcltserver.h>
-#include <cphcltimagehandler.h>
+#include <RPhCltServer.h>
+#include <CPhCltImageHandler.h>
 #include <bautils.h>
 
 #include "cmultiframeprovider.h"
@@ -233,7 +233,7 @@
             }
         iGSImage = ETrue;
         iCount = 1;     
-		    iActiveWaitInit->InitializeWaiter( &CMultiframeProvider::ConversionFinished );
+		    iActiveWaitInit->InitializeWaiter( &ConversionFinished );
         iActiveWaitInit->Signal( KErrNone );
         }
     else
@@ -275,7 +275,7 @@
     CleanupStack::PopAndDestroy(); // tempBitmap
     tempBitmap = 0;
 
-    iActiveWaitInit->InitializeWaiter( &CMultiframeProvider::BMSScalingFinished );
+    iActiveWaitInit->InitializeWaiter( &BMSScalingFinished );
     iActiveWaitInit->Signal( KErrNone );
     __IF_DEBUG(Print(_L("VideoSource [%d]: CMultiframeProvider::IniatializeBlank() <<"), RThread().Id().operator TUint()));
     }
@@ -517,7 +517,7 @@
     iDefaultImageFile.Close(); 
     if ( aError == KErrNone )
         {
-				iActiveWaitInitScale->InitializeWaiter( &CMultiframeProvider::BMSScalingFinished );
+				iActiveWaitInitScale->InitializeWaiter( &BMSScalingFinished );
       	if ( iGSImage )
        			{
        			__IF_DEBUG(Print(_L("VideoSource[%d]: CMultiframeProvider::ConversionFinished() scale GS "), RThread().Id().operator TUint()));
@@ -579,12 +579,12 @@
         	}
     // Allways inform Decoding problems
     else
-       	{
+        {
         iObserver->NotifyImageHandlingError( aError );
         delete iTempBM;
-       	delete iMask;
-       	iMask = NULL;
-       	iTempBM = NULL;
+        delete iMask;
+        iMask = NULL;
+        iTempBM = NULL;
         // GIF used when error happen
         if ( iCount > 1 )
             {
@@ -686,7 +686,7 @@
             {
             //ScaleCopy is not running, Jump ScaleCopy
             __IF_DEBUG(Print(_L("VideoSource[%d]: CMultiframeProvider::VFScalingReady()jump ScaleCopy>>"), RThread().Id().operator TUint()));
-            iActiveWaitScale->InitializeWaiter( &CMultiframeProvider::VFRescalingFinished );
+            iActiveWaitScale->InitializeWaiter( &VFRescalingFinished );
             iActiveWaitScale->Signal(KErrNone);
             }
         }
@@ -729,7 +729,7 @@
     else
         {
         __IF_DEBUG(Print(_L("VideoSource [%d]: CMultiframeProvider::ScaleCopy(): scaling NOW"), RThread().Id().operator TUint()));
-        iActiveWaitScale->InitializeWaiter( &CMultiframeProvider::VFRescalingFinished );
+        iActiveWaitScale->InitializeWaiter( &VFRescalingFinished );
         TInt result( iVFbitmap->Bitmap().Resize( aSize ) );
         __IF_DEBUG(Print(_L("VideoSource [%d]: CMultiframeProvider::ScaleCopy() result %d <<"), RThread().Id().operator TUint(), result));
         if ( result != KErrNone )
@@ -811,7 +811,7 @@
 void CMultiframeProvider::ScaleVF( const TSize& aSize )
     {
     __IF_DEBUG(Print(_L("VideoSource[%d]: CMultiframeProvider::ScaleVF() >>"), RThread().Id().operator TUint()));
-    iActiveWaitScale->InitializeWaiter( &CMultiframeProvider::VFRescalingFinished );
+    iActiveWaitScale->InitializeWaiter( &VFRescalingFinished );
     TInt result( iVFbitmap->Bitmap().Resize( aSize ) );
     ClearVFScalingTargetSize();
     if ( result != KErrNone )