move Thread -> DatInfo

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

diff --git a/kita/src/libkita/datinfo.cpp b/kita/src/libkita/datinfo.cpp
index 162c3f6..74efb63 100644 (file)
--- a/kita/src/libkita/datinfo.cpp
+++ b/kita/src/libkita/datinfo.cpp
@@ -897,3 +897,13 @@ bool DatInfo::parseDat( int num )
 
     return TRUE;
 }
+
+bool DatInfo::isOpened()
+{
+    return m_isOpened;
+}
+
+void DatInfo::setIsOpened( bool isOpened )
+{
+    m_isOpened = isOpened;
+}

diff --git a/kita/src/libkita/datinfo.h b/kita/src/libkita/datinfo.h
index 46d9f7c..5660b75 100644 (file)
--- a/kita/src/libkita/datinfo.h
+++ b/kita/src/libkita/datinfo.h
@@ -109,6 +109,7 @@ namespace Kita
         KURL m_datURL;
         bool m_broken;
         ResDatVec m_resDatVec;
+        bool m_isOpened;
 
         /* for caching */
         Access* m_access;
@@ -175,6 +176,8 @@ namespace Kita
         bool isResBroken( int num );
         bool checkID( const QString& strid, int num );
         bool checkWord( QStringList& stlist, int num, bool checkOR );
+        bool isOpened();
+        void setIsOpened( bool isOpened );
 
         /* abone check */
         bool checkAbone( int num );

diff --git a/kita/src/libkita/datmanager.cpp b/kita/src/libkita/datmanager.cpp
index 3928853..fce915b 100644 (file)
--- a/kita/src/libkita/datmanager.cpp
+++ b/kita/src/libkita/datmanager.cpp
@@ -564,18 +564,18 @@ void DatManager::resetAbone( const KURL& url )
 /* check if the thread is shown on the main thread tab. */ /* public */
 bool DatManager::isMainThreadOpened( const KURL& url )
 {
-    KURL datURL = Kita::getDatURL( url ).prettyURL();
-    Kita::Thread* thread = Kita::Thread::getByURLNew( datURL );
-    if ( thread == NULL ) return FALSE;
+    DatInfo * datInfo = getDatInfo( url );
+    if ( datInfo == NULL ) return FALSE;
 
-    return thread->isOpened();
+    return datInfo->isOpened();
 }
 
 void DatManager::setMainThreadOpened( const KURL& url, bool isOpened )
 {
-    KURL datURL = Kita::getDatURL( url ).prettyURL();
-    Kita::Thread* thread = Kita::Thread::getByURLNew( datURL );
-    if ( thread != NULL ) thread->setIsOpened( isOpened );
+    DatInfo * datInfo = getDatInfo( url );
+    if ( datInfo == NULL ) return;
+
+    datInfo->setIsOpened( isOpened );
 }
 
 

diff --git a/kita/src/libkita/thread.cpp b/kita/src/libkita/thread.cpp
index b4e032b..402814a 100644 (file)
--- a/kita/src/libkita/thread.cpp
+++ b/kita/src/libkita/thread.cpp
@@ -18,7 +18,7 @@ using namespace Kita;
 QDict<Thread>* Thread::m_threadDict = 0;
 
 Thread::Thread( const KURL& datURL )
-        : m_datURL( datURL ), m_threadName( 0 ) , m_resNum( 0 ), m_readNum( 0 ), m_viewPos( 0 ), m_isOpened( 0 )
+        : m_datURL( datURL ), m_threadName( 0 ) , m_resNum( 0 ), m_readNum( 0 ), m_viewPos( 0 )
 {}
 
 Thread::~Thread()
@@ -85,19 +85,6 @@ void Thread::setViewPos( int num )
     m_viewPos = num;
 }
 
-
-/* public */
-bool Thread::isOpened() const
-{
-    return m_isOpened;
-}
-
-/* public */
-void Thread::setIsOpened( bool isOpened )
-{
-    m_isOpened = isOpened;
-}
-
 /* public */
 const QValueList< int >& Thread::markList() const
 {

diff --git a/kita/src/libkita/thread.h b/kita/src/libkita/thread.h
index 4c61f2c..ce96c74 100644 (file)
--- a/kita/src/libkita/thread.h
+++ b/kita/src/libkita/thread.h
@@ -29,7 +29,6 @@ namespace Kita
         int m_resNum;
         int m_readNum;
         int m_viewPos;
-        bool m_isOpened;
         QValueList< int > m_markList;
 
     public:
@@ -50,9 +49,6 @@ namespace Kita
         const int viewPos() const;
         void setViewPos( int viewPos );
 
-        bool isOpened() const;
-        void setIsOpened( bool isOpend );
-
         const QValueList< int >& markList() const;
         void setMarkList( const QValueList< int >& markList );
         bool isMarked( int num );