summaryrefslogtreecommitdiffabout
path: root/korganizer/searchdialog.cpp
Side-by-side diff
Diffstat (limited to 'korganizer/searchdialog.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/searchdialog.cpp16
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
@@ -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()) {