refactoring.

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

diff --git a/kita/src/favoritelistview.cpp b/kita/src/favoritelistview.cpp
index 082d362..df6ad06 100644 (file)
--- a/kita/src/favoritelistview.cpp
+++ b/kita/src/favoritelistview.cpp
@@ -60,13 +60,11 @@ void FavoriteListView::update()
         m_prevquery = "";
     }
 
-    const QValueList<QString> threadList = FavoriteThreads::getInstance() -> threadList();
-
     subjectList->clear();
 
-    QValueList<QString>::const_iterator it;
-    for ( it = threadList.begin(); it != threadList.end(); ++it ) {
-        QString datURL = ( *it );
+    for( int i = 0; FavoriteThreads::count() > i; i++ ) {
+        QString datURL = FavoriteThreads::getDatURL( i );
+        qDebug("FavoriteListView::update() datURL = %s", datURL.latin1());
 
         QDateTime since;
         since.setTime_t( Kita::datToSince( datURL ) );
@@ -94,11 +92,9 @@ void FavoriteListView::loadThread( QListViewItem* item )
 {
     if ( ! item ) return ;
 
-    const QValueList<QString> threadList = FavoriteThreads::getInstance() -> threadList();
-
-    QValueList<QString>::const_iterator it;
-    for ( it = threadList.begin(); it != threadList.end(); ++it ) {
-        QString datURL = ( *it );
+    for( int i = 0; FavoriteThreads::count() > i; i++ ) {
+        QString datURL = FavoriteThreads::getDatURL( i );
+        qDebug("FavoriteListView::loadThread(() datURL = %s", datURL.latin1());
 
         if ( datURL == item->text( Col_DatURL ) ) {
             emit openURLRequestExt( datURL, KParts::URLArgs(), "kita_open_2chthread", 0 );
@@ -174,10 +170,9 @@ void FavoriteListView::slotReloadButton()
 {
     QValueList<QString> boardList;
 
-    const QValueList<QString> threadList = FavoriteThreads::getInstance() -> threadList();
-    QValueList<QString>::const_iterator it;
-    for ( it = threadList.begin(); it != threadList.end(); ++it ) {
-        QString datURL = ( *it );
+    for( int i = 0; FavoriteThreads::count() > i; i++ ) {
+        QString datURL = FavoriteThreads::getDatURL( i );
+        qDebug("FavoriteListView::update() datURL = %s", datURL.latin1());
         QString boardURL = Kita::datToBoard( datURL );
         if ( boardList.contains( boardURL ) == 0 ) {
             boardList.append( boardURL );

diff --git a/kita/src/libkita/favoritethreads.cpp b/kita/src/libkita/favoritethreads.cpp
index c461a7e..4dcc035 100644 (file)
--- a/kita/src/libkita/favoritethreads.cpp
+++ b/kita/src/libkita/favoritethreads.cpp
@@ -166,3 +166,12 @@ void FavoriteThreads::replace( QString fromURL, QString toURL )
         }
     }
 }
+
+QString FavoriteThreads::getDatURL( int i )
+{
+    if ( getInstance()->m_threadList.count() > i ) {
+        return getInstance()->m_threadList[ i ];
+    } else {
+        return QString::null;
+    }
+}

diff --git a/kita/src/libkita/favoritethreads.h b/kita/src/libkita/favoritethreads.h
index 0cca8bc..ca9b6d6 100644 (file)
--- a/kita/src/libkita/favoritethreads.h
+++ b/kita/src/libkita/favoritethreads.h
@@ -29,16 +29,19 @@ class FavoriteThreads
     QValueList<QString> m_threadList;
     FavoriteThreads();
     ~FavoriteThreads();
+    const QValueList<QString> threadList() const;
 public:
     static FavoriteThreads* getInstance();
     void insert( const QString& datURL );
     void remove( const QString& datURL );
     static bool contains( const QString& datURL );
-    const QValueList<QString> threadList() const;
     const QString toXML() const;
     static bool readFromXML( const QString& xml );
     static void processThreadNode( QDomNode& node );
     static void replace( QString fromURL, QString toURL );
+    // FIXME: use Iterator
+    static QString getDatURL( int i );
+    static int count() { return getInstance()->m_threadList.count(); }
 };
 
 #endif