use KitaThreadInfo::setResNum

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

diff --git a/kita/src/kita.cpp b/kita/src/kita.cpp
index ee6c3c4..1fa0fc6 100644 (file)
--- a/kita/src/kita.cpp
+++ b/kita/src/kita.cpp
@@ -517,7 +517,8 @@ void KitaMainWindow::setUrl(const KURL& url)
 
 void KitaMainWindow::bookmark( const Kita::Thread& thread, bool on )
 {
-  Kita::Thread* t = new Kita::Thread( thread.datURL(), thread.name(), thread.resNum() );
+  Kita::Thread* t = new Kita::Thread( thread.datURL(), thread.name() );
+  KitaThreadInfo::setResNum( thread.datURL(), thread.resNum() );
   FavoriteThreads* favorite = FavoriteThreads::getInstance();
 
   if( on ) {

diff --git a/kita/src/kitasubjectview.cpp b/kita/src/kitasubjectview.cpp
index 40f6f60..35ff652 100644 (file)
--- a/kita/src/kitasubjectview.cpp
+++ b/kita/src/kitasubjectview.cpp
@@ -95,9 +95,9 @@ void KitaSubjectView::loadThread( int, QListViewItem* item )
 
   Kita::Board::setName( Kita::datToBoard( datURL.url() ), m_board->name() );
   Kita::Thread* thread = new Kita::Thread( datURL.url(),
-                                           item->text( Row_Subject ),
-                                           item->text( Row_Read ).toInt() );
+                                           item->text( Row_Subject ) );
 
+  KitaThreadInfo::setResNum( datURL.url(), item->text( Row_Read ).toInt() );
   emit signalShowThread( *thread );
 }
 

diff --git a/kita/src/libkita/board.cpp b/kita/src/libkita/board.cpp
index 95aab32..241d711 100644 (file)
--- a/kita/src/libkita/board.cpp
+++ b/kita/src/libkita/board.cpp
@@ -22,6 +22,7 @@
 #include <qdict.h>
 
 #include "kita_misc.h"
+#include "threadinfo.h"
 
 #include "qcp932codec.h"
 
@@ -100,7 +101,8 @@ const QPtrList<Thread> Board::getThreadList() const
         KURL datURL = m_boardURL;
         datURL.addPath("/dat/" + fname);
         Kita::Board::setName( datToBoard( datURL.url() ), name() );
-        Kita::Thread* thread = new Kita::Thread( datURL.url(), subject, num.toInt());
+        Kita::Thread* thread = new Kita::Thread( datURL.url(), subject );
+        KitaThreadInfo::setResNum( datURL.url(), num.toInt() );
         threadList.append(thread);
       }
     }

diff --git a/kita/src/libkita/favoritethreads.cpp b/kita/src/libkita/favoritethreads.cpp
index 6b3bad3..058c2b6 100644 (file)
--- a/kita/src/libkita/favoritethreads.cpp
+++ b/kita/src/libkita/favoritethreads.cpp
@@ -12,6 +12,8 @@
 
 #include <kdebug.h>
 
+#include "threadinfo.h"
+
 FavoriteThreads* FavoriteThreads::instance = 0;
 
 FavoriteThreads::FavoriteThreads()
@@ -158,7 +160,8 @@ bool FavoritesXmlParser::endElement( const QString& namespaceURI, const QString&
     m_inThread = false;
     m_threadParser->endElement( namespaceURI, localName, qName );
     Kita::Thread thread = m_threadParser->getThread();
-    m_threadList.append( new Kita::Thread( thread.datURL(), thread.name(), thread.resNum() ) );
+    m_threadList.append( new Kita::Thread( thread.datURL(), thread.name() ) );
+    KitaThreadInfo::setResNum( thread.datURL(), thread.resNum() );
 
     delete m_threadParser;
     m_threadParser = 0;

diff --git a/kita/src/libkita/thread.cpp b/kita/src/libkita/thread.cpp
index bac5c45..e902ab5 100644 (file)
--- a/kita/src/libkita/thread.cpp
+++ b/kita/src/libkita/thread.cpp
@@ -35,10 +35,9 @@ Thread::Thread()
 {
 }
 
-Thread::Thread( const QString& datURL, const QString& threadName, int resNum )
+Thread::Thread( const QString& datURL, const QString& threadName )
   : m_datURL( datURL ), m_threadName( threadName )
 {
-  setResNum( resNum );
 }
 
 Thread::Thread( const Thread& obj )
@@ -190,7 +189,8 @@ bool ThreadXmlParser::endElement( const QString& namespaceURI, const QString& lo
     m_boardParser->endElement( namespaceURI, localName, qName );
   } else if( localName == "thread" ) {
     m_inThread = false;
-    m_thread = Kita::Thread( m_datUrlStr, m_threadName, m_resNum );
+    m_thread = Kita::Thread( m_datUrlStr, m_threadName );
+    KitaThreadInfo::setResNum( m_datUrlStr, m_resNum );
     m_isValid = true;
     // create thread;
   } else if( localName == "daturl" ) {
@@ -312,7 +312,8 @@ void ThreadFactory::insertThread( Thread& thread )
     instance = new ThreadFactory();
   }
 
-  Thread* new_thread = new Thread( thread.datURL(), thread.name(), thread.resNum() );
+  Thread* new_thread = new Thread( thread.datURL(), thread.name() );
+  KitaThreadInfo::setResNum( thread.datURL(), thread.resNum() );
   instance->m_dict.insert( thread.datURL(), new_thread );
 }
 

diff --git a/kita/src/libkita/thread.h b/kita/src/libkita/thread.h
index 6e501e1..c31db22 100644 (file)
--- a/kita/src/libkita/thread.h
+++ b/kita/src/libkita/thread.h
@@ -34,8 +34,8 @@ namespace Kita {
     QString m_datURL;
     QString m_threadName;
   public:
+    Thread( const QString& datURL, const QString& threadName = QString::null );
     Thread();
-    Thread( const QString& datURL, const QString& threadName = QString::null, int resNum = 0 );
     Thread( const Thread& obj );
     ~Thread();
     Thread& operator=( const Thread& obj );