| author | waspe <waspe> | 2003-11-03 18:28:50 (UTC) |
|---|---|---|
| committer | waspe <waspe> | 2003-11-03 18:28:50 (UTC) |
| commit | 87a9d6badcf518ffd14559ef886ff7729b63b73b (patch) (side-by-side diff) | |
| tree | 05af57bcebb8a124c2561336e4ff3dfdd52aeccb /core/pim/osearch/datebooksearch.cpp | |
| parent | 9ce566fd5b280622670cf7b0e158f9d9c54e6e9a (diff) | |
| download | opie-87a9d6badcf518ffd14559ef886ff7729b63b73b.zip opie-87a9d6badcf518ffd14559ef886ff7729b63b73b.tar.gz opie-87a9d6badcf518ffd14559ef886ff7729b63b73b.tar.bz2 | |
resolved merge conflict
Diffstat (limited to 'core/pim/osearch/datebooksearch.cpp') (more/less context) (show whitespace changes)
| -rw-r--r-- | core/pim/osearch/datebooksearch.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/pim/osearch/datebooksearch.cpp b/core/pim/osearch/datebooksearch.cpp index be2bf25..5da7ae9 100644 --- a/core/pim/osearch/datebooksearch.cpp +++ b/core/pim/osearch/datebooksearch.cpp @@ -71,17 +71,17 @@ void DatebookSearch::insertItem( void *rec ) if ( !actionShowPastEvents->isOn() && ev->endDateTime() < QDateTime::currentDateTime() && !ev->recurrence().doesRecur() ) return; if ( !actionSearchInDates->isOn() && ( ev->lastHitField() == Qtopia::StartDateTime || ev->lastHitField() == Qtopia::EndDateTime ) ) return; - (void)new EventItem( this, ev ); + new EventItem( this, ev ); _resultCount++; } QPopupMenu* DatebookSearch::popupMenu() { if (!_popupMenu){ _popupMenu = new QPopupMenu( 0 ); actionShowPastEvents->addTo( _popupMenu ); |