1.1 --- a/epoc32/include/app/calinstanceview.h Wed Mar 31 12:27:01 2010 +0100
1.2 +++ b/epoc32/include/app/calinstanceview.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 @@ -18,7 +18,10 @@
1.16
1.17 #include <calentry.h>
1.18 #include <calentryview.h>
1.19 -#include <calinstanceiterator.h>
1.20 +#include <calinstance.h>
1.21 +#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
1.22 +#include <calinstanceiterator.h> //this is publishedPartner so should not be included here in the SF version.
1.23 +#endif
1.24
1.25 class CCalFindInstanceSettings;
1.26 class CCalInstance;
1.27 @@ -29,7 +32,17 @@
1.28 class TCalTime;
1.29 class CCalLiteEntry;
1.30 class TAgnInstanceId;
1.31 +#ifdef SYMBIAN_SKIPPED_CALENDAR_ALARMS
1.32 struct TASShdAlarmedInstanceParams;
1.33 +#endif
1.34 +
1.35 +#ifdef SYMBIAN_CALENDAR_ENHANCEDSEARCHANDSORT
1.36 +class CCalSortCriteria;
1.37 +class CCalSortCriterion;
1.38 +class RWriteStream;
1.39 +class CAgnSortCriteria;
1.40 +class TAgnSortCriterion;
1.41 +#endif
1.42
1.43 /** View class for accessing instances of calendar entries.
1.44
1.45 @@ -68,6 +81,8 @@
1.46
1.47 IMPORT_C static CCalInstanceView* NewL(CCalSession& aSession, MCalProgressCallBack& aProgressCallBack);
1.48 IMPORT_C static CCalInstanceView* NewL(CCalSession& aSession);
1.49 + IMPORT_C static CCalInstanceView* NewL(RPointerArray<CCalSession>& aSessions);
1.50 + IMPORT_C static CCalInstanceView* NewL(RPointerArray<CCalSession>& aSessions, MCalProgressCallBack& aProgressCallBack);
1.51 IMPORT_C ~CCalInstanceView();
1.52
1.53 IMPORT_C void FindInstanceL(RPointerArray<CCalInstance>& aInstanceList,
1.54 @@ -80,9 +95,20 @@
1.55 const TCalSearchParams& aSearchParams) const;
1.56
1.57 IMPORT_C CCalInstanceIterator* FindInstanceL(const CCalFindInstanceSettings& aSettings) const;
1.58 +
1.59 + IMPORT_C CCalInstanceIterator* FindInstanceL(const CCalFindInstanceSettings& aSettings, TCalLocalUid aLocalId, const TCalTime& aInstanceTime) const;
1.60 + IMPORT_C CCalInstanceIterator* FindInstanceByUidL(const TDesC8& aUid, const TCalTime& aInstanceTime) const;
1.61 +
1.62 + IMPORT_C CCalInstanceIterator* FindInstanceL(const CCalFindInstanceSettings& aSettings, TCalInstanceId& aInstanceId) const;
1.63 + IMPORT_C CCalInstanceIterator* FindInstanceByUidL(TCalCollectionId aCollectionId, const TDesC8& aUid, const TCalTime& aInstanceTime) const;
1.64 +
1.65 + IMPORT_C CCalInstance* FindInstanceL(TCalLocalUid aLocalId, const TCalTime& aInstanceTime) const;
1.66 + IMPORT_C CCalInstance* FindInstanceL(TCalInstanceId& aInstanceId) const;
1.67
1.68 +#ifdef SYMBIAN_SKIPPED_CALENDAR_ALARMS
1.69 IMPORT_C void FindAlarmedInstanceL(RPointerArray<CCalInstance>& aAlarmedInstanceList,
1.70 TASShdAlarmedInstanceParams aAlarmedInstanceParams) const;
1.71 +#endif
1.72
1.73 IMPORT_C void DeleteL(CCalInstance* aInstance, CalCommon::TRecurrenceRange aWhichInstances);
1.74
1.75 @@ -92,14 +118,16 @@
1.76 private:
1.77 CCalInstanceView();
1.78 void ConstructL(CCalSession& aSession, MCalProgressCallBack* aProgressCallBack);
1.79 + void ConstructL(RPointerArray<CCalSession>& aSessions, MCalProgressCallBack* aProgressCallBack);
1.80
1.81 private:
1.82 CCalInstanceViewImpl* iImpl;
1.83 };
1.84 +
1.85 +
1.86 +/** Class for specifying the search criteria for use in CCalInstanceView::FindInstanceL.
1.87
1.88 -/** Class for specifying the search criteria for use in @see CCalInstanceView::FindInstanceL.
1.89 -
1.90 -@publishedPartner
1.91 +@publishedAll
1.92 @released
1.93 */
1.94 NONSHARABLE_CLASS(CCalFindInstanceSettings) : public CBase
1.95 @@ -114,16 +142,77 @@
1.96
1.97 CalCommon::TCalSearchBehaviour Behaviour() const;
1.98 CalCommon::TCalViewFilter Filter() const;
1.99 - const CalCommon::TCalTimeRange TimeRange() const;
1.100 + const CalCommon::TCalTimeRange& TimeRange() const;
1.101 const TDesC& Text() const;
1.102 +
1.103 +#ifdef SYMBIAN_CALENDAR_ENHANCEDSEARCHANDSORT
1.104 + IMPORT_C void SetPriorityRange(const CalCommon::TCalPriorityRange& aPriorityRange);
1.105 +
1.106 + IMPORT_C CCalSortCriteria& SortCriteria();
1.107 + IMPORT_C const CCalSortCriteria& SortCriteria() const;
1.108 +#endif
1.109 +
1.110 + const CalCommon::TCalPriorityRange& PriorityRange() const;
1.111 +
1.112 private:
1.113 CCalFindInstanceSettings(CalCommon::TCalViewFilter aFilter, const CalCommon::TCalTimeRange& aTimeRange);
1.114 + void ConstructL();
1.115
1.116 private:
1.117 CalCommon::TCalTimeRange iTimeRange;
1.118 CalCommon::TCalViewFilter iFilter;
1.119 HBufC* iSearchText;
1.120 CalCommon::TCalSearchBehaviour iSearchBehaviour;
1.121 + CalCommon::TCalPriorityRange iPriorityRange;
1.122 +#ifdef SYMBIAN_CALENDAR_ENHANCEDSEARCHANDSORT
1.123 + CCalSortCriteria* iSortCriteria;
1.124 +#endif
1.125 };
1.126 +
1.127 +#ifdef SYMBIAN_CALENDAR_ENHANCEDSEARCHANDSORT
1.128 +/** Class for specifying the sort criteria for use in CCalInstanceView::FindInstanceL.
1.129 +
1.130 +@publishedAll
1.131 +@prototype
1.132 +*/
1.133 +NONSHARABLE_CLASS(CCalSortCriteria) : public CBase
1.134 + {
1.135 +public:
1.136 + IMPORT_C static CCalSortCriteria* NewL();
1.137 + IMPORT_C ~CCalSortCriteria();
1.138 +
1.139 + IMPORT_C void AppendCriterionL(CalCommon::TCalSortAttribute aAttr, CalCommon::TCalSortDirection aDir);
1.140 + IMPORT_C TInt Count() const;
1.141 + IMPORT_C const CCalSortCriterion& AtL(TInt aIndex) const;
1.142 + IMPORT_C void SetEntryTypeOrderL(const RArray<CCalEntry::TType>& aTypeOrder);
1.143 + IMPORT_C const RArray<CCalEntry::TType>& EntryTypeOrder() const;
1.144 +
1.145 + const CAgnSortCriteria& SortCriteria() const;
1.146
1.147 +private:
1.148 + CCalSortCriteria();
1.149 + void ConstructL();
1.150 +
1.151 +private:
1.152 + CAgnSortCriteria* iSortCriteria;
1.153 + RPointerArray<CCalSortCriterion> iSortCriterionList;
1.154 + };
1.155 +
1.156 +NONSHARABLE_CLASS(CCalSortCriterion) : public CBase
1.157 + {
1.158 +public:
1.159 + static CCalSortCriterion* NewL(const TAgnSortCriterion& aSortCriterion);
1.160 + ~CCalSortCriterion();
1.161 +
1.162 + IMPORT_C CalCommon::TCalSortAttribute SortAttribute() const;
1.163 + IMPORT_C CalCommon::TCalSortDirection SortDirection() const;
1.164 +
1.165 +private:
1.166 + CCalSortCriterion(const TAgnSortCriterion& aSortCriterion);
1.167 +
1.168 +private:
1.169 + const TAgnSortCriterion& iSortCriterion;
1.170 + };
1.171 +#endif
1.172 +
1.173 #endif // __CALINSTANCEVIEW_H__