-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 | 11 | ||||
-rw-r--r-- | libkcal/journal.cpp | 2 |
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, | |||
520 | 520 | ||
521 | QButtonGroup *rangeButtonGroup = new QButtonGroup; | 521 | mRangeButtonGroup = new QButtonGroup; |
522 | 522 | ||
523 | mNoEndDateButton = new QRadioButton( i18n("No ending date"), rangeBox ); | 523 | mNoEndDateButton = new QRadioButton( i18n("No ending date"), rangeBox ); |
524 | rangeButtonGroup->insert( mNoEndDateButton ); | 524 | mRangeButtonGroup->insert( mNoEndDateButton ); |
525 | rangeLayout->addWidget( mNoEndDateButton ); | 525 | rangeLayout->addWidget( mNoEndDateButton ); |
@@ -530,3 +530,3 @@ RecurrenceRangeWidget::RecurrenceRangeWidget( QWidget *parent, | |||
530 | mEndDurationButton = new QRadioButton( i18n("End after"), rangeBox ); | 530 | mEndDurationButton = new QRadioButton( i18n("End after"), rangeBox ); |
531 | rangeButtonGroup->insert( mEndDurationButton ); | 531 | mRangeButtonGroup->insert( mEndDurationButton ); |
532 | durationLayout->addWidget( mEndDurationButton ); | 532 | durationLayout->addWidget( mEndDurationButton ); |
@@ -543,3 +543,3 @@ RecurrenceRangeWidget::RecurrenceRangeWidget( QWidget *parent, | |||
543 | mEndDateButton = new QRadioButton( i18n("End by:"), rangeBox ); | 543 | mEndDateButton = new QRadioButton( i18n("End by:"), rangeBox ); |
544 | rangeButtonGroup->insert( mEndDateButton ); | 544 | mRangeButtonGroup->insert( mEndDateButton ); |
545 | endDateLayout->addWidget( mEndDateButton ); | 545 | endDateLayout->addWidget( mEndDateButton ); |
@@ -559,2 +559,6 @@ RecurrenceRangeWidget::RecurrenceRangeWidget( QWidget *parent, | |||
559 | 559 | ||
560 | RecurrenceRangeWidget::~RecurrenceRangeWidget() | ||
561 | { | ||
562 | delete mRangeButtonGroup; | ||
563 | } | ||
560 | void RecurrenceRangeWidget::setDefaults( const QDateTime &from ) | 564 | 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 @@ | |||
35 | #include <qradiobutton.h> | 35 | #include <qradiobutton.h> |
36 | #include <qbuttongroup.h> | ||
36 | 37 | ||
@@ -219,2 +220,3 @@ class RecurrenceRangeWidget : public QWidget, public RecurrenceRangeBase | |||
219 | RecurrenceRangeWidget( QWidget *parent = 0, const char *name = 0 ); | 220 | RecurrenceRangeWidget( QWidget *parent = 0, const char *name = 0 ); |
221 | ~RecurrenceRangeWidget(); | ||
220 | 222 | ||
@@ -235,2 +237,3 @@ class RecurrenceRangeWidget : public QWidget, public RecurrenceRangeBase | |||
235 | private: | 237 | private: |
238 | QButtonGroup *mRangeButtonGroup; | ||
236 | QGroupBox *mRangeGroupBox; | 239 | 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() | |||
258 | mTodoList.setAutoDelete( true ); | 258 | mTodoList.setAutoDelete( true ); |
259 | mJournalList.setAutoDelete( false ); | 259 | mJournalList.setAutoDelete( true ); |
260 | 260 | ||
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) | |||
1004 | break; | 1004 | break; |
1005 | 1005 | ||
1006 | default: | 1006 | default: |
@@ -1946,3 +1946,4 @@ bool ICalFormatImpl::populate( Calendar *cal, icalcomponent *calendar) | |||
1946 | Todo *todo = readTodo(c); | 1946 | Todo *todo = readTodo(c); |
1947 | if (!cal->todo(todo->uid())) cal->addTodo(todo); | 1947 | if (!cal->todo(todo->uid())) |
1948 | cal->addTodo(todo); | ||
1948 | c = icalcomponent_get_next_component(calendar,ICAL_VTODO_COMPONENT); | 1949 | c = icalcomponent_get_next_component(calendar,ICAL_VTODO_COMPONENT); |
@@ -1955,3 +1956,4 @@ bool ICalFormatImpl::populate( Calendar *cal, icalcomponent *calendar) | |||
1955 | Event *event = readEvent(c); | 1956 | Event *event = readEvent(c); |
1956 | if (!cal->event(event->uid())) cal->addEvent(event); | 1957 | if (!cal->event(event->uid())) |
1958 | cal->addEvent(event); | ||
1957 | c = icalcomponent_get_next_component(calendar,ICAL_VEVENT_COMPONENT); | 1959 | c = icalcomponent_get_next_component(calendar,ICAL_VEVENT_COMPONENT); |
@@ -1964,3 +1966,4 @@ bool ICalFormatImpl::populate( Calendar *cal, icalcomponent *calendar) | |||
1964 | Journal *journal = readJournal(c); | 1966 | Journal *journal = readJournal(c); |
1965 | if (!cal->journal(journal->uid())) cal->addJournal(journal); | 1967 | if (!cal->journal(journal->uid())) |
1968 | cal->addJournal(journal); | ||
1966 | c = icalcomponent_get_next_component(calendar,ICAL_VJOURNAL_COMPONENT); | 1969 | 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() | |||
26 | { | 26 | { |
27 | qDebug("New JJJ "); | ||
27 | } | 28 | } |
@@ -30,2 +31,3 @@ Journal::~Journal() | |||
30 | { | 31 | { |
32 | qDebug("delete JJJ "); | ||
31 | } | 33 | } |