From ab93fa0a7cd97beada9475f6099bf6083547f0d6 Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Sat, 25 Jun 2005 01:34:43 +0000
Subject: fixxx

---
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index 0713980..2390520 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -333,14 +333,18 @@ void SearchDialog::updateView()
 
 void SearchDialog::search(const QRegExp &re)
 {
-    QPtrList<Event> events = mCalendar->events( mStartDate->date(),
-                                                mEndDate->date(),
-                                                false /*mInclusiveCheck->isChecked()*/ );
+    QPtrList<Event> events;
     if ( !mAddItems->isChecked() && !mSubItems->isChecked() ) {
         if ( mRefineItems->isChecked() ) events = mMatchedEvents;
         mMatchedEvents.clear();
     } 
     if ( mSearchEvent->isChecked() ) {
+        if ( !mRefineItems->isChecked() )
+            events = mCalendar->events( mStartDate->date(),
+                                                mEndDate->date(),
+                                                false /*mInclusiveCheck->isChecked()*/ );
+
+
         Event *ev;
         for(ev=events.first();ev;ev=events.next()) {
             if (mSummaryCheck->isChecked()) {
@@ -446,7 +450,7 @@ void SearchDialog::search(const QRegExp &re)
             }
         }
     }
-    QPtrList<Todo> todos = mCalendar->todos( ); 
+    QPtrList<Todo> todos;
 
     if ( !mAddItems->isChecked() && !mSubItems->isChecked() ) {
         if ( mRefineItems->isChecked() ) todos = mMatchedTodos ;
@@ -454,6 +458,7 @@ void SearchDialog::search(const QRegExp &re)
     } 
 
     if ( mSearchTodo->isChecked() ) {
+        if ( !mRefineItems->isChecked() ) todos = mCalendar->todos( );
         Todo *tod;
         for(tod=todos.first();tod;tod=todos.next()) {
             if (mSummaryCheck->isChecked()) {
@@ -535,12 +540,13 @@ void SearchDialog::search(const QRegExp &re)
         }
     }
 
-    QPtrList<Journal> journals = mCalendar->journals( );
+    QPtrList<Journal> journals;
     if ( !mAddItems->isChecked() && !mSubItems->isChecked() ) {
         if ( mRefineItems->isChecked() ) journals = mMatchedJournals ;
         mMatchedJournals.clear();
     } 
     if (mSearchJournal->isChecked() ) {
+        if ( ! mRefineItems->isChecked() ) journals = mCalendar->journals();
         Journal* journ;
         
         for(journ=journals.first();journ;journ=journals.next()) {
--
cgit v0.9.0.2