From b0161516509a9e4e9bdf3e0cbf894c182df69ad5 Mon Sep 17 00:00:00 2001 From: ikemo Date: Fri, 10 Jun 2005 15:39:46 +0000 Subject: [PATCH] refactoring. git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/kita/kita/trunk@1737 56b19765-1e22-0410-a548-a0f45d66c51a --- kita/src/board/boardview.cpp | 1 - kita/src/libkita/threadindex.cpp | 1 - kita/src/libkita/threadinfo.cpp | 28 ---------------------------- kita/src/libkita/threadinfo.h | 2 -- 4 files changed, 32 deletions(-) diff --git a/kita/src/board/boardview.cpp b/kita/src/board/boardview.cpp index f9177f5..7a2281d 100644 --- a/kita/src/board/boardview.cpp +++ b/kita/src/board/boardview.cpp @@ -436,7 +436,6 @@ void KitaBoardView::slotContextMenuRequested( QListViewItem* item, const QPoint& propertyWidget->idx_readNumLabel->setText( QString( "%1" ).arg( Kita::ThreadIndex::getReadNum( datURL ) ) ); propertyWidget->idx_viewPosLabel->setText( QString( "%1" ).arg( Kita::ThreadIndex::getViewPos( datURL ) ) ); - propertyWidget->cache_resNumLabel->setText( QString( "%1" ).arg( KitaThreadInfo::resNum( datURL ) ) ); propertyWidget->cache_readNumLabel->setText( QString( "%1" ).arg( KitaThreadInfo::readNum( datURL ) ) ); propertyWidget->show(); } diff --git a/kita/src/libkita/threadindex.cpp b/kita/src/libkita/threadindex.cpp index c66e7af..f8a600a 100644 --- a/kita/src/libkita/threadindex.cpp +++ b/kita/src/libkita/threadindex.cpp @@ -153,7 +153,6 @@ void ThreadIndex::saveIndex( const Kita::Thread* thread, const KURL& url ) /* save "cache" */ KURL datURL = Kita::getDatURL( url ); int num = ( thread->viewPos() ? thread->viewPos() : thread->readNum() ); - KitaThreadInfo::setResNum( datURL.prettyURL(), thread->resNum() ); KitaThreadInfo::setReadNum( datURL.prettyURL(), num ); } diff --git a/kita/src/libkita/threadinfo.cpp b/kita/src/libkita/threadinfo.cpp index 33f876b..a3f0292 100644 --- a/kita/src/libkita/threadinfo.cpp +++ b/kita/src/libkita/threadinfo.cpp @@ -47,22 +47,6 @@ void KitaThreadInfo::setReadNum( const QString& url, int num ) instance->m_readDict.insert( url, num ); } -int KitaThreadInfo::resNum( const QString& url ) -{ - KitaThreadInfo * instance = KitaThreadInfo::getInstance(); - if ( instance->m_resNumDict.contains( url ) ) { - return instance->m_resNumDict[ url ]; - } else { - return 0; - } -} - -void KitaThreadInfo::setResNum( const QString& url, int num ) -{ - KitaThreadInfo * instance = KitaThreadInfo::getInstance(); - instance->m_resNumDict.insert( url, num ); -} - void KitaThreadInfo::replace( const QString fromURL, const QString toURL ) { QMap::Iterator it; @@ -79,18 +63,6 @@ void KitaThreadInfo::replace( const QString fromURL, const QString toURL ) it = instance->m_readDict.begin(); // TODO ¤â¤Ã¤ÈÁᤤÊýË¡¤Ï? } } - - QMap::Iterator it2; - for ( it2 = instance->m_resNumDict.begin(); it2 != instance->m_resNumDict.end(); ++it2 ) { - QString url = it2.key(); - int num = it2.data(); - if ( url.find( fromURL ) == 0 ) { - url = url.replace( 0, fromURL.length(), toURL ); - instance->m_resNumDict.erase( it2 ); - instance->m_resNumDict.insert( url, num ); - it2 = instance->m_resNumDict.begin(); - } - } } void KitaThreadInfo::removeThreadInfo( const QString& url ) diff --git a/kita/src/libkita/threadinfo.h b/kita/src/libkita/threadinfo.h index 35d226f..4364ac6 100644 --- a/kita/src/libkita/threadinfo.h +++ b/kita/src/libkita/threadinfo.h @@ -26,8 +26,6 @@ public: static KitaThreadInfo* getInstance(); static void setReadNum( const QString& url, int num ); static int readNum( const QString& url ); - static void setResNum( const QString& url, int num ); - static int resNum( const QString& url ); static void replace( const QString fromURL, const QString toURL ); static void removeThreadInfo( const QString& url ); friend QDataStream& operator<<( QDataStream& s, KitaThreadInfo& c ); -- 2.11.0