diff -r 64817133cd1d -r 42ba2d16bf40 camerauis/cameraxui/cxengine/src/cxestatemachine.cpp
--- a/camerauis/cameraxui/cxengine/src/cxestatemachine.cpp	Tue Jul 06 14:04:02 2010 +0300
+++ b/camerauis/cameraxui/cxengine/src/cxestatemachine.cpp	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"
@@ -14,11 +14,12 @@
  * Description:
  *
  */
+ 
 #include "cxestatemachine.h"
 #include "cxestate.h"
 #include "cxutils.h"
 
-CxeStateMachine::CxeStateMachine( const char* stateMachineName ) :
+CxeStateMachine::CxeStateMachine(const char *stateMachineName) :
     CxeStateMachineBase(stateMachineName)
 {
 }
@@ -28,7 +29,7 @@
 
 }
 
-bool CxeStateMachine::addState( CxeState* state )
+bool CxeStateMachine::addState(CxeState *state)
 {
     CX_DEBUG_ENTER_FUNCTION();
     bool success = CxeStateMachineBase::addState(state);
@@ -37,7 +38,7 @@
     return success;
 }
 
-bool CxeStateMachine::setState( int stateId, int error )
+bool CxeStateMachine::setState(int stateId, CxeError::Id error)
 {
     CX_DEBUG_ENTER_FUNCTION();
     bool success = CxeStateMachineBase::setState(stateId, error);
@@ -46,7 +47,7 @@
     return success;
 }
 
-bool CxeStateMachine::setInitialState( int stateId )
+bool CxeStateMachine::setInitialState(int stateId)
 {
     CX_DEBUG_ENTER_FUNCTION();
     bool success = CxeStateMachineBase::setInitialState(stateId);
@@ -54,8 +55,3 @@
     CX_DEBUG_EXIT_FUNCTION();
     return success;
 }
-
-
-
-
-