| author | zautrix <zautrix> | 2005-07-10 00:09:04 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2005-07-10 00:09:04 (UTC) |
| commit | 2d1e1fe5d290503db8c0462fc294f5c04f58e95c (patch) (unidiff) | |
| tree | ffb1ba581d7a766cb736d42d43dad88a54dabdfd /korganizer | |
| parent | 2aabde6c21d6dc4f9de8cf3ac17b98053961cc6b (diff) | |
| download | kdepimpi-2d1e1fe5d290503db8c0462fc294f5c04f58e95c.zip kdepimpi-2d1e1fe5d290503db8c0462fc294f5c04f58e95c.tar.gz kdepimpi-2d1e1fe5d290503db8c0462fc294f5c04f58e95c.tar.bz2 | |
fixxx
| -rw-r--r-- | korganizer/calendarview.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index f9685e9..ab69158 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
| @@ -679,3 +679,5 @@ void CalendarView::nextConflict( bool all, bool allday ) | |||
| 679 | bool skip = false; | 679 | bool skip = false; |
| 680 | topLevelWidget()->setCaption( i18n("Checking conflicts ... please wait") ); | ||
| 680 | while ( test ) { | 681 | while ( test ) { |
| 682 | qApp->processEvents(); | ||
| 681 | skip = false; | 683 | skip = false; |
| @@ -2770,6 +2772,3 @@ void CalendarView::checkConflictForEvent() | |||
| 2770 | if ( ! mConflictingEvent ) return; | 2772 | if ( ! mConflictingEvent ) return; |
| 2771 | if ( mConflictingEvent->isHoliday() || mConflictingEvent->isBirthday() || mConflictingEvent->isAnniversary() ) { | 2773 | topLevelWidget()->setCaption( i18n("Checking conflicts ... please wait") ); |
| 2772 | mConflictingEvent = 0; | ||
| 2773 | return; | ||
| 2774 | } | ||
| 2775 | QPtrList<Event> testlist = mCalendar->events(); | 2774 | QPtrList<Event> testlist = mCalendar->events(); |
| @@ -2782,2 +2781,3 @@ void CalendarView::checkConflictForEvent() | |||
| 2782 | while ( test ) { | 2781 | while ( test ) { |
| 2782 | qApp->processEvents(); | ||
| 2783 | if ( !test->doesFloat() ) { | 2783 | if ( !test->doesFloat() ) { |