1.1 --- a/epoc32/include/logcli.h Wed Mar 31 12:27:01 2010 +0100
1.2 +++ b/epoc32/include/logcli.h Wed Mar 31 12:33:34 2010 +0100
1.3 @@ -1,9 +1,9 @@
1.4 // Copyright (c) 2003-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 @@ -32,7 +32,6 @@
1.16 // CLogEventType
1.17 //**********************************
1.18
1.19 -class CLogEventType : public CBase
1.20 /** Encapsulates the details of an event type.
1.21
1.22 An event type is used to associate an event with a user-readable description
1.23 @@ -45,6 +44,7 @@
1.24 @publishedAll
1.25 @released
1.26 */
1.27 +class CLogEventType : public CBase
1.28 {
1.29 public:
1.30 IMPORT_C static CLogEventType* NewL();
1.31 @@ -80,7 +80,6 @@
1.32 // TLogConfig
1.33 //**********************************
1.34
1.35 -class TLogConfig
1.36 /** Encapsulates Log Engine configuration data.
1.37
1.38 @see CLogClient::GetConfig()
1.39 @@ -88,6 +87,7 @@
1.40 @publishedAll
1.41 @released
1.42 */
1.43 +class TLogConfig
1.44 {
1.45 public:
1.46 IMPORT_C TLogConfig();
1.47 @@ -121,7 +121,6 @@
1.48 // CLogFilter
1.49 //**********************************
1.50
1.51 -class CLogFilter : public CBase
1.52 /** Specifies the conditions that events must satisfy to appear in a view.
1.53
1.54 In general, a filter is used to construct the WHERE clause of an SQL
1.55 @@ -139,6 +138,7 @@
1.56 @publishedAll
1.57 @released
1.58 */
1.59 +class CLogFilter : public CBase
1.60 {
1.61 public:
1.62 IMPORT_C static CLogFilter* NewL();
1.63 @@ -183,6 +183,9 @@
1.64 void InternalizeL(RReadStream& aStream);
1.65 void ExternalizeL(RWriteStream& aStream) const;
1.66 //
1.67 + IMPORT_C void SetSimId(TSimId aSimId);
1.68 + IMPORT_C TSimId SimId() const;
1.69 + //
1.70 private:
1.71 CLogFilter();
1.72 void ConstructL();
1.73 @@ -200,9 +203,11 @@
1.74 TUint32 iNullFields;
1.75 TTime iStartTime;
1.76 TTime iEndTime;
1.77 +#ifdef SYMBIAN_ENABLE_EVENTLOGGER_DUALSIM
1.78 + TSimId iSimId;
1.79 +#endif
1.80 };
1.81
1.82 -class CLogFilterList : public CArrayPtrFlat<const CLogFilter>
1.83 /** A set of event view filters.
1.84
1.85 Specifically, this is an array of pointers to const CLogFilter objects and
1.86 @@ -214,6 +219,7 @@
1.87 @publishedAll
1.88 @released
1.89 */
1.90 +class CLogFilterList : public CArrayPtrFlat<const CLogFilter>
1.91 {
1.92 public:
1.93 IMPORT_C CLogFilterList();
1.94 @@ -243,7 +249,6 @@
1.95 class CLogClearLogClientOp;
1.96 class CLogClearRecentClientOp;
1.97
1.98 -class CLogClient : public CLogBase
1.99 /** Log Engine implementation.
1.100
1.101 It creates a shared session on the log database and allows log viewers to
1.102 @@ -258,6 +263,7 @@
1.103 @publishedAll
1.104 @released
1.105 */
1.106 +class CLogClient : public CLogBase
1.107 {
1.108 public:
1.109 IMPORT_C static CLogClient* NewL(RFs& aFs, TInt aPriority = CActive::EPriorityStandard);
1.110 @@ -277,6 +283,8 @@
1.111 IMPORT_C void ChangeConfig(const TLogConfig& aConfig, TRequestStatus& aStatus);
1.112 IMPORT_C void ClearLog(const TTime& aDate, TRequestStatus& aStatus);
1.113 IMPORT_C void ClearLog(TInt aRecentList, TRequestStatus& aStatus);
1.114 + IMPORT_C void ClearLog(const TTime& aDate, TSimId aSimid, TRequestStatus& aStatus);
1.115 + IMPORT_C void ClearLog(TInt aRecentList, TSimId aSimid, TRequestStatus& aStatus);
1.116 //
1.117 IMPORT_C void NotifyChange(TTimeIntervalMicroSeconds32 aDelay, TRequestStatus& aStatus);
1.118 IMPORT_C void NotifyChangeCancel();