Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 11:55:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed Bug Don't use std::* in mozilla

Browse Source
This commit is contained in:
mostafah%oeone.com 2003-02-14 18:05:46 +00:00
parent 8d78476dde
commit cf30057c34
5 changed files with 150 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
calendar/libxpical/oeICalEventImpl.cpp
View File

@ -37,11 +37,7 @@
* ***** END LICENSE BLOCK ***** */
#ifndef WIN32
#ifdef XP_MAC
#include <stdlib.h> // for atol
#else
#include <unistd.h>
#endif
#endif
#include "oeICalEventImpl.h"
@ -308,6 +304,12 @@ oeICalEventImpl::~oeICalEventImpl()
m_stamp->Release();
if( m_recurend )
m_recurend->Release();
for( int i=0; i<m_snoozetimes.Count(); i++ ) {
PRTime *snoozetimeptr = (PRTime*)(m_snoozetimes[i]);
delete snoozetimeptr;
}
m_snoozetimes.Clear();
RemoveAllExceptions();
}
NS_IMETHODIMP oeICalEventImpl::SetParent( oeIICal *calendar )
@ -1131,8 +1133,8 @@ icaltimetype oeICalEventImpl::GetNextAlarmTime( icaltimetype begin ) {
result = CalculateAlarmTime( result );
} while ( icaltime_compare( starting, result ) >= 0 );
for( unsigned int i=0; i<m_snoozetimes.size(); i++ ) {
icaltimetype snoozetime = ConvertFromPrtime( m_snoozetimes[i] );
for( int i=0; i<m_snoozetimes.Count(); i++ ) {
icaltimetype snoozetime = ConvertFromPrtime( *(PRTime*)(m_snoozetimes[i]) );
if( icaltime_is_null_time( result ) || icaltime_compare( snoozetime, result ) < 0 ) {
if ( icaltime_compare( snoozetime, starting ) > 0 ) {
result = snoozetime;
@ -1282,7 +1284,9 @@ NS_IMETHODIMP oeICalEventImpl::AddException( PRTime exdate )
tmpexdate.minute = 0;
tmpexdate.second = 0;
exdate = ConvertToPrtime( tmpexdate );
m_exceptiondates.push_back( exdate );
PRTime *newexdate = new PRTime;
*newexdate = exdate;
m_exceptiondates.AppendElement( newexdate );
return NS_OK;
}
@ -1291,7 +1295,11 @@ NS_IMETHODIMP oeICalEventImpl::RemoveAllExceptions()
#ifdef ICAL_DEBUG_ALL
printf( "oeICalEventImpl::RemoveAllExceptions()\n" );
#endif
m_exceptiondates.clear();
for( int i=0; i<m_exceptiondates.Count(); i++ ) {
PRTime *exceptiondateptr = (PRTime*)(m_exceptiondates[i]);
delete exceptiondateptr;
}
m_exceptiondates.Clear();
return NS_OK;
}
@ -1312,8 +1320,8 @@ oeICalEventImpl::GetExceptions(nsISimpleEnumerator **datelist )
do {
found = false;
for( unsigned int i=0; i<m_exceptiondates.size(); i++ ) {
current = m_exceptiondates[i];
for( int i=0; i<m_exceptiondates.Count(); i++ ) {
current = *(PRTime *)(m_exceptiondates[i]);
if( !count ) {
if( i == 0 ) {
minimum = current;
@ -1356,8 +1364,8 @@ bool oeICalEventImpl::IsExcepted( PRTime date ) {
date = ConvertToPrtime( tmpexdate );
bool result = false;
for( unsigned int i=0; i<m_exceptiondates.size(); i++ ) {
if( m_exceptiondates[i] == date ) {
for( int i=0; i<m_exceptiondates.Count(); i++ ) {
if( *(PRTime *)(m_exceptiondates[i]) == date ) {
result = true;
break;
}
@ -1375,8 +1383,9 @@ NS_IMETHODIMP oeICalEventImpl::SetSnoozeTime( PRTime snoozetime )
#endif
icaltimetype tmpdate = ConvertFromPrtime( snoozetime );
snoozetime = icaltime_as_timet( tmpdate );
snoozetime *= 1000;
m_snoozetimes.push_back( snoozetime );
PRTime *snoozetimeinms = new PRTime;
*snoozetimeinms = snoozetime * 1000;
m_snoozetimes.AppendElement( snoozetimeinms );
PRTime nowinms = time( nsnull );
nowinms *= 1000;
m_lastalarmack = ConvertFromPrtime( nowinms );
@ -2044,16 +2053,21 @@ bool oeICalEventImpl::ParseIcalComponent( icalcomponent *comp )
}
//recur exceptions
m_exceptiondates.clear();
RemoveAllExceptions();
for( prop = icalcomponent_get_first_property( vevent, ICAL_EXDATE_PROPERTY );
prop != 0 ;
prop = icalcomponent_get_next_property( vevent, ICAL_EXDATE_PROPERTY ) ) {
icaltimetype exdate = icalproperty_get_exdate( prop );
PRTime exdateinms = ConvertToPrtime( exdate );
m_exceptiondates.push_back( exdateinms );
PRTime *exdateinms = new PRTime;
*exdateinms = ConvertToPrtime( exdate );
m_exceptiondates.AppendElement( exdateinms );
}
m_snoozetimes.clear();
for( int i=0; i<m_snoozetimes.Count(); i++ ) {
PRTime *snoozetimeptr = (PRTime*)(m_snoozetimes[i]);
delete snoozetimeptr;
}
m_snoozetimes.Clear();
//snoozetimes
icalcomponent *tmpcomp = icalcomponent_get_first_component( vevent, ICAL_X_COMPONENT );
if ( tmpcomp != 0) {
@ -2063,9 +2077,10 @@ bool oeICalEventImpl::ParseIcalComponent( icalcomponent *comp )
icaltimetype snoozetime = icalproperty_get_dtstamp( prop );
if( !icaltime_is_null_time( m_lastalarmack ) && icaltime_compare( m_lastalarmack, snoozetime ) >= 0 )
continue;
PRTime snoozetimeinms = icaltime_as_timet( snoozetime );
snoozetimeinms *= 1000;
m_snoozetimes.push_back( snoozetimeinms );
PRTime *snoozetimeinms = new PRTime;
*snoozetimeinms = icaltime_as_timet( snoozetime );
*snoozetimeinms = *snoozetimeinms * 1000;
m_snoozetimes.AppendElement( snoozetimeinms );
}
}
@ -2388,8 +2403,8 @@ icalcomponent* oeICalEventImpl::AsIcalComponent()
}
//exceptions
for( unsigned int i=0; i<m_exceptiondates.size(); i++ ) {
icaltimetype exdate = ConvertFromPrtime( m_exceptiondates[i] );
for( int i=0; i<m_exceptiondates.Count(); i++ ) {
icaltimetype exdate = ConvertFromPrtime( *(PRTime *)(m_exceptiondates[i]) );
prop = icalproperty_new_exdate( exdate );
icalcomponent_add_property( vevent, prop );
}
@ -2425,11 +2440,11 @@ icalcomponent* oeICalEventImpl::AsIcalComponent()
//snoozetimes
icalcomponent *tmpcomp=NULL;
unsigned int i;
for( i=0; i<m_snoozetimes.size(); i++ ) {
int i;
for( i=0; i<m_snoozetimes.Count(); i++ ) {
if( tmpcomp == NULL )
tmpcomp = icalcomponent_new( ICAL_X_COMPONENT );
icaltimetype snoozetime = ConvertFromPrtime( m_snoozetimes[i] );
icaltimetype snoozetime = ConvertFromPrtime( *(PRTime *)(m_snoozetimes[i]) );
prop = icalproperty_new_dtstamp( snoozetime );
icalcomponent_add_property( tmpcomp, prop );
}

12
calendar/libxpical/oeICalEventImpl.h
View File

@ -44,7 +44,7 @@
#include "nsSupportsPrimitives.h"
#include "nsISupportsArray.h"
#include "nsString.h"
#include <vector>
#include "nsVoidArray.h"
extern "C" {
#include "ical.h"
@ -76,7 +76,7 @@ oeEventEnumerator : public nsISimpleEnumerator
private:
PRUint32 mCurrentIndex;
std::vector<nsISupports *> mEventVector;
nsCOMPtr<nsISupportsArray> mEventVector;
};
class
@ -95,8 +95,8 @@ oeDateEnumerator : public nsISimpleEnumerator
NS_IMETHOD AddDate( PRTime date );
private:
PRUint32 mCurrentIndex;
std::vector<PRTime> mDateVector;
PRInt32 mCurrentIndex;
nsVoidArray mDateVector;
};
/* oeIcalEvent Header file */
@ -150,8 +150,8 @@ private:
oeDateTimeImpl *m_stamp;
oeDateTimeImpl *m_recurend;
icaltimetype m_lastalarmack;
std::vector<PRTime> m_exceptiondates;
std::vector<PRTime> m_snoozetimes;
nsVoidArray m_exceptiondates;
nsVoidArray m_snoozetimes;
icaltimetype CalculateAlarmTime( icaltimetype date );
bool IsExcepted( PRTime date );
nsCOMPtr<nsISupportsArray> m_attachments;

149
calendar/libxpical/oeICalImpl.cpp
View File

@ -40,7 +40,6 @@
#define __cplusplus__ 1
#include <vector>
#include "oeICalImpl.h"
#include "oeICalEventImpl.h"
#include "nsMemory.h"
@ -95,11 +94,11 @@ oeEventEnumerator::oeEventEnumerator( )
:
mCurrentIndex( 0 )
{
NS_NewISupportsArray(getter_AddRefs(mEventVector));
}
oeEventEnumerator::~oeEventEnumerator()
{
mEventVector.clear();
}
NS_IMPL_ISUPPORTS1(oeEventEnumerator, nsISimpleEnumerator)
@ -107,7 +106,9 @@ NS_IMPL_ISUPPORTS1(oeEventEnumerator, nsISimpleEnumerator)
NS_IMETHODIMP
oeEventEnumerator::HasMoreElements(PRBool *result)
{
if( mCurrentIndex >= mEventVector.size() )
PRUint32 count = 0;
mEventVector->Count(&count);
if( mCurrentIndex >= count )
{
*result = PR_FALSE;
}
@ -122,13 +123,16 @@ NS_IMETHODIMP
oeEventEnumerator::GetNext(nsISupports **_retval)
{
if( mCurrentIndex >= mEventVector.size() )
PRUint32 count = 0;
mEventVector->Count(&count);
if( mCurrentIndex >= count )
{
*_retval = nsnull;
}
else
{
nsISupports* event = mEventVector[ mCurrentIndex ];
nsCOMPtr<nsISupports> event;
mEventVector->QueryElementAt( mCurrentIndex, NS_GET_IID(nsISupports), getter_AddRefs(event));
event->AddRef();
*_retval = event;
++mCurrentIndex;
@ -141,7 +145,9 @@ oeEventEnumerator::GetNext(nsISupports **_retval)
NS_IMETHODIMP
oeEventEnumerator::AddEvent( nsISupports* event)
{
mEventVector.push_back( event );
PRUint32 count = 0;
mEventVector->Count( &count );
mEventVector->InsertElementAt( event, count );
return NS_OK;
}
@ -154,7 +160,11 @@ oeDateEnumerator::oeDateEnumerator( )
oeDateEnumerator::~oeDateEnumerator()
{
mDateVector.clear();
for( int i=0; i<mDateVector.Count(); i++ ) {
PRTime *timeptr = (PRTime*)(mDateVector[i]);
delete timeptr;
}
mDateVector.Clear();
}
NS_IMPL_ISUPPORTS1(oeDateEnumerator, nsISimpleEnumerator)
@ -162,7 +172,7 @@ NS_IMPL_ISUPPORTS1(oeDateEnumerator, nsISimpleEnumerator)
NS_IMETHODIMP
oeDateEnumerator::HasMoreElements(PRBool *result)
{
if( mCurrentIndex >= mDateVector.size() )
if( mCurrentIndex >= mDateVector.Count() )
{
*result = PR_FALSE;
}
@ -177,7 +187,7 @@ NS_IMETHODIMP
oeDateEnumerator::GetNext(nsISupports **_retval)
{
if( mCurrentIndex >= mDateVector.size() )
if( mCurrentIndex >= mDateVector.Count() )
{
*_retval = nsnull;
}
@ -196,7 +206,7 @@ oeDateEnumerator::GetNext(nsISupports **_retval)
return rv;
}
date->SetData( mDateVector[ mCurrentIndex ] );
date->SetData( *(PRTime *)(mDateVector[ mCurrentIndex ]) );
*_retval = date;
++mCurrentIndex;
}
@ -207,7 +217,9 @@ oeDateEnumerator::GetNext(nsISupports **_retval)
NS_IMETHODIMP
oeDateEnumerator::AddDate(PRTime date)
{
mDateVector.push_back( date );
PRTime *newdate = new PRTime;
*newdate = date;
mDateVector.AppendElement( newdate );
return NS_OK;
}
@ -242,6 +254,9 @@ oeICalImpl::oeICalImpl()
m_filter = new oeICalFilter();
NS_ADDREF( m_filter );
NS_NewISupportsArray(getter_AddRefs(m_observerlist));
NS_NewISupportsArray(getter_AddRefs(m_todoobserverlist));
}
oeICalImpl::~oeICalImpl()
@ -249,15 +264,6 @@ oeICalImpl::~oeICalImpl()
#ifdef ICAL_DEBUG
printf( "oeICalImpl::~oeICalImpl()\n" );
#endif
unsigned int i;
for( i=0; i<m_observerlist.size(); i++ ) {
m_observerlist[i]->Release();
}
m_observerlist.clear();
for( i=0; i<m_todoobserverlist.size(); i++ ) {
m_todoobserverlist[i]->Release();
}
m_todoobserverlist.clear();
if( m_alarmtimer ) {
PRUint32 delay = 0;
#ifdef NS_INIT_REFCNT //A temporary way of keeping backward compatibility with Mozilla 1.0 source compile
@ -726,18 +732,25 @@ oeICalImpl::SetServer( const char *str ) {
icalfileset_free(stream);
unsigned int i;
for( i=0; i<m_observerlist.size(); i++ ) {
PRUint32 observercount;
m_observerlist->Count(&observercount);
for( i=0; i<observercount; i++ ) {
nsCOMPtr<oeIICalObserver>observer;
m_observerlist->QueryElementAt( i, NS_GET_IID(oeIICalObserver), getter_AddRefs(observer));
nsresult rv;
rv = m_observerlist[i]->OnLoad();
rv = observer->OnLoad();
#ifdef ICAL_DEBUG
if( NS_FAILED( rv ) ) {
printf( "oeICalImpl::SetServer() : WARNING Call to observer's onLoad() unsuccessful: %x\n", rv );
}
#endif
}
for( i=0; i<m_todoobserverlist.size(); i++ ) {
m_todoobserverlist->Count(&observercount);
for( i=0; i<observercount; i++ ) {
nsCOMPtr<oeIICalTodoObserver>observer;
m_todoobserverlist->QueryElementAt( i, NS_GET_IID(oeIICalTodoObserver), getter_AddRefs(observer));
nsresult rv;
rv = m_todoobserverlist[i]->OnLoad();
rv = observer->OnLoad();
#ifdef ICAL_DEBUG
if( NS_FAILED( rv ) ) {
printf( "oeICalImpl::SetServer() : WARNING Call to observer's onLoad() unsuccessful: %x\n", rv );
@ -898,9 +911,13 @@ NS_IMETHODIMP oeICalImpl::AddEvent(oeIICalEvent *icalevent,char **retid)
m_eventlist.Add( icalevent );
((oeICalEventImpl *)icalevent)->SetParent( this );
for( unsigned int i=0; i<m_observerlist.size(); i++ ) {
PRUint32 observercount;
m_observerlist->Count(&observercount);
for( unsigned int i=0; i<observercount; i++ ) {
nsCOMPtr<oeIICalObserver>observer;
m_observerlist->QueryElementAt( i, NS_GET_IID(oeIICalObserver), getter_AddRefs(observer));
nsresult rv;
rv = m_observerlist[i]->OnAddItem( icalevent );
rv = observer->OnAddItem( icalevent );
#ifdef ICAL_DEBUG
if( NS_FAILED( rv ) ) {
printf( "oeICalImpl::AddEvent() : WARNING Call to observer's onAddItem() unsuccessful: %x\n", rv );
@ -999,9 +1016,13 @@ NS_IMETHODIMP oeICalImpl::ModifyEvent(oeIICalEvent *icalevent, char **retid)
}
icalfileset_free(stream);
for( unsigned int i=0; i<m_observerlist.size(); i++ ) {
PRUint32 observercount;
m_observerlist->Count(&observercount);
for( unsigned int i=0; i<observercount; i++ ) {
nsCOMPtr<oeIICalObserver>observer;
m_observerlist->QueryElementAt( i, NS_GET_IID(oeIICalObserver), getter_AddRefs(observer));
nsresult rv;
rv = m_observerlist[i]->OnModifyItem( icalevent, oldevent );
rv = observer->OnModifyItem( icalevent, oldevent );
#ifdef ICAL_DEBUG
if( NS_FAILED( rv ) ) {
printf( "oeICalImpl::ModifyEvent() : WARNING Call to observer's onModifyItem() unsuccessful: %x\n", rv );
@ -1127,9 +1148,13 @@ oeICalImpl::DeleteEvent( const char *id )
m_eventlist.Remove( id );
for( unsigned int i=0; i<m_observerlist.size(); i++ ) {
PRUint32 observercount;
m_observerlist->Count(&observercount);
for( unsigned int i=0; i<observercount; i++ ) {
nsCOMPtr<oeIICalObserver>observer;
m_observerlist->QueryElementAt( i, NS_GET_IID(oeIICalObserver), getter_AddRefs(observer));
nsresult rv;
rv = m_observerlist[i]->OnDeleteItem( icalevent );
rv = observer->OnDeleteItem( icalevent );
#ifdef ICAL_DEBUG
if( NS_FAILED( rv ) ) {
printf( "oeICalImpl::DeleteEvent() : WARNING Call to observer's onDeleteItem() unsuccessful: %x\n", rv );
@ -1537,7 +1562,9 @@ oeICalImpl::AddObserver(oeIICalObserver *observer)
#endif
if( observer ) {
observer->AddRef();
m_observerlist.push_back( observer );
PRUint32 observercount;
m_observerlist->Count( &observercount );
m_observerlist->InsertElementAt( observer, observercount );
// observer->OnLoad();
}
return NS_OK;
@ -1550,10 +1577,14 @@ oeICalImpl::RemoveObserver(oeIICalObserver *observer)
printf( "oeICalImpl::RemoveObserver()\n" );
#endif
if( observer ) {
for( unsigned int i=0; i<m_observerlist.size(); i++ ) {
if( observer == m_observerlist[i] ) {
// m_observerlist.erase( &m_observerlist[i] );
// observer->Release();
PRUint32 observercount;
m_observerlist->Count( &observercount );
for( unsigned int i=0; i<observercount; i++ ) {
nsCOMPtr<oeIICalObserver>tmpobserver;
m_observerlist->QueryElementAt( i, NS_GET_IID(oeIICalObserver), getter_AddRefs(tmpobserver));
if( observer == tmpobserver ) {
m_observerlist->RemoveElementAt( i );
observer->Release();
break;
}
}
@ -1569,7 +1600,9 @@ oeICalImpl::AddTodoObserver(oeIICalTodoObserver *observer)
#endif
if( observer ) {
observer->AddRef();
m_todoobserverlist.push_back( observer );
PRUint32 observercount;
m_todoobserverlist->Count( &observercount );
m_todoobserverlist->InsertElementAt( observer, observercount );
// observer->OnLoad();
}
return NS_OK;
@ -1582,10 +1615,14 @@ oeICalImpl::RemoveTodoObserver(oeIICalTodoObserver *observer)
printf( "oeICalImpl::RemoveTodoObserver()\n" );
#endif
if( observer ) {
for( unsigned int i=0; i<m_todoobserverlist.size(); i++ ) {
if( observer == m_todoobserverlist[i] ) {
// m_todoobserverlist.erase( &m_todoobserverlist[i] );
// observer->Release();
PRUint32 observercount;
m_todoobserverlist->Count( &observercount );
for( unsigned int i=0; i<observercount; i++ ) {
nsCOMPtr<oeIICalObserver>tmpobserver;
m_todoobserverlist->QueryElementAt( i, NS_GET_IID(oeIICalTodoObserver), getter_AddRefs(tmpobserver));
if( observer == tmpobserver ) {
m_todoobserverlist->RemoveElementAt( i );
observer->Release();
break;
}
}
@ -1650,8 +1687,12 @@ void oeICalImpl::SetupAlarmManager() {
#endif
icaltimetype eventtime = event->CalculateEventTime( alarmtime );
eventDisplay->SetDisplayDate( ConvertToPrtime( eventtime ) );
for( unsigned int i=0; i<m_observerlist.size(); i++ ) {
rv = m_observerlist[i]->OnAlarm( eventDisplay );
PRUint32 observercount;
m_observerlist->Count( &observercount );
for( unsigned int i=0; i<observercount; i++ ) {
nsCOMPtr<oeIICalObserver>observer;
m_observerlist->QueryElementAt( i, NS_GET_IID(oeIICalObserver), getter_AddRefs(observer));
rv = observer->OnAlarm( eventDisplay );
#ifdef ICAL_DEBUG
if( NS_FAILED( rv ) ) {
printf( "oeICalImpl::SetupAlarmManager() : WARNING Call to observer's onAlarm() unsuccessful: %x\n", rv );
@ -1759,9 +1800,13 @@ NS_IMETHODIMP oeICalImpl::AddTodo(oeIICalTodo *icaltodo,char **retid)
m_todolist.Add( icaltodo );
((oeICalTodoImpl *)icaltodo)->SetParent( this );
for( unsigned int i=0; i<m_todoobserverlist.size(); i++ ) {
PRUint32 observercount;
m_todoobserverlist->Count( &observercount );
for( unsigned int i=0; i<observercount; i++ ) {
nsCOMPtr<oeIICalTodoObserver>observer;
m_todoobserverlist->QueryElementAt( i, NS_GET_IID(oeIICalTodoObserver), getter_AddRefs(observer));
nsresult rv;
rv = m_todoobserverlist[i]->OnAddItem( icaltodo );
rv = observer->OnAddItem( icaltodo );
#ifdef ICAL_DEBUG
if( NS_FAILED( rv ) ) {
printf( "oeICalImpl::AddTodo() : WARNING Call to observer's onAddItem() unsuccessful: %x\n", rv );
@ -1836,9 +1881,13 @@ oeICalImpl::DeleteTodo( const char *id )
m_todolist.Remove( id );
for( unsigned int i=0; i<m_todoobserverlist.size(); i++ ) {
PRUint32 observercount;
m_todoobserverlist->Count( &observercount );
for( unsigned int i=0; i<observercount; i++ ) {
nsCOMPtr<oeIICalTodoObserver>observer;
m_todoobserverlist->QueryElementAt( i, NS_GET_IID(oeIICalTodoObserver), getter_AddRefs(observer));
nsresult rv;
rv = m_todoobserverlist[i]->OnDeleteItem( icalevent );
rv = observer->OnDeleteItem( icalevent );
#ifdef ICAL_DEBUG
if( NS_FAILED( rv ) ) {
printf( "oeICalImpl::DeleteTodo() : WARNING Call to observer's onDeleteItem() unsuccessful: %x\n", rv );
@ -1948,9 +1997,13 @@ NS_IMETHODIMP oeICalImpl::ModifyTodo(oeIICalTodo *icalevent, char **retid)
}
icalfileset_free(stream);
for( unsigned int i=0; i<m_todoobserverlist.size(); i++ ) {
PRUint32 observercount;
m_todoobserverlist->Count( &observercount );
for( unsigned int i=0; i<observercount; i++ ) {
nsCOMPtr<oeIICalTodoObserver>observer;
m_todoobserverlist->QueryElementAt( i, NS_GET_IID(oeIICalTodoObserver), getter_AddRefs(observer));
nsresult rv;
rv = m_todoobserverlist[i]->OnModifyItem( icalevent, oldevent );
rv = observer->OnModifyItem( icalevent, oldevent );
#ifdef ICAL_DEBUG
if( NS_FAILED( rv ) ) {
printf( "oeICalImpl::ModifyTodo() : WARNING Call to observer's onModifyItem() unsuccessful: %x\n", rv );

7
calendar/libxpical/oeICalImpl.h
View File

@ -37,7 +37,6 @@
#define _OEICALIMPL_H_
#include "oeIICal.h"
#include <vector>
#include "nsITimer.h"
#include "oeICalEventImpl.h"
#include "oeICalTodoImpl.h"
@ -205,8 +204,6 @@ private:
oeDateTimeImpl *m_end;
oeDateTimeImpl *m_recurend;
icaltimetype m_lastalarmack;
std::vector<PRTime> m_exceptiondates;
std::vector<PRTime> m_snoozetimes;
int m_percent;
oeDateTimeImpl *m_due;*/
};
@ -242,8 +239,8 @@ class oeICalImpl : public oeIICal
icaltimetype GetNextEvent( icaltimetype starting );
EventList *GetEventList();
private:
std::vector<oeIICalObserver*> m_observerlist;
std::vector<oeIICalTodoObserver*> m_todoobserverlist;
nsCOMPtr<nsISupportsArray> m_observerlist;
nsCOMPtr<nsISupportsArray> m_todoobserverlist;
bool m_batchMode;
EventList m_eventlist;
TodoList m_todolist;

1
calendar/libxpical/oeICalTodoImpl.h
View File

@ -42,7 +42,6 @@
#include "nsISimpleEnumerator.h"
#include "nsISupportsPrimitives.h"
#include "nsSupportsPrimitives.h"
#include <vector>
extern "C" {
#include "ical.h"