diff -r 64817133cd1d -r 42ba2d16bf40 camerauis/cameraxui/cxengine/inc/cxeenginesymbian.h
--- a/camerauis/cameraxui/cxengine/inc/cxeenginesymbian.h	Tue Jul 06 14:04:02 2010 +0300
+++ b/camerauis/cameraxui/cxengine/inc/cxeenginesymbian.h	Wed Aug 18 09:37:18 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -33,7 +33,6 @@
 class CxeAutoFocusControl;
 class CxeSettings;
 class CxeFeatureManager;
-class CxeSettingsModel;
 class CxeSensorEventHandler;
 class CxeFilenameGenerator;
 class CxeQualityPresets;
@@ -77,6 +76,7 @@
 
 private slots:
     void doInit();
+    void initGeotagging();
 
 private:
     void connectSignals();
@@ -85,7 +85,6 @@
     bool startViewfinderNeeded();
     void reserve();
     void saveMode();
-    void startGeotaggingTrail();
 
 protected:
     CxeCameraDeviceControl *mCameraDeviceControl;
@@ -99,7 +98,6 @@
     CxeZoomControl *mZoomControl;
     CxeSettings *mSettings;
     CxeFeatureManager *mFeatureManager;
-    CxeSettingsModel *mSettingsModel;
     CxeFilenameGenerator *mFilenameGenerator;
     CxeSensorEventHandler* mSensorEventHandler;
     CxeQualityPresets *mQualityPresets;