diff options
| author | Michele Calgaro <[email protected]> | 2015-01-15 07:59:16 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2015-01-15 07:59:56 +0900 |
| commit | de95f20e975053e910c1291974dd0c9acc716b97 (patch) | |
| tree | f2344641903bd68b5d1c1937392d8df6b6883634 | |
| parent | 3571ae9bf72aa98f38d1c7e96c799bf2aff4393e (diff) | |
| download | tdelibs-de95f20e975053e910c1291974dd0c9acc716b97.tar.gz tdelibs-de95f20e975053e910c1291974dd0c9acc716b97.zip | |
Minor code clean up.
Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 98e72add315583a49ea7fb8f63e408ea041ac8d9)
Signed-off-by: Michele Calgaro <[email protected]>
| -rw-r--r-- | tdeui/kiconviewsearchline.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/tdeui/kiconviewsearchline.cpp b/tdeui/kiconviewsearchline.cpp index 892e80442..77b8082ea 100644 --- a/tdeui/kiconviewsearchline.cpp +++ b/tdeui/kiconviewsearchline.cpp @@ -91,15 +91,11 @@ TQIconView *TDEIconViewSearchLine::iconView() const *****************************************************************************/ void TDEIconViewSearchLine::updateSearch( const TQString &s ) { - long original_count; - int original_hiddenListChanged; - if( ! d->iconView ) - return; // disabled + return; - TQString search = d->search = s.isNull() ? text() : s; + d->search = s.isNull() ? text() : s; TQIconViewItem *currentItem = d->iconView->currentItem(); - TQIconViewItem *item = NULL; // Remove Non-Matching items, add them to the hidden list @@ -107,7 +103,7 @@ void TDEIconViewSearchLine::updateSearch( const TQString &s ) while ( i != NULL ) { item = i; i = i->nextItem(); // Point to next, otherwise will loose it. - if ( ! itemMatches( item, search ) ) { + if ( ! itemMatches( item, d->search ) ) { hideItem( item ); if ( item == currentItem ) @@ -118,8 +114,7 @@ void TDEIconViewSearchLine::updateSearch( const TQString &s ) } } - d->iconView->sort(); - //d->iconView->arrangeItemsInGrid(true); // Already done inside the sort() routine + d->iconView->sort(); // This also arranges items in grid if ( currentItem != NULL ) d->iconView->ensureItemVisible( currentItem ); |