fixx

5 files changed, 21 insertions, 9 deletions

diff --git a/korganizer/koeditorrecurrence.cpp b/korganizer/koeditorrecurrence.cpp
index 89504db..0e74a99 100644
--- a/korganizer/koeditorrecurrence.cpp
+++ b/korganizer/koeditorrecurrence.cpp
@@ -520,6 +520,6 @@ RecurrenceRangeWidget::RecurrenceRangeWidget( QWidget *parent,
 
-  QButtonGroup *rangeButtonGroup = new QButtonGroup;
+  mRangeButtonGroup = new QButtonGroup;
 
   mNoEndDateButton = new QRadioButton( i18n("No ending date"), rangeBox );
-  rangeButtonGroup->insert( mNoEndDateButton );
+  mRangeButtonGroup->insert( mNoEndDateButton );
   rangeLayout->addWidget( mNoEndDateButton );
@@ -530,3 +530,3 @@ RecurrenceRangeWidget::RecurrenceRangeWidget( QWidget *parent,
   mEndDurationButton = new QRadioButton( i18n("End after"), rangeBox );
-  rangeButtonGroup->insert( mEndDurationButton );
+  mRangeButtonGroup->insert( mEndDurationButton );
   durationLayout->addWidget( mEndDurationButton );
@@ -543,3 +543,3 @@ RecurrenceRangeWidget::RecurrenceRangeWidget( QWidget *parent,
   mEndDateButton = new QRadioButton( i18n("End by:"), rangeBox );
-  rangeButtonGroup->insert( mEndDateButton );
+  mRangeButtonGroup->insert( mEndDateButton );
   endDateLayout->addWidget( mEndDateButton );
@@ -559,2 +559,6 @@ RecurrenceRangeWidget::RecurrenceRangeWidget( QWidget *parent,
 
+RecurrenceRangeWidget::~RecurrenceRangeWidget()
+{
+    delete mRangeButtonGroup;
+}
 void RecurrenceRangeWidget::setDefaults( const QDateTime &from  )
diff --git a/korganizer/koeditorrecurrence.h b/korganizer/koeditorrecurrence.h
index f398f62..75e0c73 100644
--- a/korganizer/koeditorrecurrence.h
+++ b/korganizer/koeditorrecurrence.h
@@ -35,2 +35,3 @@
 #include <qradiobutton.h>
+#include <qbuttongroup.h>
 
@@ -219,2 +220,3 @@ class RecurrenceRangeWidget : public QWidget, public RecurrenceRangeBase
     RecurrenceRangeWidget( QWidget *parent = 0, const char *name = 0 );
+    ~RecurrenceRangeWidget();
 
@@ -235,2 +237,3 @@ class RecurrenceRangeWidget : public QWidget, public RecurrenceRangeBase
   private:
+    QButtonGroup *mRangeButtonGroup;
     QGroupBox *mRangeGroupBox;
diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp
index eef8327..5baa7dc 100644
--- a/libkcal/calendarlocal.cpp
+++ b/libkcal/calendarlocal.cpp
@@ -258,3 +258,3 @@ void CalendarLocal::close()
   mTodoList.setAutoDelete( true );
-  mJournalList.setAutoDelete( false );
+  mJournalList.setAutoDelete( true );
 
diff --git a/libkcal/icalformatimpl.cpp b/libkcal/icalformatimpl.cpp
index f349681..53aa039 100644
--- a/libkcal/icalformatimpl.cpp
+++ b/libkcal/icalformatimpl.cpp
@@ -1004,3 +1004,3 @@ FreeBusy *ICalFormatImpl::readFreeBusy(icalcomponent *vfreebusy)
         break;
-
+        
       default:
@@ -1946,3 +1946,4 @@ bool ICalFormatImpl::populate( Calendar *cal, icalcomponent *calendar)
     Todo *todo = readTodo(c);
-    if (!cal->todo(todo->uid())) cal->addTodo(todo);
+    if (!cal->todo(todo->uid())) 
+        cal->addTodo(todo);
     c = icalcomponent_get_next_component(calendar,ICAL_VTODO_COMPONENT);
@@ -1955,3 +1956,4 @@ bool ICalFormatImpl::populate( Calendar *cal, icalcomponent *calendar)
     Event *event = readEvent(c);
-    if (!cal->event(event->uid())) cal->addEvent(event);
+    if (!cal->event(event->uid())) 
+        cal->addEvent(event);
     c = icalcomponent_get_next_component(calendar,ICAL_VEVENT_COMPONENT);
@@ -1964,3 +1966,4 @@ bool ICalFormatImpl::populate( Calendar *cal, icalcomponent *calendar)
     Journal *journal = readJournal(c);
-    if (!cal->journal(journal->uid())) cal->addJournal(journal);
+    if (!cal->journal(journal->uid()))
+        cal->addJournal(journal);
     c = icalcomponent_get_next_component(calendar,ICAL_VJOURNAL_COMPONENT);
diff --git a/libkcal/journal.cpp b/libkcal/journal.cpp
index 859161f..c4e4474 100644
--- a/libkcal/journal.cpp
+++ b/libkcal/journal.cpp
@@ -26,2 +26,3 @@ Journal::Journal()
 {
+    qDebug("New JJJ ");
 }
@@ -30,2 +31,3 @@ Journal::~Journal()
 {
+    qDebug("delete JJJ ");
 }