extbrd speed up.

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

diff --git a/kita/src/libkita/datinfo.cpp b/kita/src/libkita/datinfo.cpp
index 6b36c14..498771d 100644 (file)
--- a/kita/src/libkita/datinfo.cpp
+++ b/kita/src/libkita/datinfo.cpp
@@ -446,7 +446,7 @@ int DatInfo::isLocked()
 
 /* They are public */
 
-const QString& DatInfo::getSubject()
+const QString DatInfo::getSubject()
 {
     QMutexLocker locker( &m_mutex );
 

diff --git a/kita/src/libkita/datinfo.h b/kita/src/libkita/datinfo.h
index 8a261d7..32498f8 100644 (file)
--- a/kita/src/libkita/datinfo.h
+++ b/kita/src/libkita/datinfo.h
@@ -158,7 +158,7 @@ namespace Kita
         int isLocked();
 
         /* string data */
-        const QString& getSubject();
+        const QString getSubject();
         const QString& getRawDat();
         const QString& getDat( int num );
         const QString& getId( int num );

diff --git a/kita/src/libkita/datmanager.cpp b/kita/src/libkita/datmanager.cpp
index 597986c..3c7ce67 100644 (file)
--- a/kita/src/libkita/datmanager.cpp
+++ b/kita/src/libkita/datmanager.cpp
@@ -23,6 +23,7 @@
 #include "kita_misc.h"
 #include "kita-utf8.h"
 #include "kita-utf16.h"
+#include "threadindex.h"
 
 using namespace Kita;
 
@@ -385,21 +386,28 @@ const QString DatManager::threadURL( const KURL& url )
 
 
 /* get name (i.e. subject ) of thread from URL of dat file. */ /* public */
-const QString& DatManager::threadName( const KURL& url )
+const QString DatManager::threadName( const KURL& url )
 {
     QMutexLocker locker( &m_mutex );
 
     KURL datURL = Kita::ParseMisc::parseURLonly( url );
-    Kita::Thread* thread = Kita::Thread::getByURLNew( datURL );
 
-    if ( thread == NULL ) {
-
-        /* get subject from DatInfo */
-        DatInfo * datInfo = getDatInfo( url );
-        if ( datInfo == NULL ) return QString::null;
-        return datInfo->getSubject();
+    {
+        QString subject = Kita::ThreadIndex::getSubject( datURL );
+        if ( subject != QString::null ) {
+            return subject;
+        }
     }
 
+//    Kita::Thread* thread = Kita::Thread::getByURLNew( datURL );
+
+//    if ( thread == NULL ) {
+
+//        /* get subject from DatInfo */
+//        DatInfo * datInfo = getDatInfo( url );
+//        if ( datInfo == NULL ) return QString::null;
+//        return datInfo->getSubject();
+//    }
     return Kita::Thread::getName( datURL );
 }
 

diff --git a/kita/src/libkita/datmanager.h b/kita/src/libkita/datmanager.h
index ab7805c..29bb15b 100644 (file)
--- a/kita/src/libkita/datmanager.h
+++ b/kita/src/libkita/datmanager.h
@@ -64,7 +64,7 @@ namespace Kita
         static QString getPlainTitle( const KURL& url, int num );
 
         static const QString threadURL( const KURL& url );
-        static const QString& threadName( const KURL& url ); /* = subject of thread */
+        static const QString threadName( const KURL& url ); /* = subject of thread */
         static const QString threadID( const KURL& url );
 
         static const QString boardURL( const KURL& url );
@@ -115,7 +115,7 @@ namespace Kita
 
         /* obsolete. Don't use them. */
         static const QString thread_url( const KURL& url ) { return threadURL( url );}
-        static const QString& thread_name( const KURL& url ) { return threadName( url );}
+        static const QString thread_name( const KURL& url ) { return threadName( url );}
         static const QString thread_datID( const KURL& url ) { return threadID( url );}
         static const QString thread_boardURL( const KURL& url ) { return boardURL( url );}
         static const QString& thread_boardName( const KURL& url ) { return boardName( url );}