1.1 --- a/epoc32/include/ecamerrors.h	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/ecamerrors.h	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -1,9 +1,9 @@
     1.4  // Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
     1.5  // All rights reserved.
     1.6  // This component and the accompanying materials are made available
     1.7 -// under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
     1.8 +// under the terms of "Eclipse Public License v1.0"
     1.9  // which accompanies this distribution, and is available
    1.10 -// at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
    1.11 +// at the URL "http://www.eclipse.org/legal/epl-v10.html".
    1.12  //
    1.13  // Initial Contributors:
    1.14  // Nokia Corporation - initial contribution.
    1.15 @@ -15,8 +15,6 @@
    1.16  // 
    1.17  //
    1.18  
    1.19 -
    1.20 -
    1.21  /**
    1.22   @publishedAll
    1.23   @released
    1.24 @@ -26,6 +24,11 @@
    1.25  #ifndef  ECAMERRORS_H
    1.26  #define  ECAMERRORS_H
    1.27  
    1.28 +#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
    1.29 +#include <ecamerrorsconst.h>
    1.30 +#include <ecamerrorsdef.h>
    1.31 +#endif
    1.32 +
    1.33  /** The camera has been disabled, hence calls do not succeed  */
    1.34  static const TInt KErrECamCameraDisabled			= -12100;
    1.35  
    1.36 @@ -55,41 +58,4 @@
    1.37  */
    1.38  static const TInt KErrECamColorOperationConflict	= -12106;
    1.39  
    1.40 -/**
    1.41 -This error code is supposed to be used with new event KUidECamEvent2CameraRequestForcedTimedTakeOver 
    1.42 -and KUidECamEvent2CameraRequestTimedTakeOver.
    1.43 -This would mean that another such reserve request is outstanding and has higher priority than this client.
    1.44 -
    1.45 -@internalTechnology
    1.46 -*/
    1.47 -static const TInt KErrECamHighPriorityReserveRequesterExists = -12107;
    1.48 -
    1.49 -/**
    1.50 -This error code is supposed to be used whenever any fatal error occurs from which the client cannot recover.
    1.51 -
    1.52 -@publishedPartner
    1.53 -@prototype
    1.54 -*/
    1.55 -static const TInt KErrECamFatalError = -12108;
    1.56 -
    1.57 -/**
    1.58 -If error is KErrECamImageResourceNotReleased and client wants to successfully call the Prepare method again, 
    1.59 -client needs to delete all CCameraImageCapture objects and any Snapshot and Histogram objects associated with
    1.60 -it as well. 
    1.61 -
    1.62 -@publishedPartner
    1.63 -@prototype
    1.64 -*/
    1.65 -static const TInt KErrECamImageResourceNotReleased = -12109;
    1.66 -
    1.67 -/**
    1.68 -If error is KErrECamVideoResourceNotReleased and client wants to successfully call the Prepare method again,
    1.69 -client needs to call ReleaseVideoResource to unprepare video and then delete any Snapshot and Histogram 
    1.70 -objects associated with it as well.
    1.71 -
    1.72 -@publishedPartner
    1.73 -@prototype
    1.74 -*/
    1.75 -static const TInt KErrECamVideoResourceNotReleased = -12110;
    1.76 -
    1.77  #endif // ECAMERRORS_H