-rw-r--r-- | korganizer/searchdialog.cpp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp index 0713980..2390520 100644 --- a/korganizer/searchdialog.cpp +++ b/korganizer/searchdialog.cpp | |||
@@ -335,5 +335,3 @@ void SearchDialog::search(const QRegExp &re) | |||
335 | { | 335 | { |
336 | QPtrList<Event> events = mCalendar->events( mStartDate->date(), | 336 | QPtrList<Event> events; |
337 | mEndDate->date(), | ||
338 | false /*mInclusiveCheck->isChecked()*/ ); | ||
339 | if ( !mAddItems->isChecked() && !mSubItems->isChecked() ) { | 337 | if ( !mAddItems->isChecked() && !mSubItems->isChecked() ) { |
@@ -343,2 +341,8 @@ void SearchDialog::search(const QRegExp &re) | |||
343 | if ( mSearchEvent->isChecked() ) { | 341 | if ( mSearchEvent->isChecked() ) { |
342 | if ( !mRefineItems->isChecked() ) | ||
343 | events = mCalendar->events( mStartDate->date(), | ||
344 | mEndDate->date(), | ||
345 | false /*mInclusiveCheck->isChecked()*/ ); | ||
346 | |||
347 | |||
344 | Event *ev; | 348 | Event *ev; |
@@ -448,3 +452,3 @@ void SearchDialog::search(const QRegExp &re) | |||
448 | } | 452 | } |
449 | QPtrList<Todo> todos = mCalendar->todos( ); | 453 | QPtrList<Todo> todos; |
450 | 454 | ||
@@ -456,2 +460,3 @@ void SearchDialog::search(const QRegExp &re) | |||
456 | if ( mSearchTodo->isChecked() ) { | 460 | if ( mSearchTodo->isChecked() ) { |
461 | if ( !mRefineItems->isChecked() ) todos = mCalendar->todos( ); | ||
457 | Todo *tod; | 462 | Todo *tod; |
@@ -537,3 +542,3 @@ void SearchDialog::search(const QRegExp &re) | |||
537 | 542 | ||
538 | QPtrList<Journal> journals = mCalendar->journals( ); | 543 | QPtrList<Journal> journals; |
539 | if ( !mAddItems->isChecked() && !mSubItems->isChecked() ) { | 544 | if ( !mAddItems->isChecked() && !mSubItems->isChecked() ) { |
@@ -543,2 +548,3 @@ void SearchDialog::search(const QRegExp &re) | |||
543 | if (mSearchJournal->isChecked() ) { | 548 | if (mSearchJournal->isChecked() ) { |
549 | if ( ! mRefineItems->isChecked() ) journals = mCalendar->journals(); | ||
544 | Journal* journ; | 550 | Journal* journ; |