1.1 --- a/epoc32/include/ecam/ecamcommonuids.hrh	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/ecam/ecamcommonuids.hrh	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 @@ -13,10 +13,8 @@
    1.16  // Description:
    1.17  //
    1.18  
    1.19 -
    1.20 -
    1.21  /**
    1.22 - @publishedPartner
    1.23 + @publishedAll
    1.24   @prototype
    1.25   @file
    1.26  */
    1.27 @@ -24,40 +22,9 @@
    1.28  #ifndef ECAMCOMMONUIDS_HRH
    1.29  #define ECAMCOMMONUIDS_HRH
    1.30  
    1.31 -// TECAMEvents UID Values
    1.32 -
    1.33 -// For Histogram
    1.34 -/** 
    1.35 -@deprecated use MCaptureImageObserver, MCaptureVideoObserver, MDirectViewFinderObserver, and MClientViewFinderObserver
    1.36 -which have callback functions which notify the client about availability of histogram data. These are sent when 
    1.37 -CCameraV2Histogram::StartHistogram() is called after CCameraV2Histogram::PrepareClientHistogramL(). If
    1.38 -CCameraV2Histogram::PrepareClientHistogramL() is not called first then the callback returns KErrBadHandle.
    1.39 -
    1.40 -Defines the numerical value for KUidECamEventHistogram.
    1.41 -@see KUidECamEventCameraHistogram */
    1.42 -#define	KUidECamEventHistogramUidValue			0x102737AF 
    1.43 -
    1.44 -// For snapshot
    1.45 -/** Defines the numerical value for KUidECamEventSnapshot.
    1.46 -@see KUidECamEventCameraSnapshot*/
    1.47 -
    1.48 -#define	KUidECamEventSnapshotUidValue			0x102737B0
    1.49 -
    1.50 -// C class interface UID values
    1.51 -
    1.52 -/** 
    1.53 -@deprecated use KECamV2HistogramUidValue
    1.54 -
    1.55 -Defines the numerical value for KECamHistogramUid.
    1.56 -@see KECamHistogramUid 
    1.57 -*/
    1.58 -#define	KECamHistogramUidValue					0x102737B6 
    1.59 -
    1.60 -/** 
    1.61 -Defines the numerical value for KECamV2HistogramUid.
    1.62 -@see KECamV2HistogramUid 
    1.63 -*/
    1.64 -#define	KECamV2HistogramUidValue				0x10283229					 
    1.65 +#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
    1.66 +#include <ecam/ecamcommonuidsconst.hrh>
    1.67 +#endif
    1.68  
    1.69  /** 
    1.70  Defines the numerical value for KECamOverlayUid.
    1.71 @@ -68,13 +35,7 @@
    1.72  */
    1.73  #define	KECamOverlayUidValue					0x102737B7 
    1.74  
    1.75 -/** 
    1.76 -Defines the numerical value for KECamSnapshotUid.
    1.77 -@see KECamSnapshotUid
    1.78 +#endif // ECAMCOMMONUIDS_HRH
    1.79  
    1.80 -@publishedPartner
    1.81 -@prototype
    1.82 -*/
    1.83 -#define	KECamSnapshotUidValue					0x102737B8 
    1.84  
    1.85 -#endif // ECAMCOMMONUIDS_HRH
    1.86 +