refactoring.

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/kita/kita/trunk@1733 56b19765-1e22-0410-a548-a0f45d66c51a

diff --git a/kita/src/board/threadlistview.cpp b/kita/src/board/threadlistview.cpp
index a2a98dd..b985403 100644 (file)
--- a/kita/src/board/threadlistview.cpp
+++ b/kita/src/board/threadlistview.cpp
@@ -90,7 +90,15 @@ void ThreadListView::slotSearchButton()
 {
     insertSearchCombo();
     QStringList list = parseSearchQuery( SearchCombo->currentText() );
-    searchNext( list );
+    
+    if ( list.isEmpty() ) return;
+    
+    if ( list != m_prevquery ) {
+        searchNew( list );
+        slotHideButton( HideButton->isOn() );
+    } else {
+        searchNext( list );
+    }
 }
 
 void ThreadListView::insertSearchCombo()
@@ -118,21 +126,13 @@ QStringList ThreadListView::parseSearchQuery( const QString &input )
 
 void ThreadListView::searchNext( const QStringList &query )
 {
-    if ( query.isEmpty() ) return ;
-
-    if ( query != m_prevquery ) {
-        searchNew( query );
-        slotHideButton( HideButton->isOn() );
-        return ;
-    }
-
-    if ( m_nextHitIndex >= m_hitList.size() ) {
-        return ;
-    }
+    Q_ASSERT( query == m_prevquery );
+    Q_ASSERT( m_nextHitIndex < m_hitList.size() );
 
     KListViewItem* item = m_hitList[ m_nextHitIndex ];
     subjectList->ensureItemVisible( item );
     subjectList->setSelected( item, true );
+    
     m_nextHitIndex++;
     if ( m_nextHitIndex >= m_hitList.size() ) m_nextHitIndex = 0;
 }