diff -r 2094593137f5 -r 699651f2666f camerauis/cameraxui/cxengine/tsrc/unit/unittest_cxestillcapturecontrolsymbian/unittest_cxestillcapturecontrolsymbian.cpp --- a/camerauis/cameraxui/cxengine/tsrc/unit/unittest_cxestillcapturecontrolsymbian/unittest_cxestillcapturecontrolsymbian.cpp Fri May 14 15:40:46 2010 +0300 +++ b/camerauis/cameraxui/cxengine/tsrc/unit/unittest_cxestillcapturecontrolsymbian/unittest_cxestillcapturecontrolsymbian.cpp Thu May 27 12:43:29 2010 +0300 @@ -26,6 +26,7 @@ #include "cxestillcapturecontrolsymbian.h" #include "unittest_cxestillcapturecontrolsymbian.h" #include "cxefakeviewfindercontrol.h" +#include "cxesnapshotcontrol.h" #include "cxesettingsmodel.h" #include "cxesensoreventhandlersymbian.h" #include "cxefilenamegeneratorsymbian.h" @@ -64,20 +65,21 @@ mFakeCameraDeviceControl = new CxeFakeCameraDeviceControl(); mFakeCameraDevice = new CxeFakeCameraDevice(); mFakeCameraDevice->newCamera(mFakeCameraDeviceControl->cameraIndex(), mFakeCameraDeviceControl); - mViewfinderControl = new CxeFakeViewfinderControl(); + mSnapshotControl = new CxeSnapshotControl(*mFakeCameraDevice); mFilenameGenerator = new CxeFakeFilenameGenerator(); mSensorEventHandler = new CxeFakeSensorEventHandler(); mFakeAutoFocusControl = new CxeFakeAutoFocusControl(); mFakeQualityPresets = new CxeFakeQualityPresets(); mFakeFileSaveThread = new CxeFakeFileSaveThread(); - + mDiskMonitor = new CxeDiskMonitor(*mFakeSettings); mStillCaptureControl = new CxeStillCaptureControlSymbian( *mFakeCameraDevice, *mViewfinderControl, + *mSnapshotControl, *mFakeCameraDeviceControl, *mFilenameGenerator, *mSensorEventHandler, @@ -106,6 +108,8 @@ mFilenameGenerator = 0; delete mViewfinderControl; mViewfinderControl = 0; + delete mSnapshotControl; + mSnapshotControl = 0; delete mFakeCameraDeviceControl; mFakeCameraDeviceControl = 0; delete mFakeCameraDevice;