refactoring.

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

diff --git a/kita/src/libkita/access.cpp b/kita/src/libkita/access.cpp
index 23371bb..4c58957 100644 (file)
--- a/kita/src/libkita/access.cpp
+++ b/kita/src/libkita/access.cpp
@@ -156,12 +156,10 @@ void Access::slotThreadResult( KIO::Job* job )
             // TODO: need to refactoring.
             parse_machiBBS();
             KURL url = m_url;
-            url.setProtocol( "k2ch" );
             writeCacheData( url );
             emit receiveData( m_threadData );
         } else {
             KURL url = m_url;
-            url.setProtocol( "k2ch" );
             make_cacheDir( url );
             writeCacheData( url );
         }
@@ -323,10 +321,7 @@ int Access::responseCode()
 
 QString Access::getcache()
 {
-    KURL url = m_url;
-    url.setProtocol( "k2ch" );
-
-    m_orgData = getCacheData( url );
+    m_orgData = getCacheData( m_url );
 
     return m_orgData;
 
@@ -350,10 +345,6 @@ bool Access::deleteLog( const Thread* thread, QWidget* parent )
 
         KURL url = thread->datURL();
         QString str = Kita::Cache::getPath( url );
-        KIO::NetAccess::del( str );
-
-        url.setProtocol( "k2ch" );
-        str = Kita::Cache::getPath( url );
         return KIO::NetAccess::del( str );
     }
     return FALSE;

diff --git a/kita/src/libkita/cache.cpp b/kita/src/libkita/cache.cpp
index 54c8ca8..3c25539 100644 (file)
--- a/kita/src/libkita/cache.cpp
+++ b/kita/src/libkita/cache.cpp
@@ -20,12 +20,7 @@ using namespace Kita;
 
 QString Cache::baseDir( const KURL& url )
 {
-    QString dir;
-    if ( url.protocol() == "k2ch" ) {
-        dir = KGlobal::dirs() ->saveLocation( "cache", "kita" );
-    } else {
-        dir = KProtocolManager::cacheDir();
-    }
+    QString dir = KGlobal::dirs() ->saveLocation( "cache", "kita" );
     if ( dir[ dir.length() - 1 ] != '/' )
         dir += "/";