use pointer

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

diff --git a/kita/src/libkita/thread.cpp b/kita/src/libkita/thread.cpp
index 8d61b1f..acead3b 100644 (file)
--- a/kita/src/libkita/thread.cpp
+++ b/kita/src/libkita/thread.cpp
@@ -237,14 +237,14 @@ bool ThreadXmlParser::characters( const QString& ch )
 
 QString ThreadAccess::get()
 {
-    if ( KURL( m_thread.datURL() ).protocol() != "k2ch" ) {
+    if ( KURL( m_thread->datURL() ).protocol() != "k2ch" ) {
         KIO::SlaveConfig::self() ->setConfigData( "http",
-                KURL( m_thread.datURL() ).host(),
+                KURL( m_thread->datURL() ).host(),
                 "UserAgent",
                 QString( "Monazilla/1.00 (Kita/%1)" ).arg( VERSION ) );
     }
 
-    KIO::TransferJob* job = KIO::get( m_thread.datURL(), true, true );
+    KIO::TransferJob* job = KIO::get( m_thread->datURL(), true, true );
     m_currentJob = job;
 
     connect( job, SIGNAL( data( KIO::Job*, const QByteArray& ) ),
@@ -277,8 +277,8 @@ void ThreadAccess::enter_loop()
 void ThreadAccess::slotRedirection( KIO::Job *, const KURL & newURL )
 {
     kdDebug() << "Redirected to newURL: " << newURL.url() << endl;
-    Kita::Board::setName( datToBoard( newURL.url() ), m_thread.boardName() );
-    m_thread = Kita::Thread( newURL.url() );
+    Kita::Board::setName( datToBoard( newURL.url() ), m_thread->boardName() );
+    m_thread = Kita::Thread::getByURL( newURL.url() );
     emit redirection( newURL.url() );
 }
 

diff --git a/kita/src/libkita/thread.h b/kita/src/libkita/thread.h
index 705e95a..8f23009 100644 (file)
--- a/kita/src/libkita/thread.h
+++ b/kita/src/libkita/thread.h
@@ -33,10 +33,8 @@ namespace Kita
     class Thread
     {
         Thread( const QString& datURL, const QString& threadName = QString::null );
-        friend class ThreadAccess;
-        friend class ThreadXmlParser;
-    public:
         Thread();
+    public:
         ~Thread();
 
         const QString& datURL() const;
@@ -95,7 +93,7 @@ namespace Kita
         Q_OBJECT
 
     public:
-        ThreadAccess( const Thread& thread ) : m_thread( thread ) {};
+        ThreadAccess( const Thread* thread ) : m_thread( thread ) {};
         ~ThreadAccess() {};
 
         QString get();
@@ -105,7 +103,7 @@ namespace Kita
     private:
         void enter_loop();
 
-        Thread m_thread;
+        const Thread* m_thread;
         KIO::Job* m_currentJob;
         QCString m_threadData;
         QString m_header;

diff --git a/kita/src/part/kitathreadview.cpp b/kita/src/part/kitathreadview.cpp
index 6cb94fe..e9767f2 100644 (file)
--- a/kita/src/part/kitathreadview.cpp
+++ b/kita/src/part/kitathreadview.cpp
@@ -151,7 +151,7 @@ void KitaThreadView::showThread( const Kita::Thread* thread )
 
     m_thread = const_cast<Kita::Thread *>( thread );
 
-    m_access = new Kita::ThreadAccess( *thread );
+    m_access = new Kita::ThreadAccess( thread );
     connect( m_access, SIGNAL( redirection( const QString& ) ),
              SIGNAL( setLocationBarURL( const QString& ) ) );
     QString result = m_access->get();