refactoring?

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

diff --git a/kita/src/board/boardview.cpp b/kita/src/board/boardview.cpp
index eb03f69..3bc8888 100644 (file)
--- a/kita/src/board/boardview.cpp
+++ b/kita/src/board/boardview.cpp
@@ -184,10 +184,11 @@ void KitaBoardView::loadBoard( const KURL& url, bool online )
     for ( unsigned i = 0; i < countNew + countOld; i++ ) {
 
         Kita::Thread* thread = i < countNew ? threadList.at( i ) : oldLogList.at( i - countNew );
+        KURL datURL = thread->datURL();
         Kita::ThreadListViewItem* item = new Kita::ThreadListViewItem( subjectList );
         int id = ( i < countNew ? i + 1 : 0 );
         int order = i + 1;
-        updateListViewItem( item, thread, current, id, order );
+        updateListViewItem( item, datURL, current, id, order );
     }
 
     if ( HideButton->isOn() ) {
@@ -274,7 +275,7 @@ void KitaBoardView::slotUpdateSubject( const KURL& url )
             if ( thread == NULL ) return ;
             int id = item->text( Col_ID ).toInt();
             int order = item->text( Col_IDOrder ).toInt();
-            updateListViewItem( item, thread, current, id, order );
+            updateListViewItem( item, datURL, current, id, order );
 
             UpdateKindLabel();
 
@@ -287,13 +288,11 @@ void KitaBoardView::slotUpdateSubject( const KURL& url )
 
 /* if id == 0, this thread is old thread. */
 /* private */
-void KitaBoardView::updateListViewItem( QListViewItem* item, Kita::Thread* thread, const QDateTime& current, int id, int order )
+void KitaBoardView::updateListViewItem( QListViewItem* item, const KURL& datURL, const QDateTime& current, int id, int order )
 {
-    KURL datURL = thread->datURL();
-
     QDateTime since;
     since.setTime_t( Kita::datToSince( datURL ) );
-    QString threadName = thread->threadName();
+    QString threadName = Kita::DatManager::threadName( datURL );
     int resNum = Kita::DatManager::getResNum( datURL );
     int readNum = Kita::DatManager::getReadNum( datURL );
     int viewPos = Kita::DatManager::getViewPos( datURL );
@@ -339,7 +338,7 @@ void KitaBoardView::updateListViewItem( QListViewItem* item, Kita::Thread* threa
     }
 
     // no effect: m_unreadNum, m_readNum, m_newNum, markOrder
-    if ( thread->isOpened() && resNum == readNum ) { /* opened */
+    if ( Kita::DatManager::isMainThreadOpened( datURL ) && resNum == readNum ) { /* opened */
         item->setPixmap( Col_Mark, SmallIcon( "open" ) );
     }
 }

diff --git a/kita/src/board/boardview.h b/kita/src/board/boardview.h
index 3c5ef5c..50b31e8 100644 (file)
--- a/kita/src/board/boardview.h
+++ b/kita/src/board/boardview.h
@@ -49,7 +49,7 @@ private:
     void UpdateKindLabel();
     void deleteLog( const KURL& url );
     void loadLayout();
-    void updateListViewItem( QListViewItem* item, Kita::Thread* thread, const QDateTime& current, int id, int order );
+    void updateListViewItem( QListViewItem* item, const KURL& datURL, const QDateTime& current, int id, int order );
     bool eventFilter( QObject* watched, QEvent* e );
     void saveHeaderOnOff();
     void loadHeaderOnOff();