--- a/camerauis/cameraxui/cxui/inc/cxuiviewmanager.h	Tue Jul 06 14:04:02 2010 +0300
+++ b/camerauis/cameraxui/cxui/inc/cxuiviewmanager.h	Wed Aug 18 09:37:18 2010 +0300
@@ -31,13 +31,9 @@
 class CxuiApplication;
 class CxuiCaptureKeyHandler;
 class CxuiPrecaptureView;
-class CxuiStillPrecaptureView;
-class CxuiVideoPrecaptureView;
-class CxuiPostcaptureView;
 class CxeEngine;
 class CxuiDocumentLoader;
-class CxuiErrorManager; // class that handles all errors in ui.
-class CxuiSceneModeView;
+class CxuiErrorManager;
 class CxuiView;
 
 class CxuiViewManager : public QObject
@@ -48,11 +44,6 @@
     CxuiViewManager(CxuiApplication &application, HbMainWindow &mainWindow, CxeEngine &engine);
     ~CxuiViewManager();
 
-    CxuiDocumentLoader *documentLoader();
-
-    CxuiApplicationState &applicationState();
-
-    void initEngine();
 public slots:
     void changeToPostcaptureView();
     void changeToPrecaptureView();
@@ -80,14 +71,12 @@
     CxuiView *createView(const QString &viewName);
     CxuiPrecaptureView* getPrecaptureView(Cxe::CameraMode mode, Cxe::CameraIndex camera);
 
-    CxuiView *createSceneModesView();
-
-    void connectSignals(QObject *view);
-    void disconnectSignals(QObject *view = NULL);
-    void connectPreCaptureSignals();
+    void connectSignals(CxuiView *view);
+    void disconnectSignals(CxuiView *view = NULL);
+    void connectPreCaptureSignals(CxuiPrecaptureView *view);
     void connectPostCaptureSignals();
     void connectSceneModeSignals();
-    void connectCaptureKeySignals();
+    void connectCaptureKeySignals(CxuiView *view);
 
     void handleExitingNormalState();
     void clearAllActivities();
@@ -105,7 +94,6 @@
     CxuiDocumentLoader *mCameraDocumentLoader;
     CxuiApplicationState *mApplicationState;
     CxuiErrorManager *mErrorManager;
-    CxuiSceneModeView *mSceneModeView;
     QTimer mStandbyTimer;
 };