KURL -> QString

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

diff --git a/kita/src/favoritelistview.cpp b/kita/src/favoritelistview.cpp
index 1af8ef9..0b48283 100644 (file)
--- a/kita/src/favoritelistview.cpp
+++ b/kita/src/favoritelistview.cpp
@@ -72,8 +72,8 @@ void FavoriteListView::update()
   for(; it.current(); ++it) {
     const Kita::Thread* thread = it.current();
 
-    int readNum = cache->readNum( thread->datURL() );
-    int resNum = cache->resNum( thread->datURL() );  // TODO unused variables.
+    int readNum = cache->readNum( thread->datURL().url() );
+    int resNum = cache->resNum( thread->datURL().url() );  // TODO unused variables.
 
     new KListViewItem( this,
                        thread->boardName(),

diff --git a/kita/src/kita.cpp b/kita/src/kita.cpp
index 1181dda..d2b63be 100644 (file)
--- a/kita/src/kita.cpp
+++ b/kita/src/kita.cpp
@@ -463,8 +463,8 @@ void KitaMainWindow::slotOpenURLRequest(const KURL& url, const KParts::URLArgs&)
 
 void KitaMainWindow::updateThreadCache( const Kita::Thread& thread )
 {
-  KitaCacheInfo::getInstance()->setReadNum( thread.datURL(), thread.resNum() );
-  KitaCacheInfo::getInstance()->setResNum( thread.datURL(), thread.resNum() );
+  KitaCacheInfo::getInstance()->setReadNum( thread.datURL().url(), thread.resNum() );
+  KitaCacheInfo::getInstance()->setResNum( thread.datURL().url(), thread.resNum() );
 }
 
 void KitaMainWindow::loadCache()

diff --git a/kita/src/kitacacheinfo.cpp b/kita/src/kitacacheinfo.cpp
index 53c1a45..0d13aed 100644 (file)
--- a/kita/src/kitacacheinfo.cpp
+++ b/kita/src/kitacacheinfo.cpp
@@ -33,34 +33,32 @@ KitaCacheInfo* KitaCacheInfo::getInstance()
   return instance;
 }
 
-int KitaCacheInfo::readNum(const KURL& url)
+int KitaCacheInfo::readNum(const QString& url)
 {
-  QString key = url.url();
-  if( m_readDict.contains(key) ) {
-    return m_readDict[key];
+  if( m_readDict.contains(url) ) {
+    return m_readDict[url];
   } else {
     return 0;
   }
 }
 
-void KitaCacheInfo::setReadNum(const KURL& url, int num)
+void KitaCacheInfo::setReadNum(const QString& url, int num)
 {
-  m_readDict.insert(url.url(), num);
+  m_readDict.insert( url, num );
 }
 
-int KitaCacheInfo::resNum( const KURL& url )
+int KitaCacheInfo::resNum( const QString& url )
 {
-  QString key = url.url();
-  if( m_resNumDict.contains( key ) ) {
-    return m_resNumDict[ key ];
+  if( m_resNumDict.contains( url ) ) {
+    return m_resNumDict[ url ];
   } else {
     return 0;
   }
 }
 
-void KitaCacheInfo::setResNum( const KURL& url, int num )
+void KitaCacheInfo::setResNum( const QString& url, int num )
 {
-  m_resNumDict.insert( url.url(), num );
+  m_resNumDict.insert( url, num );
 }
 
 QDataStream& operator<<(QDataStream& s, KitaCacheInfo& c)

diff --git a/kita/src/kitacacheinfo.h b/kita/src/kitacacheinfo.h
index bedd9bc..61c295d 100644 (file)
--- a/kita/src/kitacacheinfo.h
+++ b/kita/src/kitacacheinfo.h
@@ -23,10 +23,10 @@ class KitaCacheInfo
 {
 public:
   static KitaCacheInfo* getInstance();
-  void setReadNum(const KURL& url, int num);
-  int readNum(const KURL& url);
-  void setResNum( const KURL& url, int num );
-  int resNum( const KURL& url );
+  void setReadNum( const QString& url, int num);
+  int readNum( const QString& url );
+  void setResNum( const QString& url, int num );
+  int resNum( const QString& url );
   friend QDataStream& operator<<(QDataStream& s, KitaCacheInfo& c);
   friend QDataStream& operator>>(QDataStream& s, KitaCacheInfo& c);
 private:

diff --git a/kita/src/kitasubjectview.cpp b/kita/src/kitasubjectview.cpp
index 151866c..4da0a66 100644 (file)
--- a/kita/src/kitasubjectview.cpp
+++ b/kita/src/kitasubjectview.cpp
@@ -121,7 +121,7 @@ void KitaSubjectView::loadBoard(const Kita::Board& board)
   for(unsigned i=0; i<threadList.count(); i++) {
     Kita::Thread* thread = threadList.at(i);
 
-    int readNum = cache->readNum( thread->datURL() );
+    int readNum = cache->readNum( thread->datURL().url() );
     int resNum = thread->resNum();
 
     KListViewItem* item = new KListViewItem( subjectList );