svnno****@sourc*****
svnno****@sourc*****
2009年 8月 4日 (火) 18:36:18 JST
Revision: 2502 http://sourceforge.jp/projects/kita/svn/view?view=rev&revision=2502 Author: nogu Date: 2009-08-04 18:36:17 +0900 (Tue, 04 Aug 2009) Log Message: ----------- fix a bug in ThreadIndex Modified Paths: -------------- kita/branches/KITA-KDE4/kita/src/libkita/threadindex.cpp kita/branches/KITA-KDE4/kita/src/libkita/threadindex.h Modified: kita/branches/KITA-KDE4/kita/src/libkita/threadindex.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/libkita/threadindex.cpp 2009-07-29 21:53:41 UTC (rev 2501) +++ kita/branches/KITA-KDE4/kita/src/libkita/threadindex.cpp 2009-08-04 09:36:17 UTC (rev 2502) @@ -12,7 +12,6 @@ #include <QtCore/QFile> -#include <kconfig.h> #include <KConfigGroup> #include "cache.h" @@ -23,23 +22,17 @@ using namespace Kita; -ThreadIndex::ThreadIndex(const KUrl& url) : m_url(url), m_config(0) +ThreadIndex::ThreadIndex(const KUrl& url) : m_url(url) { setUrl(url); } -ThreadIndex::~ThreadIndex() -{ - delete m_config; -} - void ThreadIndex::setUrl(const KUrl& url) { - Cache cache(url); + m_url = url; + Cache cache(m_url); QString indexPath = cache.getIndexPath(); - delete m_config; - KConfig config; - m_config = config.copyTo(indexPath, 0); + m_config.copyTo(indexPath, &m_config); } QString ThreadIndex::getSubject() const @@ -52,7 +45,7 @@ setSubjectPrivate(str); } -int ThreadIndex::getResNum() const +int ThreadIndex::getResNum() { return getResNumPrivate(); } @@ -62,7 +55,7 @@ setResNumPrivate(resNum); } -int ThreadIndex::getReadNum() const +int ThreadIndex::getReadNum() { return getReadNumPrivate(true); } @@ -92,7 +85,7 @@ /* load thread information */ /* public */ -void ThreadIndex::loadIndex(Thread* thread, bool checkCached) const +void ThreadIndex::loadIndex(Thread* thread, bool checkCached) { /* load read number */ int readNum = getReadNumPrivate(checkCached); @@ -103,7 +96,7 @@ QString subject = getSubjectPrivate(); if (subject.isEmpty() && !thread->threadName().isEmpty()) { subject = thread->threadName(); - KConfigGroup group = m_config->group(""); + KConfigGroup group = m_config.group(""); group.writeEntry("Subject", subject); } if (subject.isEmpty()) thread->setThreadName("?"); @@ -160,27 +153,28 @@ /* private */ QString ThreadIndex::getSubjectPrivate() const { - return m_config->group("").readEntry("Subject"); + return m_config.group("").readEntry("Subject"); } /* private */ void ThreadIndex::setSubjectPrivate(const QString& str) { - m_config->group("").writeEntry("Subject", str); + m_config.group("").writeEntry("Subject", str); } /*-------*/ /* private */ -int ThreadIndex::getResNumPrivate() const +int ThreadIndex::getResNumPrivate() { - int resNum = m_config->group("").readEntry("ResNum", 0); + int resNum = m_config.group("").readEntry("ResNum", 0); /* use obsoleted "cache" file */ if (!resNum) { KUrl datURL = getDatURL(m_url); resNum = ThreadInfo::readNum(datURL.prettyUrl()); - if (resNum) m_config->group("").writeEntry("ResNum", resNum); + if (resNum) + m_config.group("").writeEntry("ResNum", resNum); } return resNum; @@ -189,13 +183,13 @@ /* private */ void ThreadIndex::setResNumPrivate(int resNum) { - m_config->group("").writeEntry("ResNum", resNum); + m_config.group("").writeEntry("ResNum", resNum); } /*-------*/ /* private */ -int ThreadIndex::getReadNumPrivate(bool checkCached) const +int ThreadIndex::getReadNumPrivate(bool checkCached) { /* If cache does not exist, return 0 */ if (checkCached) { @@ -206,12 +200,12 @@ } } - int readNum = m_config->group("").readEntry("ReadNum", 0); + int readNum = m_config.group("").readEntry("ReadNum", 0); if (!readNum) { /* use ViewPos instead of ReadNum. */ - readNum = m_config->group("").readEntry("ViewPos", 0); + readNum = m_config.group("").readEntry("ViewPos", 0); /* use obsoleted "cache" file */ if (!readNum) { @@ -220,7 +214,7 @@ } if (readNum) - m_config->group("").writeEntry("ReadNum", readNum); + m_config.group("").writeEntry("ReadNum", readNum); } return readNum; @@ -229,7 +223,7 @@ /* private */ void ThreadIndex::setReadNumPrivate(int readNum) { - m_config->group("").writeEntry("ReadNum", readNum); + m_config.group("").writeEntry("ReadNum", readNum); } /*-------*/ @@ -237,13 +231,13 @@ /* private */ int ThreadIndex::getViewPosPrivate() const { - return m_config->group("").readEntry("ViewPos", 0); + return m_config.group("").readEntry("ViewPos", 0); } /* private */ void ThreadIndex::setViewPosPrivate(int viewPos) { - m_config->group("").writeEntry("ViewPos", viewPos); + m_config.group("").writeEntry("ViewPos", viewPos); } /*-------*/ @@ -252,11 +246,11 @@ QList<int> ThreadIndex::getMarkListPrivate() const { QList<int> default_value; - return m_config->group("").readEntry("Mark", default_value); + return m_config.group("").readEntry("Mark", default_value); } /* private */ void ThreadIndex::setMarkListPrivate(const QList<int>& markList) { - m_config->group("").writeEntry("Mark", markList); + m_config.group("").writeEntry("Mark", markList); } Modified: kita/branches/KITA-KDE4/kita/src/libkita/threadindex.h =================================================================== --- kita/branches/KITA-KDE4/kita/src/libkita/threadindex.h 2009-07-29 21:53:41 UTC (rev 2501) +++ kita/branches/KITA-KDE4/kita/src/libkita/threadindex.h 2009-08-04 09:36:17 UTC (rev 2502) @@ -13,10 +13,9 @@ #include <QtCore/QList> #include <QtCore/QString> +#include <kconfig.h> #include <kurl.h> -class KConfig; - namespace Kita { class Thread; @@ -28,17 +27,16 @@ { public: ThreadIndex(const KUrl& url); - ~ThreadIndex(); void setUrl(const KUrl& url); QString getSubject() const; void setSubject(const QString& str); - int getResNum() const; + int getResNum(); void setResNum(int resNum); - int getReadNum() const; + int getReadNum(); void setReadNum(int readNum); int getViewPos() const; @@ -48,7 +46,7 @@ /*---------------------------------*/ - void loadIndex(Thread* thread, bool checkCached = true) const; + void loadIndex(Thread* thread, bool checkCached = true); void saveIndex(const Thread* thread); private: @@ -56,10 +54,10 @@ QString getSubjectPrivate() const; void setSubjectPrivate(const QString& str); - int getResNumPrivate() const; + int getResNumPrivate(); void setResNumPrivate(int resNum); - int getReadNumPrivate(bool checkCached) const; + int getReadNumPrivate(bool checkCached); void setReadNumPrivate(int readNum); int getViewPosPrivate() const; @@ -69,7 +67,7 @@ void setMarkListPrivate(const QList<int>& markList); KUrl m_url; - KConfig* m_config; + KConfig m_config; }; }