refactoring.

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

diff --git a/kita/src/board/threadlistview.cpp b/kita/src/board/threadlistview.cpp
index e87485b..9255228 100644 (file)
--- a/kita/src/board/threadlistview.cpp
+++ b/kita/src/board/threadlistview.cpp
@@ -24,6 +24,7 @@
 #include "libkita/kitaconfig.h"
 #include "libkita/signalcollection.h"
 #include "libkita/config_xt.h"
+#include "libkita/kita_misc.h"
 
 #include "threadlistviewitem.h"
 
@@ -92,7 +93,7 @@ ThreadListView::~ThreadListView()
 void ThreadListView::slotSearchButton()
 {
     insertSearchCombo();
-    QStringList list = parseSearchQuery( SearchCombo->currentText() );
+    QStringList list = Kita::parseSearchQuery( SearchCombo->currentText() );
 
     if ( list.isEmpty() ) {
         clearSearch();    
@@ -114,19 +115,6 @@ void ThreadListView::insertSearchCombo()
     SearchCombo->insertItem( SearchCombo->currentText() );
 }
 
-QStringList ThreadListView::parseSearchQuery( const QString &input )
-{
-    QStringList tmp = QStringList::split( ' ', input );
-    QStringList ret_list;
-    QRegExp truncSpace( "\\s*$" );
-    QStringList::iterator it = tmp.begin();
-
-    for ( ; it != tmp.end(); ++it ) {
-        ret_list += ( *it ).replace( truncSpace, "" );
-    }
-    return ret_list;
-}
-
 void ThreadListView::searchNext( const QStringList &query )
 {
     Q_ASSERT( query == m_prevquery );

diff --git a/kita/src/board/threadlistview.h b/kita/src/board/threadlistview.h
index d78c462..55dc5a2 100644 (file)
--- a/kita/src/board/threadlistview.h
+++ b/kita/src/board/threadlistview.h
@@ -45,7 +45,6 @@ namespace Kita
         QValueList<KListViewItem *> m_hitList;
 
         void insertSearchCombo();
-        QStringList parseSearchQuery( const QString& input );
         void searchNext( const QStringList& input );
         void searchNew( const QStringList& query );
         void clearSearch();

diff --git a/kita/src/libkita/kita_misc.cpp b/kita/src/libkita/kita_misc.cpp
index b6f1d21..690ce2f 100644 (file)
--- a/kita/src/libkita/kita_misc.cpp
+++ b/kita/src/libkita/kita_misc.cpp
@@ -494,6 +494,17 @@ int Kita::stringToPositiveNum( const QChar *cdat, const unsigned int length )
 
 /* internal parsing functions  */
 
+QStringList Kita::parseSearchQuery( const QString& input )
+{
+    QStringList tmp = QStringList::split( ' ', input );
+    QStringList ret_list;
+    QRegExp truncSpace( "\\s*$" );
+    QStringList::iterator it = tmp.begin();
+    for ( ; it != tmp.end(); ++it )
+        ret_list += ( *it ).replace( truncSpace, "" );
+    return ret_list;
+}
+
 
 /* for Machi BBS */
 

diff --git a/kita/src/libkita/kita_misc.h b/kita/src/libkita/kita_misc.h
index aa57dbf..55a45f3 100644 (file)
--- a/kita/src/libkita/kita_misc.h
+++ b/kita/src/libkita/kita_misc.h
@@ -71,6 +71,7 @@ namespace Kita
 
     /*------------------------------*/
     /* internal parsing funtions */
+    QStringList parseSearchQuery( const QString& input );
 
 
     /* for MACHI BBS */

diff --git a/kita/src/thread/threadview.cpp b/kita/src/thread/threadview.cpp
index 892392c..1d59baa 100644 (file)
--- a/kita/src/thread/threadview.cpp
+++ b/kita/src/thread/threadview.cpp
@@ -266,18 +266,6 @@ void KitaThreadView::insertSearchCombo()
     SearchCombo->insertItem( SearchCombo->currentText() );
 }
 
-QStringList KitaThreadView::parseSearchQuery( const QString& input ) const
-{
-    QStringList tmp = QStringList::split( ' ', input );
-    QStringList ret_list;
-    QRegExp truncSpace( "\\s*$" );
-    QStringList::iterator it = tmp.begin();
-    for ( ; it != tmp.end(); ++it )
-        ret_list += ( *it ).replace( truncSpace, "" );
-    return ret_list;
-}
-
-
 void KitaThreadView::slotPopupMenu( KXMLGUIClient* client, const QPoint& global, const KURL& url, const QString& mimeType, mode_t mode )
 {
     KActionCollection * collection = client->actionCollection();
@@ -690,7 +678,7 @@ void KitaThreadView::slotSearchPrivate( bool rev )
             if ( m_viewmode == VIEWMODE_MAINVIEW ) m_threadPart->showAll();
 
             insertSearchCombo();
-            QStringList list = parseSearchQuery( SearchCombo->currentText() );
+            QStringList list = Kita::parseSearchQuery( SearchCombo->currentText() );
             m_threadPart->findText( SearchCombo->currentText(), rev );
             SearchCombo->setFocus();
 

diff --git a/kita/src/thread/threadview.h b/kita/src/thread/threadview.h
index daf3fac..66ee3dc 100644 (file)
--- a/kita/src/thread/threadview.h
+++ b/kita/src/thread/threadview.h
@@ -103,7 +103,6 @@ private:
 
     void insertSearchCombo();
     void setSubjectLabel( const QString& boardName, const QString& threadName, const QString boardURL );
-    QStringList parseSearchQuery( const QString& input ) const;
     void updateButton();
 
 private slots: