--- a/camerauis/cameraxui/cxui/inc/cxuiprecaptureview.h	Fri Sep 17 08:27:13 2010 +0300
+++ b/camerauis/cameraxui/cxui/inc/cxuiprecaptureview.h	Mon Oct 04 00:05:08 2010 +0300
@@ -27,7 +27,6 @@
 #include "cxezoomcontrol.h"
 #include "cxegeotaggingtrail.h"
 #include "cxeviewfindercontrol.h"
-#include "cxuidisplaypropertyhandler.h"
 #include "cxuiview.h"
 
 
@@ -41,7 +40,6 @@
 class CxuiDocumentLoader;
 class HbTransparentWindow;
 class CxuiCaptureKeyHandler;
-class CxuiCaptureKeyHandler;
 class CxuiSettingDialog;
 class CxuiSettingRadioButtonList;
 class CxuiSettingSlider;
@@ -68,8 +66,7 @@
     virtual void construct(HbMainWindow *mainWindow,
                            CxeEngine *engine,
                            CxuiDocumentLoader *documentLoader,
-                           CxuiCaptureKeyHandler *keyHandler,
-                           HbActivityManager *activityManager);
+                           CxuiCaptureKeyHandler *keyHandler);
 
     virtual bool isStandbyModeSupported() const;
     /**
@@ -123,7 +120,7 @@
     // Camera / Engine
     void handleEngineZoomStateChange(CxeZoomControl::State newState, CxeError::Id error);
     void handleZoomLevelChange(int);
-    void handleVfStateChanged(CxeViewfinderControl::State newState, CxeError::Id error);
+    virtual void handleVfStateChanged(CxeViewfinderControl::State newState, CxeError::Id error);
     // UI: Zoom slider change notification
     void zoomTo(int value);
 
@@ -165,7 +162,6 @@
 
 protected:
     HbTransparentWindow *mViewfinder; // not own, owned by the graphics scene
-    CxuiDisplayPropertyHandler *mDisplayHandler;
     HbToolBarExtension *mSettingsGrid;
     bool mWidgetsLoaded;
     CxuiSettingDialog *mSettingsDialog;