--- a/pimappservices/calendar/client/src/calentryimpl.cpp Tue Aug 31 15:13:43 2010 +0300
+++ b/pimappservices/calendar/client/src/calentryimpl.cpp Wed Sep 01 12:32:31 2010 +0100
@@ -216,13 +216,10 @@
void CCalEntryImpl::AddAttendeeL(CCalAttendee* aAttendee)
{
- __ASSERT_ALWAYS( EntryTypeL() != CCalEntry::ENote,
- User::Leave(KErrNotSupported));
-
- if (!aAttendee)
- {
- User::Leave( KErrArgument );
- }
+ if (!aAttendee)
+ {
+ User::Leave( KErrArgument );
+ }
CleanupStack::PushL(aAttendee);
__ASSERT_ALWAYS(aAttendee != NULL, User::Leave(KErrArgument));
@@ -265,9 +262,6 @@
void CCalEntryImpl::SetOrganizerL(CCalUser* aUser)
{
- __ASSERT_ALWAYS( EntryTypeL() != CCalEntry::ENote,
- User::Leave(KErrNotSupported));
-
CleanupStack::PushL(aUser);
__ASSERT_ALWAYS(aUser != NULL, User::Leave(KErrArgument));
LoadFullEntryL();
@@ -282,8 +276,6 @@
void CCalEntryImpl::SetPhoneOwnerL(const CCalUser* aOwner)
{
- __ASSERT_ALWAYS( EntryTypeL() != CCalEntry::ENote,
- User::Leave(KErrNotSupported));
__ASSERT_ALWAYS(aOwner != NULL, User::Leave(KErrArgument));
LoadFullEntryL();
CCalUserImpl* userImpl = aOwner->Impl();
@@ -357,8 +349,6 @@
void CCalEntryImpl::SetTzRulesL(const CTzRules& aTzRules)
{
- __ASSERT_ALWAYS( EntryTypeL() != CCalEntry::ENote,
- User::Leave(KErrNotSupported));
LoadFullEntryL();
if (TimeMode() == MAgnCalendarTimeMode::EFloating)
@@ -378,8 +368,6 @@
void CCalEntryImpl::SetTzRulesL()
{
- __ASSERT_ALWAYS( EntryTypeL() != CCalEntry::ENote,
- User::Leave(KErrNotSupported));
LoadFullEntryL();
if (TimeMode() == MAgnCalendarTimeMode::EFloating)
@@ -397,16 +385,12 @@
void CCalEntryImpl::SetRDatesL(const RArray<TCalTime>& aRDates)
{
- __ASSERT_ALWAYS( EntryTypeL() != CCalEntry::ENote,
- User::Leave(KErrNotSupported));
LoadFullEntryL();
SetDatesL(ETrue, aRDates);
}
void CCalEntryImpl::SetExceptionDatesL(const RArray<TCalTime>& aExDates)
{
- __ASSERT_ALWAYS( EntryTypeL() != CCalEntry::ENote,
- User::Leave(KErrNotSupported));
LoadFullEntryL();
if (iFullEntry->RptDef() == NULL)
@@ -576,9 +560,6 @@
void CCalEntryImpl::AddCategoryL(CCalCategory* aCategory)
{
- __ASSERT_ALWAYS( EntryTypeL() != CCalEntry::ENote,
- User::Leave(KErrNotSupported));
-
CleanupStack::PushL(aCategory);
__ASSERT_ALWAYS(aCategory != NULL, User::Leave(KErrArgument));
@@ -605,8 +586,6 @@
void CCalEntryImpl::DeleteCategoryL(TInt aIndex)
{
- __ASSERT_ALWAYS( EntryTypeL() != CCalEntry::ENote,
- User::Leave(KErrNotSupported));
LoadFullEntryL();
if (aIndex < 0 || aIndex >= iFullEntry->CategoryCount())
@@ -851,9 +830,6 @@
void CCalEntryImpl::SetAlarmL(CCalAlarm* aAlarm)
{
- __ASSERT_ALWAYS( EntryTypeL() != CCalEntry::ENote,
- User::Leave(KErrNotSupported));
-
LoadFullEntryL();
if ( aAlarm == NULL )
@@ -962,9 +938,6 @@
void CCalEntryImpl::SetRRuleL(const TCalRRule& aRpt)
{
- __ASSERT_ALWAYS( EntryTypeL() != CCalEntry::ENote,
- User::Leave(KErrNotSupported));
-
if (aRpt.Until().TimeLocalL() != Time::NullTTime() && aRpt.DtStart().TimeLocalL() >= aRpt.Until().TimeLocalL())
{
// if Until time is set to earlier than the start time and is non-NULL, leave
@@ -1233,8 +1206,6 @@
void CCalEntryImpl::SetLocationL(const TDesC& aLocation)
{
- __ASSERT_ALWAYS( EntryTypeL() != CCalEntry::ENote,
- User::Leave(KErrNotSupported));
LoadFullEntryL();
iFullEntry->SetLocationL(aLocation);
}
@@ -1247,8 +1218,6 @@
void CCalEntryImpl::SetPriorityL(TUint aPriority)
{
- __ASSERT_ALWAYS( EntryTypeL() != CCalEntry::ENote,
- User::Leave(KErrNotSupported));
LoadFullEntryL();
iFullEntry->SetPriority(aPriority);
}
@@ -1275,8 +1244,6 @@
void CCalEntryImpl::SetStartAndEndTimeL(const TCalTime& aStartTime, const TCalTime& aEndTime)
{
- __ASSERT_ALWAYS( EntryTypeL() != CCalEntry::ENote,
- User::Leave(KErrNotSupported));
LoadFullEntryL();
TCalTime::TTimeMode mode = aStartTime.TimeMode();
if (aEndTime.TimeUtcL() != Time::NullTTime())
@@ -1379,8 +1346,6 @@
void CCalEntryImpl::SetSummaryL(const TDesC& aSummary)
{
- __ASSERT_ALWAYS( EntryTypeL() != CCalEntry::ENote,
- User::Leave(KErrNotSupported));
LoadFullEntryL();
HBufC* summ = aSummary.AllocL();
iFullEntry->SetSummary(summ); // takes ownership of aSummary
@@ -1465,8 +1430,6 @@
void CCalEntryImpl::SetReplicationStatusL(CCalEntry::TReplicationStatus aReplicationStatus)
{
- __ASSERT_ALWAYS( EntryTypeL() != CCalEntry::ENote,
- User::Leave(KErrNotSupported));
LoadFullEntryL();
iFullEntry->SetReplicationStatusL(aReplicationStatus);
}
@@ -1498,16 +1461,8 @@
{
LoadFullEntryL();
iFullEntry->SetLastModifiedDateUtc(aModifiedTime.TimeUtcL());
-
- // for entry type ENote,set the modified time as the start/end time
- if(EntryTypeL() == CCalEntry::ENote)
- {
- TAgnCalendarTime agnModifiedTime =
- CalUtils::TCalTimeToTAgnCalendarTimeL(aModifiedTime);
- iFullEntry->SetStartAndEndTimeL(agnModifiedTime, agnModifiedTime);
- }
}
-
+
void CCalEntryImpl::SetDTStampL(const TCalTime& aDTStampTime)
{
LoadFullEntryL();
@@ -1546,7 +1501,7 @@
else
{
return iFullEntry->CollectionId();
- }
+ }
}
CCalEntry::TTransp CCalEntryImpl::BusyStatusL()
@@ -1557,8 +1512,6 @@
void CCalEntryImpl::SetBusyStatusL(CCalEntry::TTransp aBusyStatus)
{
- __ASSERT_ALWAYS( EntryTypeL() != CCalEntry::ENote,
- User::Leave(KErrNotSupported));
LoadFullEntryL();
iFullEntry->SetBusyStatusL(aBusyStatus);
}
@@ -1577,14 +1530,11 @@
CleanupStack::Pop(geoValue);
return geoValue;
}
- return NULL;
+ return NULL;
}
void CCalEntryImpl::SetGeoValueL(const CCalGeoValue& aGeoValue)
{
- __ASSERT_ALWAYS( EntryTypeL() != CCalEntry::ENote,
- User::Leave(KErrNotSupported));
-
LoadFullEntryL();
TReal geoLatitude;
TReal geoLongitude;
@@ -1707,14 +1657,14 @@
}
void CCalEntryImpl::SetUserIntL( TUint32 aUserInt )
- {
- SimpleEntry()->SetUserInt(aUserInt);
- }
+ {
+ SimpleEntry()->SetUserInt(aUserInt);
+ }
TUint32 CCalEntryImpl::UserIntL()
- {
- return SimpleEntry()->UserInt();
- }
+ {
+ return SimpleEntry()->UserInt();
+ }
// CCalEntryIdImpl //