author | zautrix <zautrix> | 2005-06-25 01:34:43 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-06-25 01:34:43 (UTC) |
commit | ab93fa0a7cd97beada9475f6099bf6083547f0d6 (patch) (unidiff) | |
tree | c983cb818528cac200a98585b3451c0371389e52 | |
parent | ce9c31a057f12a8d6a126a7312e4ecaf3270da50 (diff) | |
download | kdepimpi-ab93fa0a7cd97beada9475f6099bf6083547f0d6.zip kdepimpi-ab93fa0a7cd97beada9475f6099bf6083547f0d6.tar.gz kdepimpi-ab93fa0a7cd97beada9475f6099bf6083547f0d6.tar.bz2 |
fixxx
-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 | |||
@@ -334,7 +334,5 @@ void SearchDialog::updateView() | |||
334 | void SearchDialog::search(const QRegExp &re) | 334 | 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() ) { |
340 | if ( mRefineItems->isChecked() ) events = mMatchedEvents; | 338 | if ( mRefineItems->isChecked() ) events = mMatchedEvents; |
@@ -342,4 +340,10 @@ void SearchDialog::search(const QRegExp &re) | |||
342 | } | 340 | } |
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; |
345 | for(ev=events.first();ev;ev=events.next()) { | 349 | for(ev=events.first();ev;ev=events.next()) { |
@@ -447,5 +451,5 @@ void SearchDialog::search(const QRegExp &re) | |||
447 | } | 451 | } |
448 | } | 452 | } |
449 | QPtrList<Todo> todos = mCalendar->todos( ); | 453 | QPtrList<Todo> todos; |
450 | 454 | ||
451 | if ( !mAddItems->isChecked() && !mSubItems->isChecked() ) { | 455 | if ( !mAddItems->isChecked() && !mSubItems->isChecked() ) { |
@@ -455,4 +459,5 @@ void SearchDialog::search(const QRegExp &re) | |||
455 | 459 | ||
456 | if ( mSearchTodo->isChecked() ) { | 460 | if ( mSearchTodo->isChecked() ) { |
461 | if ( !mRefineItems->isChecked() ) todos = mCalendar->todos( ); | ||
457 | Todo *tod; | 462 | Todo *tod; |
458 | for(tod=todos.first();tod;tod=todos.next()) { | 463 | for(tod=todos.first();tod;tod=todos.next()) { |
@@ -536,5 +541,5 @@ void SearchDialog::search(const QRegExp &re) | |||
536 | } | 541 | } |
537 | 542 | ||
538 | QPtrList<Journal> journals = mCalendar->journals( ); | 543 | QPtrList<Journal> journals; |
539 | if ( !mAddItems->isChecked() && !mSubItems->isChecked() ) { | 544 | if ( !mAddItems->isChecked() && !mSubItems->isChecked() ) { |
540 | if ( mRefineItems->isChecked() ) journals = mMatchedJournals ; | 545 | if ( mRefineItems->isChecked() ) journals = mMatchedJournals ; |
@@ -542,4 +547,5 @@ void SearchDialog::search(const QRegExp &re) | |||
542 | } | 547 | } |
543 | if (mSearchJournal->isChecked() ) { | 548 | if (mSearchJournal->isChecked() ) { |
549 | if ( ! mRefineItems->isChecked() ) journals = mCalendar->journals(); | ||
544 | Journal* journ; | 550 | Journal* journ; |
545 | 551 | ||