int isLocked();
/* string data */
- const QString& getSubject();
+ const QString getSubject();
const QString& getRawDat();
const QString& getDat( int num );
const QString& getId( int num );
#include "kita_misc.h"
#include "kita-utf8.h"
#include "kita-utf16.h"
+#include "threadindex.h"
using namespace Kita;
/* 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 );
}
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 );
/* 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 );}