diff -r 5c1e3c6aa4ef -r b12f3922a74f camerauis/cameraxui/cxengine/inc/cxeautofocuscontrolsymbian.h
--- a/camerauis/cameraxui/cxengine/inc/cxeautofocuscontrolsymbian.h	Fri Jun 11 13:26:48 2010 +0300
+++ b/camerauis/cameraxui/cxengine/inc/cxeautofocuscontrolsymbian.h	Wed Jun 23 17:59:54 2010 +0300
@@ -27,6 +27,7 @@
 
 //forward declarations
 class CxeCameraDevice;
+class CxeSettings;
 
 
 
@@ -41,7 +42,7 @@
     Q_OBJECT
 public:
 
-    CxeAutoFocusControlSymbian( CxeCameraDevice &cameraDevice );
+    CxeAutoFocusControlSymbian( CxeCameraDevice &cameraDevice, CxeSettings &settings );
     virtual ~CxeAutoFocusControlSymbian();
 
     CxeError::Id  start(bool soundEnabled = true);
@@ -81,7 +82,8 @@
 
     // Handle ECam events
     void handleCameraEvent( int eventUid, int error );
-    void handleSceneChanged(CxeScene& scene);
+    void handleSceneChanged(CxeScene &scene);
+    void handleSettingValueChanged(const QString &settingId, QVariant newValue);
 
 private:
 
@@ -93,8 +95,11 @@
     CCamera::CCameraAdvancedSettings *mAdvancedSettings; // not owned
     CxeAutoFocusControl::Mode mAfMode;
     CCamera::CCameraAdvancedSettings::TFocusRange mAFRange;
+    CxeSettings &mSettings;
     bool mCancelled;
     bool mSoundEnabled;
+    bool mFaceTrackingOverride; //need for temporary override of the AF mode if FT is enabled by user
+    CxeAutoFocusControl::Mode mPreviousAFMode; //for restoring previous AF mode in case of FT override
     };
 
 #endif // CXEAUTOFOCUSCONTROLSYMBIAN_H