refactoring.

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

diff --git a/kita/src/libkita/favoritethreads.cpp b/kita/src/libkita/favoritethreads.cpp
index 4dcc035..5102b46 100644 (file)
--- a/kita/src/libkita/favoritethreads.cpp
+++ b/kita/src/libkita/favoritethreads.cpp
@@ -20,6 +20,21 @@
 #include <qstylesheet.h>
 #include <qdom.h>
 
+// FavoriteThreadItem
+FavoriteThreadItem::FavoriteThreadItem()
+{
+}
+
+FavoriteThreadItem::~ FavoriteThreadItem()
+{
+}
+
+bool FavoriteThreadItem::operator==( const FavoriteThreadItem& item ) const
+{
+    return ( m_datURL == item.m_datURL );
+}
+
+// FavoriteThreads
 FavoriteThreads* FavoriteThreads::instance = 0;
 
 FavoriteThreads::FavoriteThreads()
@@ -57,7 +72,7 @@ bool FavoriteThreads::contains( const QString& datURL )
     }
 }
 
-const QValueList<QString> FavoriteThreads::threadList() const
+const QValueList<FavoriteThreadItem> FavoriteThreads::threadList() const
 {
     return m_threadList;
 }
@@ -114,9 +129,9 @@ const QString FavoriteThreads::toXML() const
     QDomElement root = document.createElementNS( "http://kita.sourceforge.jp/ns/favorites", "favorites" );
     document.appendChild( root );
 
-    QValueList<QString>::const_iterator it;
+    QValueList<FavoriteThreadItem>::const_iterator it;
     for ( it = threadList().begin(); it != threadList().end(); ++it ) {
-        QString datURL = ( *it );
+        QString datURL = ( *it ).m_datURL;
         QDomElement threadElement = document.createElementNS( "http://kita.sourceforge.jp/ns/thread", "thread" );
         root.appendChild( threadElement );
 
@@ -154,10 +169,10 @@ const QString FavoriteThreads::toXML() const
 void FavoriteThreads::replace( QString fromURL, QString toURL )
 {
     if( FavoriteThreads::getInstance() == NULL ) return;
-    QValueList<QString>& threadList = FavoriteThreads::getInstance() ->m_threadList;
-    QValueList<QString>::iterator it;
+    QValueList<FavoriteThreadItem>& threadList = FavoriteThreads::getInstance() ->m_threadList;
+    QValueList<FavoriteThreadItem>::iterator it;
     for ( it = threadList.begin(); it != threadList.end(); ++it ) {
-        QString url = ( *it );
+        QString url = ( *it ).m_datURL;
         if ( url.find( fromURL ) == 0 ) {
             url = url.replace( 0, fromURL.length(), toURL );
             threadList.remove( it );
@@ -170,7 +185,7 @@ void FavoriteThreads::replace( QString fromURL, QString toURL )
 QString FavoriteThreads::getDatURL( int i )
 {
     if ( getInstance()->m_threadList.count() > i ) {
-        return getInstance()->m_threadList[ i ];
+        return getInstance()->m_threadList[ i ].m_datURL;
     } else {
         return QString::null;
     }

diff --git a/kita/src/libkita/favoritethreads.h b/kita/src/libkita/favoritethreads.h
index ca9b6d6..d814c54 100644 (file)
--- a/kita/src/libkita/favoritethreads.h
+++ b/kita/src/libkita/favoritethreads.h
@@ -23,13 +23,24 @@ class QDomNode;
 /**
 @author Hideki Ikemoto
 */
+class FavoriteThreadItem
+{
+public:
+    QString m_datURL;
+    FavoriteThreadItem();
+    FavoriteThreadItem( const QString& datURL ) { m_datURL = datURL; }
+    ~FavoriteThreadItem();
+
+    bool operator==( const FavoriteThreadItem& item ) const;
+};
+
 class FavoriteThreads
 {
     static FavoriteThreads* instance;
-    QValueList<QString> m_threadList;
+    QValueList<FavoriteThreadItem> m_threadList;
     FavoriteThreads();
     ~FavoriteThreads();
-    const QValueList<QString> threadList() const;
+    const QValueList<FavoriteThreadItem> threadList() const;
 public:
     static FavoriteThreads* getInstance();
     void insert( const QString& datURL );