diff -r 73a1feb507fb -r bc78a40cd63c tsrc/mceclientstub/inc/mcecamerasource.h
--- a/tsrc/mceclientstub/inc/mcecamerasource.h	Tue Aug 31 15:12:07 2010 +0300
+++ b/tsrc/mceclientstub/inc/mcecamerasource.h	Wed Sep 01 12:31:01 2010 +0100
@@ -49,8 +49,6 @@
 class CMceCameraSource : public CMceMediaSource
 	{
     friend class UT_CMusEngLiveSession;
-    friend class UT_CMusEngTwoWaySession;
-    friend class UT_TMusEngCameraHandler;
 
 	public: // Constructors and destructor
 
@@ -66,12 +64,6 @@
 	    */
 		IMPORT_C static CMceCameraSource* NewLC( CMceManager& aManager );
 		
-        /// Not in the real implementation 
-        IMPORT_C static CMceCameraSource* NewL();		
-		
-		/// Not in the real implementation 
-		IMPORT_C static CMceCameraSource* NewLC();
-		
 	    /**
 	    * Destructor.
 	    */
@@ -218,6 +210,11 @@
 	    * C++ constructor.
 	    */
 		CMceCameraSource();
+
+	    /**
+	    * Second-phase constructor.
+	    */
+		void ConstructL( CMceManager* aManager );
     
     private: // Owned data
    
@@ -235,7 +232,6 @@
     public: // stub data
 	
 	    TInt iCameraIndex;
-	    TInt iCameraCount;
         TInt iZoomFactor;
         TInt iDigitalZoomFactor;
         TInt iContrast;