diff -r 0e652f8f1fbd -r 24fd82631616 camerauis/cameraxui/cxengine/inc/cxestatemachine.h
--- a/camerauis/cameraxui/cxengine/inc/cxestatemachine.h	Thu Jul 15 01:55:05 2010 +0300
+++ b/camerauis/cameraxui/cxengine/inc/cxestatemachine.h	Fri Jul 23 11:35:41 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,6 +14,7 @@
 * Description:
 *
 */
+
 #ifndef CXESTATEMACHINE_H
 #define CXESTATEMACHINE_H
 
@@ -40,7 +41,7 @@
     * @sa addState setInitialState
     * @param stateMachineName  Name for this state machine (used for debug prints)
     */
-    CxeStateMachine(const char* stateMachineName);
+    CxeStateMachine(const char *stateMachineName);
     virtual ~CxeStateMachine();
 
 protected:
@@ -62,7 +63,7 @@
      * @param stateId State ID of the new state
      * @param error   Optional error code to be associated with the transition
      */
-    bool setState(int stateId, int error = 0);
+    bool setState(int stateId, CxeError::Id error = CxeError::None);
 
     /**
      * Set the initial state of the state machine. Can be called only once.
@@ -87,5 +88,3 @@
 };
 
 #endif // CXESTATEMACHINE_H
-
-