-rw-r--r-- | korganizer/koeditorrecurrence.cpp | 12 | ||||
-rw-r--r-- | korganizer/koeditorrecurrence.h | 3 | ||||
-rw-r--r-- | libkcal/calendarlocal.cpp | 2 | ||||
-rw-r--r-- | libkcal/icalformatimpl.cpp | 9 | ||||
-rw-r--r-- | libkcal/journal.cpp | 2 |
5 files changed, 20 insertions, 8 deletions
diff --git a/korganizer/koeditorrecurrence.cpp b/korganizer/koeditorrecurrence.cpp index 89504db..0e74a99 100644 --- a/korganizer/koeditorrecurrence.cpp +++ b/korganizer/koeditorrecurrence.cpp @@ -519,8 +519,8 @@ RecurrenceRangeWidget::RecurrenceRangeWidget( QWidget *parent, rangeLayout->addWidget( mStartDateLabel ); - QButtonGroup *rangeButtonGroup = new QButtonGroup; + mRangeButtonGroup = new QButtonGroup; mNoEndDateButton = new QRadioButton( i18n("No ending date"), rangeBox ); - rangeButtonGroup->insert( mNoEndDateButton ); + mRangeButtonGroup->insert( mNoEndDateButton ); rangeLayout->addWidget( mNoEndDateButton ); @@ -529,5 +529,5 @@ RecurrenceRangeWidget::RecurrenceRangeWidget( QWidget *parent, mEndDurationButton = new QRadioButton( i18n("End after"), rangeBox ); - rangeButtonGroup->insert( mEndDurationButton ); + mRangeButtonGroup->insert( mEndDurationButton ); durationLayout->addWidget( mEndDurationButton ); @@ -542,5 +542,5 @@ RecurrenceRangeWidget::RecurrenceRangeWidget( QWidget *parent, mEndDateButton = new QRadioButton( i18n("End by:"), rangeBox ); - rangeButtonGroup->insert( mEndDateButton ); + mRangeButtonGroup->insert( mEndDateButton ); endDateLayout->addWidget( mEndDateButton ); @@ -558,4 +558,8 @@ 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 @@ -34,4 +34,5 @@ #include <qlistview.h> #include <qradiobutton.h> +#include <qbuttongroup.h> #include <kdialogbase.h> @@ -218,4 +219,5 @@ class RecurrenceRangeWidget : public QWidget, public RecurrenceRangeBase public: RecurrenceRangeWidget( QWidget *parent = 0, const char *name = 0 ); + ~RecurrenceRangeWidget(); void setDefaults( const QDateTime &from ); @@ -234,4 +236,5 @@ class RecurrenceRangeWidget : public QWidget, public RecurrenceRangeBase private: + QButtonGroup *mRangeButtonGroup; QGroupBox *mRangeGroupBox; QLabel *mStartDateLabel; diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp index eef8327..5baa7dc 100644 --- a/libkcal/calendarlocal.cpp +++ b/libkcal/calendarlocal.cpp @@ -257,5 +257,5 @@ void CalendarLocal::close() mEventList.setAutoDelete( true ); mTodoList.setAutoDelete( true ); - mJournalList.setAutoDelete( false ); + mJournalList.setAutoDelete( true ); mEventList.clear(); diff --git a/libkcal/icalformatimpl.cpp b/libkcal/icalformatimpl.cpp index f349681..53aa039 100644 --- a/libkcal/icalformatimpl.cpp +++ b/libkcal/icalformatimpl.cpp @@ -1945,5 +1945,6 @@ bool ICalFormatImpl::populate( Calendar *cal, icalcomponent *calendar) // kdDebug(5800) << "----Todo found" << endl; 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); } @@ -1954,5 +1955,6 @@ bool ICalFormatImpl::populate( Calendar *cal, icalcomponent *calendar) // kdDebug(5800) << "----Event found" << endl; 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); } @@ -1963,5 +1965,6 @@ bool ICalFormatImpl::populate( Calendar *cal, icalcomponent *calendar) // kdDebug(5800) << "----Journal found" << endl; 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 @@ -25,8 +25,10 @@ using namespace KCal; Journal::Journal() { + qDebug("New JJJ "); } Journal::~Journal() { + qDebug("delete JJJ "); } |