summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/searchdialog.cpp2
-rw-r--r--korganizer/searchdialog.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index 5bd7c6f..72ee1d2 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -373,23 +373,25 @@ void SearchDialog::search(const QRegExp &re)
373 if ( journ->dtStart().date() <= mEndDate->date() 373 if ( journ->dtStart().date() <= mEndDate->date()
374 &&journ->dtStart().date() >= mStartDate->date()) { 374 &&journ->dtStart().date() >= mStartDate->date()) {
375#if QT_VERSION >= 300 375#if QT_VERSION >= 300
376 if (re.search(journ->description()) != -1) 376 if (re.search(journ->description()) != -1)
377#else 377#else
378 if (re.match(journ->description()) != -1) 378 if (re.match(journ->description()) != -1)
379#endif 379#endif
380 { 380 {
381 mMatchedJournals.append(journ); 381 mMatchedJournals.append(journ);
382 continue; 382 continue;
383 } 383 }
384 } 384 }
385 } 385 }
386 } 386 }
387 387
388} 388}
389/*
389void SearchDialog::keyPressEvent ( QKeyEvent *e) 390void SearchDialog::keyPressEvent ( QKeyEvent *e)
390{ 391{
391 392
392 e->ignore(); 393 e->ignore();
393 394
394} 395}
396*/
395//mMatchedJournals; 397//mMatchedJournals;
diff --git a/korganizer/searchdialog.h b/korganizer/searchdialog.h
index a03c586..ebcff7a 100644
--- a/korganizer/searchdialog.h
+++ b/korganizer/searchdialog.h
@@ -74,20 +74,20 @@ class SearchDialog : public KDialogBase
74 74
75 QLabel *searchLabel; 75 QLabel *searchLabel;
76 QLineEdit *searchEdit; 76 QLineEdit *searchEdit;
77 KOListView *listView; 77 KOListView *listView;
78 78
79 KDateEdit *mStartDate; 79 KDateEdit *mStartDate;
80 KDateEdit *mEndDate; 80 KDateEdit *mEndDate;
81 // QCheckBox *mInclusiveCheck; 81 // QCheckBox *mInclusiveCheck;
82 QCheckBox *mSummaryCheck; 82 QCheckBox *mSummaryCheck;
83 QCheckBox *mDescriptionCheck; 83 QCheckBox *mDescriptionCheck;
84 QCheckBox *mCategoryCheck; 84 QCheckBox *mCategoryCheck;
85 QCheckBox *mSearchEvent; 85 QCheckBox *mSearchEvent;
86 QCheckBox *mSearchTodo; 86 QCheckBox *mSearchTodo;
87 QCheckBox *mSearchJournal; 87 QCheckBox *mSearchJournal;
88 QCheckBox *mSearchAName; 88 QCheckBox *mSearchAName;
89 QCheckBox *mSearchAEmail; 89 QCheckBox *mSearchAEmail;
90 void keyPressEvent ( QKeyEvent *e) ; 90 //void keyPressEvent ( QKeyEvent *e) ;
91}; 91};
92 92
93#endif 93#endif