refactoring.

[kita/kita.git] / kita / src / libkita / favoritethreads.cpp

diff --git a/kita/src/libkita/favoritethreads.cpp b/kita/src/libkita/favoritethreads.cpp
index 14ed911..7153c54 100644 (file)
--- a/kita/src/libkita/favoritethreads.cpp
+++ b/kita/src/libkita/favoritethreads.cpp
@@ -143,11 +143,11 @@ const QString FavoriteThreads::toXML() const
 
     QValueList<QString>::const_iterator it;
     for ( it = threadList().begin(); it != threadList().end(); ++it ) {
+        QString datURL = ( *it );
         const Kita::Thread* thread = Kita::Thread::getByURL( *it );
         QDomElement threadElement = document.createElementNS( "http://kita.sourceforge.jp/ns/thread", "thread" );
         root.appendChild( threadElement );
 
-        QString datURL = thread->datURL();
         QDomElement datURLElement = document.createElement( "daturl" );
         threadElement.appendChild( datURLElement );
         datURLElement.appendChild( document.createTextNode( datURL ) );
@@ -157,7 +157,7 @@ const QString FavoriteThreads::toXML() const
         threadElement.appendChild( nameElement );
         nameElement.appendChild( document.createTextNode( Kita::unescape( threadName ) ) );
 
-        QString resNum = QString::number( thread->resNum() );
+        QString resNum = QString::number( KitaThreadInfo::resNum( datURL ) );
         QDomElement resNumElement = document.createElement( "resnum" );
         threadElement.appendChild( resNumElement );
         resNumElement.appendChild( document.createTextNode( resNum ) );
@@ -166,12 +166,12 @@ const QString FavoriteThreads::toXML() const
         QDomElement board = document.createElementNS( "http://kita.sourceforge.jp/ns/board", "board" );
         threadElement.appendChild( board );
 
-        QString boardURL = thread->boardURL();
+        QString boardURL = Kita::datToBoard( datURL );
         QDomElement boardURLElement = document.createElement( "url" );
         board.appendChild( boardURLElement );
         boardURLElement.appendChild( document.createTextNode( boardURL ) );
 
-        QString boardName = thread->boardName();
+        QString boardName = Kita::Board::getName( boardURL );
         QDomElement boardNameElement = document.createElement( "name" );
         board.appendChild( boardNameElement );
         boardNameElement.appendChild( document.createTextNode( boardName ) );