summaryrefslogtreecommitdiffabout
path: root/libkcal
Side-by-side diff
Diffstat (limited to 'libkcal') (more/less context) (ignore whitespace changes)
-rw-r--r--libkcal/calendarlocal.cpp1
-rw-r--r--libkcal/icalformat.cpp17
-rw-r--r--libkcal/icalformat.h3
-rw-r--r--libkcal/todo.cpp7
4 files changed, 19 insertions, 9 deletions
diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp
index e37a7ad..eef8327 100644
--- a/libkcal/calendarlocal.cpp
+++ b/libkcal/calendarlocal.cpp
@@ -66,4 +66,5 @@ void CalendarLocal::init()
CalendarLocal::~CalendarLocal()
{
+ registerObserver( 0 );
if ( mDeleteIncidencesOnClose )
close();
diff --git a/libkcal/icalformat.cpp b/libkcal/icalformat.cpp
index 5877406..6f3a799 100644
--- a/libkcal/icalformat.cpp
+++ b/libkcal/icalformat.cpp
@@ -51,6 +51,7 @@ extern "C" {
using namespace KCal;
-ICalFormat::ICalFormat( )
+ICalFormat::ICalFormat( bool pe )
{
+ mProcessEvents = pe;
mImpl = new ICalFormatImpl( this );
tzOffsetMin = 0;
@@ -190,5 +191,8 @@ QString ICalFormat::toString( Calendar *cal )
icalcomponent_add_component(calendar,component);
//qDebug(" todos ");
- qApp->processEvents();
+ if ( mProcessEvents ) {
+ //qDebug("mProcessEvents ");
+ qApp->processEvents();
+ }
}
// events
@@ -199,5 +203,6 @@ QString ICalFormat::toString( Calendar *cal )
icalcomponent_add_component(calendar,component);
//qDebug("events ");
- qApp->processEvents();
+ if ( mProcessEvents )
+ qApp->processEvents();
}
@@ -209,10 +214,12 @@ QString ICalFormat::toString( Calendar *cal )
icalcomponent_add_component(calendar,component);
//qDebug("journals ");
- qApp->processEvents();
+ if ( mProcessEvents )
+ qApp->processEvents();
}
const char *text;
QString ret ="";
text = icalcomponent_as_ical_string( calendar );
- qApp->processEvents();
+ if ( mProcessEvents )
+ qApp->processEvents();
// text = "BEGIN:VCALENDAR\nPRODID\n :-//K Desktop Environment//NONSGML libkcal 3.1//EN\nVERSION\n :2.0\nBEGIN:VEVENT\nDTSTAMP\n :20031231T213514Z\nORGANIZER\n :MAILTO:lutz@putz.de\nCREATED\n :20031231T213513Z\nUID\n :libkcal-1295166342.120\nSEQUENCE\n :0\nLAST-MODIFIED\n :20031231T213513Z\nSUMMARY\n :test1\nCLASS\n :PUBLIC\nPRIORITY\n :3\nDTSTART\n :20040101T090000Z\nDTEND\n :20040101T110000Z\nTRANSP\n :OPAQUE\nEND:VEVENT\nEND:VCALENDAR\n";
diff --git a/libkcal/icalformat.h b/libkcal/icalformat.h
index 485ab6e..a770dbb 100644
--- a/libkcal/icalformat.h
+++ b/libkcal/icalformat.h
@@ -41,5 +41,5 @@ class ICalFormat : public CalFormat {
public:
/** Create new iCalendar format. */
- ICalFormat( );
+ ICalFormat( bool pe = true);
virtual ~ICalFormat();
@@ -104,4 +104,5 @@ class ICalFormat : public CalFormat {
private:
+ bool mProcessEvents;
ICalFormatImpl *mImpl;
QString mTimeZoneId;
diff --git a/libkcal/todo.cpp b/libkcal/todo.cpp
index 4ada2d8..7bf756a 100644
--- a/libkcal/todo.cpp
+++ b/libkcal/todo.cpp
@@ -67,5 +67,6 @@ void Todo::setRunningFalse( QString s )
return;
mRunning = false;
- mRunSaveTimer->stop();
+ if ( mRunSaveTimer )
+ mRunSaveTimer->stop();
saveRunningInfoToFile( s );
}
@@ -140,5 +141,5 @@ void Todo::saveRunningInfoToFile( QString comment )
}
cal.addIncidence( to );
- ICalFormat format;
+ ICalFormat format( false );
file = dir +"/" +file +".ics";
format.save( &cal, file );
@@ -168,5 +169,5 @@ void Todo::saveParents()
Todo * par = (Todo *) to->clone();
cal.addIncidence( par );
- ICalFormat format;
+ ICalFormat format( false );
format.save( &cal, file );
}