| author | waspe <waspe> | 2003-11-03 18:35:45 (UTC) |
|---|---|---|
| committer | waspe <waspe> | 2003-11-03 18:35:45 (UTC) |
| commit | c0fe2d62abe68de74de6b8bf91635c1cdaf5d239 (patch) (side-by-side diff) | |
| tree | 396acfe28669ac49037fef03d39f8c0e1d038562 | |
| parent | 3a7d9b9ed8f9cf9c7e3d02f9239f327b2b652b0c (diff) | |
| download | opie-c0fe2d62abe68de74de6b8bf91635c1cdaf5d239.zip opie-c0fe2d62abe68de74de6b8bf91635c1cdaf5d239.tar.gz opie-c0fe2d62abe68de74de6b8bf91635c1cdaf5d239.tar.bz2 | |
reolved merge conflict
| -rw-r--r-- | core/pim/osearch/doclnksearch.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/pim/osearch/doclnksearch.cpp b/core/pim/osearch/doclnksearch.cpp index 3428798..ef0e482 100644 --- a/core/pim/osearch/doclnksearch.cpp +++ b/core/pim/osearch/doclnksearch.cpp @@ -67,25 +67,27 @@ bool DocLnkSearch::searchFile( AppLnk *app ) if (_search.match( t.readLine()) != -1) { found = true; break; } } f.close(); } return found; } void DocLnkSearch::insertItem( void *rec ) { (void)new DocLnkItem( this, (DocLnk*)rec ); _resultCount++; } QPopupMenu* DocLnkSearch::popupMenu() { if (!_popupMenu){ _popupMenu = new QPopupMenu( 0 ); actionSearchInFiles->addTo( _popupMenu ); } return _popupMenu; + (void) new DocLnkItem( this, (DocLnk*)rec ); + _resultCount++; } |