From ed9c70ebf9f1ff4afce4c2e14d636291fcc96995 Mon Sep 17 00:00:00 2001 From: ikemo Date: Sat, 9 Oct 2004 05:24:57 +0000 Subject: [PATCH] refactoring. git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/kita/kita/trunk@1423 56b19765-1e22-0410-a548-a0f45d66c51a --- kita/src/favoritelistview.cpp | 2 +- kita/src/kitasubjectview.cpp | 2 +- kita/src/libkita/thread.cpp | 5 ----- kita/src/libkita/thread.h | 1 - 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/kita/src/favoritelistview.cpp b/kita/src/favoritelistview.cpp index 88aea88..71c8a39 100644 --- a/kita/src/favoritelistview.cpp +++ b/kita/src/favoritelistview.cpp @@ -81,7 +81,7 @@ void FavoriteListView::update() int resNum = KitaThreadInfo::resNum( datURL ); KListViewItem* item = new KListViewItem( subjectList ); - item->setText( Col_Board, thread->boardName() ); + item->setText( Col_Board, Kita::DatManager::boardName( datURL ) ); item->setText( Col_Subject, Kita::unescape( thread->name() ) ); item->setText( Col_Read, QString( "%1" ).arg( readNum, 4 ) ); if ( resNum > 0 ) { diff --git a/kita/src/kitasubjectview.cpp b/kita/src/kitasubjectview.cpp index f1e56b1..efb06a3 100644 --- a/kita/src/kitasubjectview.cpp +++ b/kita/src/kitasubjectview.cpp @@ -171,7 +171,7 @@ void KitaSubjectView::loadBoard( const QString& boardURL ) item->setText( Col_ResNum, QString( "%1" ).arg( resNum, 4 ) ); item->setText( Col_Read, ( readNum > 0 ) ? QString( "%1" ).arg( readNum, 4 ) : QString( "" ) ); item->setText( Col_Unread, ( readNum > 0 && resNum != readNum ) ? QString( "%1" ).arg( resNum - readNum, 4 ) : QString( "" ) ); - item->setText( Col_Board, thread->boardName() ); + item->setText( Col_Board, Kita::DatManager::boardName( datURL ) ); item->setText( Col_Since, since.toString( "yy/MM/dd hh:mm" ) ); item->setText( Col_DatURL, datURL ); item->setText( Col_Speed, QString( " %1 " ).arg( speed, 0, 'f', 2 ) ); diff --git a/kita/src/libkita/thread.cpp b/kita/src/libkita/thread.cpp index c8883bc..537c352 100644 --- a/kita/src/libkita/thread.cpp +++ b/kita/src/libkita/thread.cpp @@ -67,11 +67,6 @@ const QString& Thread::name() const return m_threadName; } -const QString& Thread::boardName() const -{ - return Kita::Board::getName( datToBoard( m_datURL ) ); -} - Thread* Thread::getByURL( const QString& datURL ) { if ( m_threadDict == 0 ) { diff --git a/kita/src/libkita/thread.h b/kita/src/libkita/thread.h index ef493d5..3b487d6 100644 --- a/kita/src/libkita/thread.h +++ b/kita/src/libkita/thread.h @@ -42,7 +42,6 @@ namespace Kita const QString& datURL() const; const QString& name() const; int resNum() const; - const QString& boardName() const; static Thread* getByURL( const QString& datURL ); static Thread* getByURLNew( const KURL& datURL ); -- 2.11.0