1.1 --- a/epoc32/include/app/cntviewbase.h Wed Mar 31 12:27:01 2010 +0100
1.2 +++ b/epoc32/include/app/cntviewbase.h Wed Mar 31 12:33:34 2010 +0100
1.3 @@ -1,9 +1,9 @@
1.4 // Copyright (c) 2001-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 @@ -305,11 +305,9 @@
1.16 static TBool HintFieldMatchesFilter(TInt aHintField, TInt aFilter);
1.17 TPtrC FindFirstPopulatedField(TInt aOffset, TInt& aFoundPosition) const;
1.18
1.19 -#ifdef __SYMBIAN_CNTMODEL_USE_SQLITE__
1.20 IMPORT_C void ChangeToLightweightObject();
1.21 TBool IsLightweightObject() const;
1.22 void CopyL(const CViewContact& aContact);
1.23 -#endif //__SYMBIAN_CNTMODEL_USE_SQLITE__
1.24
1.25 private:
1.26 void ConstructL(TInt aLength = 0);
1.27 @@ -416,18 +414,7 @@
1.28 /** List of contacts matching the criteria. */
1.29 RArray<TContactIdWithMapping>& iMatchingContacts;
1.30 };
1.31 - class TVirtualFunction3Params
1.32 - /** Holds the two parameters passed to the method InsertContactInView() from the
1.33 - reserved function CContactViewBase_Reserved_1(). It has an inline
1.34 - constructor to initialise the data members.
1.35
1.36 - @internalAll */
1.37 - {
1.38 - public:
1.39 - inline TVirtualFunction3Params(RPointerArray<CViewContact>& aContacts, const CViewContact* aNewContact) :iContacts(aContacts), iNewContact(aNewContact){};
1.40 - RPointerArray<CViewContact>& iContacts;
1.41 - const CViewContact* iNewContact;
1.42 - };
1.43 /** Search type.
1.44
1.45 This controls whether a search term can occur anywhere in a contact item field,
1.46 @@ -470,6 +457,17 @@
1.47 has changed, or after an error has occurred. */
1.48 ENotReady
1.49 };
1.50 + class TVirtualFunction3Params
1.51 + /** Holds the two parameters passed to the method InsertContactInView() from the
1.52 + reserved function CContactViewBase_Reserved_1(). It has an inline
1.53 + constructor to initialise the data members.
1.54 + */
1.55 + {
1.56 + public:
1.57 + inline TVirtualFunction3Params(RPointerArray<CViewContact>& aContacts, const CViewContact* aNewContact) :iContacts(aContacts), iNewContact(aNewContact){};
1.58 + RPointerArray<CViewContact>& iContacts;
1.59 + const CViewContact* iNewContact;
1.60 + };
1.61 public:
1.62 IMPORT_C void OpenL(MContactViewObserver& aObserver);
1.63 IMPORT_C TInt Open(MContactViewObserver& aObserver);
1.64 @@ -579,6 +577,7 @@
1.65 TContactViewEvent iAsyncEvent;
1.66 MContactViewObserver* iObserverToNotify;
1.67 };
1.68 +
1.69 protected:
1.70 // Reference to CContactDatabase class.
1.71 const CContactDatabase& iDb;
1.72 @@ -592,23 +591,10 @@
1.73 RArray<TObserverAndEvent> iOutstandingNotifications;
1.74 };
1.75
1.76 -inline TInt CContactViewBase::GetErrorValueFromExtensionClass()
1.77 - {
1.78 - return iExtension->iError;
1.79 - }
1.80
1.81 class MLplPersistenceLayerFactory;
1.82 -
1.83 -#ifdef __SYMBIAN_CNTMODEL_USE_SQLITE__
1.84 -
1.85 class CViewContactManager;
1.86
1.87 -#else //__SYMBIAN_CNTMODEL_USE_SQLITE__
1.88 -
1.89 -class CViewIterator;
1.90 -
1.91 -#endif //__SYMBIAN_CNTMODEL_USE_SQLITE__
1.92 -
1.93 class CContactLocalView : public CContactViewBase, public MContactDbObserver
1.94 /** An instantiable base class for contact views.
1.95
1.96 @@ -656,23 +642,11 @@
1.97 virtual void HandleDatabaseEventL(TContactDbObserverEvent aEvent);
1.98
1.99 private:
1.100 -
1.101 -#ifdef __SYMBIAN_CNTMODEL_USE_SQLITE__
1.102 void SortComplete(TInt aSortErr);
1.103 void SetSortOrderL(const RContactViewSortOrder& aSortOrder);
1.104 void SortL();
1.105 void SafeResort();
1.106 friend class CViewContactManager;
1.107 -#else //__SYMBIAN_CNTMODEL_USE_SQLITE__
1.108 - TInt SortCallBack();
1.109 - TInt DoReadIncrementL();
1.110 - void ResetSortL();
1.111 - void InitialiseSortL(const RContactViewSortOrder& aSortOrder, TBool aChangingSortOrder);
1.112 - void SortL();
1.113 - void SafeResort();
1.114 - void ContactsArraySortL();
1.115 - TBool ContactCorrectType(TUid aType,TContactViewPreferences aTypeToInclude);
1.116 -#endif //__SYMBIAN_CNTMODEL_USE_SQLITE__
1.117
1.118 private: // Metheds for event handling
1.119 void HandleOutstandingEvents();
1.120 @@ -692,13 +666,7 @@
1.121 RPointerArray<CViewContact> iUnSortedContacts;
1.122 RArray<TContactDbObserverEvent> iOutstandingEvents;
1.123 CIdleContactSorter* iAsyncSorter;
1.124 -
1.125 -#ifdef __SYMBIAN_CNTMODEL_USE_SQLITE__
1.126 CViewContactManager* iViewCntMgr;
1.127 -#else //__SYMBIAN_CNTMODEL_USE_SQLITE__
1.128 - CViewIterator* iViewIterator;
1.129 -#endif //__SYMBIAN_CNTMODEL_USE_SQLITE__
1.130 -
1.131 CContactTextDef* iTextDef;
1.132 TContactViewPreferences iViewPreferences;
1.133 TBool iSpare0;
1.134 @@ -710,7 +678,7 @@
1.135 server side view object.
1.136
1.137 @see CContactRemoteViewBase
1.138 -@internalComponent
1.139 +@publishedAll
1.140 @released
1.141 */
1.142 {