refactoring.

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

diff --git a/kita/src/libkita/access.cpp b/kita/src/libkita/access.cpp
index ae1c86b..e66da43 100644 (file)
--- a/kita/src/libkita/access.cpp
+++ b/kita/src/libkita/access.cpp
@@ -88,7 +88,7 @@ void Access::writeCacheData( const KURL& url )
 
 QString Access::getupdate()
 {
-    QString getURL = m_thread->datURL();
+    QString getURL = m_url.url();
     if ( Kita::boardType( getURL ) == Board_MachiBBS ) {
         getURL = Kita::datToThread( getURL );
     }
@@ -135,7 +135,7 @@ void Access::slotThreadResult( KIO::Job* job )
     
     if ( m_threadData.length() ) {
 
-        KURL url = m_thread->datURL();
+        KURL url = m_url;
 
         url.setProtocol( "k2ch" );
 
@@ -160,7 +160,7 @@ void Access::slotThreadResult( KIO::Job* job )
     } else retstr = "";
 
     if ( responseCode() != 200 && responseCode() != 206 ) retstr = QString::null;
-    if ( Kita::boardType( m_thread->datURL() ) == Board_MachiBBS ) {
+    if ( Kita::boardType( m_url.url() ) == Board_MachiBBS ) {
         emit receiveData( m_threadData );
     }
     emit finishLoad();
@@ -188,7 +188,7 @@ void Access::slotReceiveThreadData( KIO::Job*, const QByteArray& data )
     }
     m_firstReceive = FALSE;
     m_threadData += cstr ;
-    if ( Kita::boardType( m_thread->datURL() ) != Board_MachiBBS ) {
+    if ( Kita::boardType( m_url.url() ) != Board_MachiBBS ) {
         emit receiveData( cstr );
     }
 }
@@ -243,7 +243,7 @@ int Access::responseCode()
 
 QString Access::getcache()
 {
-    KURL url = m_thread->datURL();
+    KURL url = m_url;
     url.setProtocol( "k2ch" );
 
     m_orgData = getCacheData( url );

diff --git a/kita/src/libkita/access.h b/kita/src/libkita/access.h
index 9ec2040..70fde5c 100644 (file)
--- a/kita/src/libkita/access.h
+++ b/kita/src/libkita/access.h
@@ -10,11 +10,11 @@
 #ifndef KITAACCESS_H
 #define KITAACCESS_H
 
+#include <kurl.h>
+
 #include <qobject.h>
 #include <qcstring.h>
 
-class KURL;
-
 namespace KIO
 {
     class Job;
@@ -32,7 +32,7 @@ namespace Kita
         Q_OBJECT
 
     public:
-        Access( const Thread* thread ) : m_thread( thread ), m_currentJob( 0 ) {};
+        Access( const KURL& url ) : m_url( url ), m_currentJob( 0 ) {};
         ~Access() {};
 
         QString get();
@@ -50,7 +50,7 @@ namespace Kita
         void writeCacheData( const KURL& url );
         void enter_loop();
 
-        const Thread* m_thread;
+        const KURL m_url;
         KIO::Job* m_currentJob;
         QString m_threadData;
         QString m_header;

diff --git a/kita/src/libkita/datinfo.cpp b/kita/src/libkita/datinfo.cpp
index 3afa132..d246c6d 100644 (file)
--- a/kita/src/libkita/datinfo.cpp
+++ b/kita/src/libkita/datinfo.cpp
@@ -88,7 +88,7 @@ void DatInfo::initPrivate(){
     resetAbonePrivate();
     
     /* create dat loader */
-    m_access = new Kita::Access( m_thread );
+    m_access = new Kita::Access( m_thread->datURL() );
     
     connect( m_access, SIGNAL( receiveData( const QString& ) ),
             SLOT( slotReceiveData( const QString& ) ) );