svnno****@sourc*****
svnno****@sourc*****
2009年 8月 9日 (日) 08:32:43 JST
ForkRevision: 2533
http://sourceforge.jp/projects/kita/svn/view?view=rev&revision=2533
Author: nogu
Date: 2009-08-09 08:32:43 +0900 (Sun, 09 Aug 2009)
Log Message:
-----------
don't make functions static
Modified Paths:
--------------
kita/branches/KITA-KDE4/kita/src/boardview.cpp
kita/branches/KITA-KDE4/kita/src/domtree.cpp
kita/branches/KITA-KDE4/kita/src/favoritelistview.cpp
kita/branches/KITA-KDE4/kita/src/htmlpart.cpp
kita/branches/KITA-KDE4/kita/src/libkita/datinfo.cpp
kita/branches/KITA-KDE4/kita/src/libkita/datmanager.cpp
kita/branches/KITA-KDE4/kita/src/libkita/datmanager.h
kita/branches/KITA-KDE4/kita/src/libkita/favoritethreads.cpp
kita/branches/KITA-KDE4/kita/src/libkita/kita_misc.cpp
kita/branches/KITA-KDE4/kita/src/libkita/postdata.cpp
kita/branches/KITA-KDE4/kita/src/threadlistview.cpp
kita/branches/KITA-KDE4/kita/src/threadtabwidget.cpp
kita/branches/KITA-KDE4/kita/src/threadview.cpp
kita/branches/KITA-KDE4/kita/src/viewmediator.cpp
kita/branches/KITA-KDE4/kita/src/writetabwidget.cpp
kita/branches/KITA-KDE4/kita/src/writeview.cpp
Modified: kita/branches/KITA-KDE4/kita/src/boardview.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/boardview.cpp 2009-08-08 21:40:58 UTC (rev 2532)
+++ kita/branches/KITA-KDE4/kita/src/boardview.cpp 2009-08-08 23:32:43 UTC (rev 2533)
@@ -251,10 +251,11 @@
{
QDateTime since;
since.setTime_t(datToSince(datURL));
- QString threadName = DatManager::threadName(datURL);
- int resNum = DatManager::getResNum(datURL);
- int readNum = DatManager::getReadNum(datURL);
- int viewPos = DatManager::getViewPos(datURL);
+ DatManager datManager(datURL);
+ QString threadName = datManager.threadName();
+ int resNum = datManager.getResNum();
+ int readNum = datManager.getReadNum();
+ int viewPos = datManager.getViewPos();
double speed = resNum / (since.secsTo(current) / (60.0 * 60.0 * 24.0));
if (id)
@@ -304,7 +305,7 @@
}
// no effect: m_unreadNum, m_readNum, m_newNum, markOrder
- if (DatManager::isMainThreadOpened(datURL) && resNum == readNum) {
+ if (datManager.isMainThreadOpened() && resNum == readNum) {
/* opened */
subjectList->item(row, ColumnMark)->setIcon(QIcon(SmallIcon("open")));
}
@@ -314,7 +315,7 @@
{
if (KMessageBox::warningYesNo(this, i18n("Do you want to delete Log?"),
"Kita") == KMessageBox::Yes) {
- if (DatManager::deleteCache(url)) {
+ if (DatManager(url).deleteCache()) {
ViewMediator::getInstance()->closeThreadTab(url);
slotUpdateSubject(url);
}
Modified: kita/branches/KITA-KDE4/kita/src/domtree.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/domtree.cpp 2009-08-08 21:40:58 UTC (rev 2532)
+++ kita/branches/KITA-KDE4/kita/src/domtree.cpp 2009-08-08 23:32:43 UTC (rev 2533)
@@ -35,7 +35,7 @@
/* get pointer of DatInfo */
/* Note that m_datURL is already locked in the HTMLPart. */
- m_datInfo = DatManager::getDatInfoPointer(datURL);
+ m_datInfo = DatManager(datURL).getDatInfoPointer();
}
DomTree::~DomTree() {}
Modified: kita/branches/KITA-KDE4/kita/src/favoritelistview.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/favoritelistview.cpp 2009-08-08 21:40:58 UTC (rev 2532)
+++ kita/branches/KITA-KDE4/kita/src/favoritelistview.cpp 2009-08-08 23:32:43 UTC (rev 2533)
@@ -73,13 +73,14 @@
QDateTime since;
since.setTime_t(datToSince(datURL));
- int viewPos = DatManager::getViewPos(datURL);
- int resNum = DatManager::getResNum(datURL);
+ DatManager datManager(datURL);
+ int viewPos = datManager.getViewPos();
+ int resNum = datManager.getResNum();
subjectList->item(i, ColumnBoard)
->setText(BoardManager::boardName(datURL));
subjectList->item(i, ColumnSubject)
- ->setText(DatManager::threadName(datURL));
+ ->setText(datManager.threadName());
subjectList->item(i, ColumnReadNum)
->setText(QString("%1").arg(viewPos, 4));
if (resNum > 0) {
Modified: kita/branches/KITA-KDE4/kita/src/htmlpart.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/htmlpart.cpp 2009-08-08 21:40:58 UTC (rev 2532)
+++ kita/branches/KITA-KDE4/kita/src/htmlpart.cpp 2009-08-08 23:32:43 UTC (rev 2533)
@@ -72,11 +72,12 @@
delete m_domtree;
m_domtree = 0;
+ DatManager datManager(m_datURL);
/* update ViewPos */
if (m_mode == HTMLPART_MODE_MAINPART && !m_updatedKokoyon && !m_datURL.isEmpty()) {
- int readNum = DatManager::getReadNum(m_datURL);
+ int readNum = datManager.getReadNum();
if (readNum) {
- DatManager::setViewPos(m_datURL, readNum);
+ datManager.setViewPos(readNum);
}
}
m_updatedKokoyon = false;
@@ -92,7 +93,7 @@
if (m_mode == HTMLPART_MODE_MAINPART) { /* This part is on the main thread view. */
/* tell Thread class that "thread is closed" */
- DatManager::setMainThreadOpened(m_datURL, false);
+ datManager.setMainThreadOpened(false);
/* emit "deactivated all thread view" SIGNAL */
KUrl nullUrl("");
@@ -118,19 +119,20 @@
m_datURL = getDatUrl(url);
m_mode = mode;
- if (m_mode == HTMLPART_MODE_MAINPART) { /* This part is on the main thread view. */
-
+ if (m_mode == HTMLPART_MODE_MAINPART) {
+ /* This part is on the main thread view. */
+ DatManager datManager(m_datURL);
/* create DatInfo explicitly to open new thread. */
/* Usually, DatInfo is NOT created if ReadNum == 0.*/
/* See also DatManager::createDatInfo() and */
/* DatManager::getDatInfo(). */
- DatManager::createDatInfo(m_datURL);
+ datManager.createDatInfo();
/* tell Thread class that "thread is opened" */
- DatManager::setMainThreadOpened(m_datURL, true);
+ datManager.setMainThreadOpened(true);
/* reset abone */
- DatManager::resetAbone(m_datURL);
+ datManager.resetAbone();
}
/* create HTML Document */
@@ -222,7 +224,7 @@
if (!m_domtree) return ;
int bottom = m_domtree->getBottomResNumber();
- int readNum = DatManager::getReadNum(m_datURL);
+ int readNum = DatManager(m_datURL).getReadNum();
if (bottom != readNum) {
QCursor qc; qc.setShape(Qt::WaitCursor);
@@ -329,11 +331,15 @@
m_centerNum = centerNum;
m_jumpNumAfterLoading = 0;
- if (m_mode != HTMLPART_MODE_MAINPART) return false;
- if (!m_domtree) return false;
- if (DatManager::getReadNum(m_datURL) == 0) return false;
+ if (m_mode != HTMLPART_MODE_MAINPART)
+ return false;
+ if (!m_domtree)
+ return false;
+ DatManager datManager(m_datURL);
+ if (datManager.getReadNum() == 0)
+ return false;
- int endNum = DatManager::getReadNum(m_datURL);
+ int endNum = datManager.getReadNum();
showResponses(1, endNum);
updateScreen(true , false);
gotoAnchor(QString::number(m_centerNum), false);
@@ -363,7 +369,7 @@
m_jumpNumAfterLoading = jumpNum;
/* DatManager will call back slotReceiveData and slotFinishLoad. */
- DatManager::updateCache(m_datURL , this);
+ DatManager(m_datURL).updateCache(this);
view() ->setFocus();
return true;
@@ -381,7 +387,7 @@
if (m_mode != HTMLPART_MODE_MAINPART) return ;
if (!m_domtree) return ;
- int readNum = DatManager::getReadNum(m_datURL);
+ int readNum = DatManager(m_datURL).getReadNum();
int bottom = m_domtree->getBottomResNumber();
/* parsing */
@@ -449,7 +455,8 @@
if (res > 1) {
/* is target valid ? */
- if (!DatManager::isResValid(m_datURL, res)) return false;
+ if (!DatManager(m_datURL).isResValid(res))
+ return false;
ancstr = QString::number(res);
}
@@ -474,7 +481,7 @@
if (!m_domtree) return ;
if (m_mode != HTMLPART_MODE_MAINPART) return ;
- int kokoyon = DatManager::getViewPos(m_datURL);
+ int kokoyon = DatManager(m_datURL).getViewPos();
gotoAnchor(QString::number(kokoyon), false);
}
@@ -520,7 +527,7 @@
}
int bottom = m_domtree->getBottomResNumber();
- int readNum = DatManager::getReadNum(m_datURL);
+ int readNum = DatManager(m_datURL).getReadNum();
if (readNum != bottom) {
showResponses(bottom + 1, readNum);
@@ -700,6 +707,7 @@
showppm = true;
+ DatManager datManager(m_datURL);
// back
if (!m_anchorStack.isEmpty()) {
backSubMenu = new KMenu(view());
@@ -707,7 +715,7 @@
int i = m_anchorStack.size();
QStringList::iterator it;
for (it = m_anchorStack.begin(); it != m_anchorStack.end(); it++, i--) {
- str = (*it) + " " + DatManager::getPlainBody(m_datURL, (*it).toInt()).left(10);
+ str = (*it) + " " + datManager.getPlainBody((*it).toInt()).left(10);
KAction* backLink = new KAction(str, this);
backSubMenu->addAction(backLink);
}
@@ -718,9 +726,9 @@
}
// mark
- int readNum = DatManager::getReadNum(m_datURL);
+ int readNum = datManager.getReadNum();
for (int i = 1; i <= readNum ; i++) {
- if (DatManager::isMarked(m_datURL, i)) {
+ if (datManager.isMarked(i)) {
if (!markSubMenu) {
markSubMenu = new KMenu(view());
markSubMenu->setTitle(i18n("Mark"));
@@ -728,7 +736,7 @@
popupMenu.addSeparator();
}
str = QString::number(i) + " "
- + DatManager::getPlainBody(m_datURL, i).left(10);
+ + datManager.getPlainBody(i).left(10);
KAction *gotoMarkAct = new KAction(str, this);
markSubMenu->addAction(gotoMarkAct);
}
@@ -741,7 +749,7 @@
// template
if (m_mode == HTMLPART_MODE_MAINPART) {
- int kokoyon = DatManager::getViewPos(m_datURL);
+ int kokoyon = datManager.getViewPos();
if (kokoyon) {
str = i18n("Kokomade Yonda (%1)", kokoyon);
kokoLinkAct = new KAction(str, this);
@@ -1028,12 +1036,13 @@
QClipboard * clipboard = QApplication::clipboard();
QString str, resstr;
int resNum = refstr.mid(5).toInt();
- QString namestr = DatManager::getPlainName(m_datURL, resNum);
+ DatManager datManager(m_datURL);
+ QString namestr = datManager.getPlainName(resNum);
/* show res tree */
if (m_pushrightbt) {
int num;
- QString htmlstr = DatManager::getTreeByRes(m_datURL, resNum, num);
+ QString htmlstr = datManager.getTreeByRes(resNum, num);
if (!num) return ;
QString tmpstr = QString("<DIV>No.%1 : [%2]<BR>").arg(resNum).arg(num);
tmpstr += htmlstr + "<BR><BR></DIV>";
@@ -1063,7 +1072,7 @@
// mark
KAction* markAct = new KAction(i18n("Mark"), this);
markAct->setCheckable(true);
- markAct->setChecked(DatManager::isMarked(m_datURL, resNum));
+ markAct->setChecked(datManager.isMarked(resNum));
popupMenu.addAction(markAct);
popupMenu.addSeparator();
@@ -1122,29 +1131,29 @@
ViewMediator::getInstance()->showWriteView(m_datURL, resstr);
} else if (action == quoteAct) {
resstr = ">>" + QString::number(resNum) + '\n'
- + "> " + DatManager::getPlainTitle(m_datURL, resNum) + '\n'
- + "> " + DatManager::getPlainBody(m_datURL, resNum).replace('\n', "\n> ") + '\n';
+ + "> " + datManager.getPlainTitle(resNum) + '\n'
+ + "> " + datManager.getPlainBody(resNum).replace('\n', "\n> ") + '\n';
ViewMediator::getInstance()->showWriteView(m_datURL, resstr);
} else if (action == markAct) {
- DatManager::setMark(m_datURL, resNum, !DatManager::isMarked(m_datURL, resNum));
+ datManager.setMark(resNum, !datManager.isMarked(resNum));
} else if (action == copyAct || action == copyUrlAct || action == copyThreadNameAct) {
str.clear();
// title
if (action == copyThreadNameAct || action == copyAct) {
- str = DatManager::threadName(m_datURL);
+ str = datManager.threadName();
}
// url
if (!str.isEmpty()) str += '\n';
- str += DatManager::threadURL(m_datURL) + '/' + QString::number(resNum)
+ str += datManager.threadURL() + '/' + QString::number(resNum)
+ '\n';
// body
if (action == copyAct) {
str += '\n'
- + DatManager::getPlainTitle(m_datURL, resNum) + '\n'
- + DatManager::getPlainBody(m_datURL, resNum) + '\n';
+ + datManager.getPlainTitle(resNum) + '\n'
+ + datManager.getPlainBody(resNum) + '\n';
}
// copy
@@ -1152,14 +1161,14 @@
clipboard->setText(str , QClipboard::Selection);
} else if (action == setKokoYonAct) {
- DatManager::setViewPos(m_datURL, resNum);
+ datManager.setViewPos(resNum);
ViewMediator::getInstance()->updateBoardView(m_datURL);
m_updatedKokoyon = true;
updateScreen(true, true);
gotoAnchor(QString::number(resNum), false);
} else if (action == showBrowserAct) {
- str = DatManager::threadURL(m_datURL) + '/' + QString::number(resNum);
+ str = datManager.threadURL() + '/' + QString::number(resNum);
KRun::runUrl(str, "text/html", view());
} else if (action == aboneNameAct) {
@@ -1186,8 +1195,7 @@
/* popup */
if (m_pushrightbt) {
int num;
- QString htmlstr
- = DatManager::getHtmlByID(m_datURL, strid, num);
+ QString htmlstr = DatManager(m_datURL).getHtmlById(strid, num);
if (num <= 1) return ;
QString tmpstr = QString("<DIV>ID:%1:[%2]<BR>").arg(strid).arg(num);
tmpstr += htmlstr + "<BR><BR></DIV>";
@@ -1225,7 +1233,7 @@
void HTMLPart::showBePopupMenu(const QString& refstr)
{
QString strURL = "http://be.2ch.net/test/p.php?i=" + refstr.mid(5)
- + "&u=d:" + DatManager::threadURL(m_datURL) + "/l50";
+ + "&u=d:" + DatManager(m_datURL).threadURL() + "/l50";
if (m_pushrightbt) {
// create popup menu
@@ -1280,7 +1288,7 @@
/* for convenience */ /* public slot */
void HTMLPart::slotShowResPopup(const QPoint& point, int refNum, int refNum2)
{
- QString innerHTML = DatManager::getHtml(m_datURL, refNum, refNum2);
+ QString innerHTML = DatManager(m_datURL).getHtml(refNum, refNum2);
if (innerHTML.isEmpty()) return ;
showPopupCore(m_datURL, innerHTML, point);
@@ -1455,11 +1463,12 @@
datURL = getDatUrl(KUrl(m_datURL, url) , refstr);
}
+ DatManager datManager(m_datURL);
/*------------------------*/
/* id popup */
if (url.left(6) == "#idpop") {
- int num = DatManager::getNumByID(m_datURL, url.mid(6));
+ int num = datManager.getNumByID(url.mid(6));
QString tmpstr;
if (num >= 2) {
tmpstr = QString("<DIV>ID:%1:[%2]</DIV>").arg(url.mid(6)).arg(num);
@@ -1479,7 +1488,7 @@
if (refstr.left(5) == "write") {
int no = refstr.mid(5).toInt();
int num = 0;
- DatManager::getTreeByRes(m_datURL, no, num);
+ datManager.getTreeByRes(no, num);
QString tmpstr;
if (num) {
tmpstr = QString("<DIV>No.%1 : [%2]</DIV>").arg(no).arg(num);
@@ -1497,7 +1506,7 @@
if (url.left(6) == "#abone") {
int no = url.mid(6).toInt();
- QString tmpstr = DatManager::getHtml(m_datURL, no, no, false);
+ QString tmpstr = datManager.getHtml(no, no, false);
showPopup(m_datURL, tmpstr);
return ;
}
@@ -1534,10 +1543,10 @@
/* If idx file of datURL is not read, thread name cannot be obtained.
so, create DatInfo if cache exists, and read idx file in DatInfo::DatInfo(). */
- DatManager::getDatInfoPointer(datURL);
+ datManager.getDatInfoPointer();
/* get thread Name */
- QString subName = DatManager::threadName(datURL);
+ QString subName = datManager.threadName();
if (!subName.isEmpty()) innerHTML += subName + "<br><br>";
if (!refNum) refNum = refNum2 = 1;
@@ -1545,7 +1554,7 @@
/* get HTML and show it */
if (!refNum) return ;
- innerHTML += DatManager::getHtml(datURL, refNum, refNum2);
+ innerHTML += datManager.getHtml(refNum, refNum2);
if (!innerHTML.isEmpty()) showPopup(datURL, innerHTML);
}
@@ -1565,7 +1574,7 @@
unsigned int length = selectText.length();
if ((refNum = stringToPositiveNum(chpt, length)) != -1) {
- QString innerHTML = DatManager::getHtml(m_datURL, refNum, refNum);
+ QString innerHTML = DatManager(m_datURL).getHtml(refNum, refNum);
if (!innerHTML.isEmpty()) {
showPopup(m_datURL, innerHTML);
startMultiPopup();
Modified: kita/branches/KITA-KDE4/kita/src/libkita/datinfo.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/libkita/datinfo.cpp 2009-08-08 21:40:58 UTC (rev 2532)
+++ kita/branches/KITA-KDE4/kita/src/libkita/datinfo.cpp 2009-08-08 23:32:43 UTC (rev 2533)
@@ -277,7 +277,9 @@
m_threadIndex.saveIndex(m_thread);
/* re-try by offlaw.cgi */
- if (m_thread->readNum() == 0 && m_access2 == 0 && DatManager::is2chThread(m_datURL)) {
+ DatManager datManager(m_datURL);
+ if (m_thread->readNum() == 0 && m_access2 == 0
+ && datManager.is2chThread()) {
if (Account::isLogged()) {
initPrivate(true);
m_access2 = new OfflawAccess(m_datURL);
Modified: kita/branches/KITA-KDE4/kita/src/libkita/datmanager.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/libkita/datmanager.cpp 2009-08-08 21:40:58 UTC (rev 2532)
+++ kita/branches/KITA-KDE4/kita/src/libkita/datmanager.cpp 2009-08-08 23:32:43 UTC (rev 2533)
@@ -32,17 +32,20 @@
/*-----------------------------------------------------------------------*/
+DatManager::DatManager(const KUrl& url) : m_url(url)
+{
+ m_datUrl = getDatUrl(url);
+ m_searchDatInfo = searchDatInfo();
+ m_datInfo = getDatInfo();
+}
/* create DatInfo explicitly. */
/* Usually, DatInfo is NOT created
if cache does not exist(i.e. ReadNum == 0). */ /* public */
-bool DatManager::createDatInfo(const KUrl& url)
+bool DatManager::createDatInfo()
{
- if (getDatInfo(url,
- false /* don't check the existence of cache */
- ) == 0) return false;
- return true;
+ return !(getDatInfo(false /* don't check the existence of cache */) == 0);
}
@@ -51,9 +54,9 @@
/* !!! NOTICE !!! */
/* It is very dangerous to access to DatInfo directly. */
/* Usually, access to it through DatManager. */ /* public */
-DatInfo * DatManager::getDatInfoPointer(const KUrl& url)
+DatInfo * DatManager::getDatInfoPointer()
{
- return getDatInfo(url);
+ return m_datInfo;
}
@@ -71,24 +74,25 @@
see also DatManager::searchDatInfo() and DatManager::createDatInfo() */ /* private */
-DatInfo* DatManager::getDatInfo(const KUrl& url, bool checkCached)
+DatInfo* DatManager::getDatInfo(bool checkCached)
{
/* search */
- DatInfo * datInfo = searchDatInfo(url);
- if (datInfo != 0) return datInfo;
+ if (m_searchDatInfo != 0)
+ return m_searchDatInfo;
/* create and enroll instance */
- return enrollDatInfo(url, checkCached);
+ return enrollDatInfo(checkCached);
}
/* This function just searches instance of DatInfo specified by datURL
without creating instance. */ /* private */
-DatInfo* DatManager::searchDatInfo(const KUrl& url)
+DatInfo* DatManager::searchDatInfo()
{
- KUrl datURL = getDatUrl(url);
- if (datURL.isEmpty()) return 0; /* This url is not enrolled in BoardManager. */
- if (m_datInfoList.isEmpty()) return 0;
+ if (m_datUrl.isEmpty())
+ return 0; /* This url is not enrolled in BoardManager. */
+ if (m_datInfoList.isEmpty())
+ return 0;
int i = 0;
DatInfoList::Iterator it;
@@ -98,7 +102,7 @@
datInfo = (*it);
- if (datURL == datInfo->url()) {
+ if (m_datUrl == datInfo->url()) {
/* LRU */
if (i) {
@@ -115,14 +119,15 @@
/* create and enroll the instance of DatInfo and delete old instances.
- Note that DatInfo::DatInfo() opens cached data and reads it. */ /* private */
-DatInfo* DatManager::enrollDatInfo(const KUrl& url, bool checkCached)
+ Note that DatInfo::DatInfo() opens cached data and reads it. */
+/* private */
+DatInfo* DatManager::enrollDatInfo(bool checkCached)
{
- KUrl datURL = getDatUrl(url);
- if (datURL.isEmpty()) return 0; /* This url is not enrolled in BoardManager. */
+ if (m_datUrl.isEmpty())
+ return 0; /* This url is not enrolled in BoardManager. */
/* create DatInfo & read cached data */
- DatInfo* datInfo = new DatInfo(datURL);
+ DatInfo* datInfo = new DatInfo(m_datUrl);
/* Does cache exist ? */
/* If cache does not exist, delete DatInfo here. */
@@ -163,46 +168,37 @@
/* update cache */ /* public */
-bool DatManager::updateCache(const KUrl& url , const QObject* parent)
+bool DatManager::updateCache(const QObject* parent)
{
- DatInfo * datInfo = getDatInfo(url);
- if (datInfo == 0) return false;
-
- return datInfo->updateCache(parent);
+ return (m_datInfo == 0) ? false : m_datInfo->updateCache(parent);
}
/* public */
-int DatManager::getResponseCode(const KUrl& url)
+int DatManager::getResponseCode()
{
- DatInfo * datInfo = getDatInfo(url);
- if (datInfo == 0) return 0;
-
- return datInfo->getResponseCode();
+ return (m_datInfo == 0) ? 0 : m_datInfo->getResponseCode();
}
/* public */
-int DatManager::getServerTime(const KUrl& url)
+int DatManager::getServerTime()
{
- DatInfo * datInfo = getDatInfo(url);
- if (datInfo == 0) return 0;
-
- return datInfo->getServerTime();
+ return (m_datInfo == 0) ? 0 : m_datInfo->getServerTime();
}
/* public */
-bool DatManager::deleteCache(const KUrl& url)
+bool DatManager::deleteCache()
{
- KUrl datURL = getDatUrl(url);
- Thread* thread = Thread::getByURLNew(datURL);
- if (thread == 0) return false;
- if (thread->readNum() == 0) return false;
+ Thread* thread = Thread::getByURLNew(m_datUrl);
+ if (thread == 0)
+ return false;
+ if (thread->readNum() == 0)
+ return false;
/* init DatInfo */
- DatInfo * datInfo = searchDatInfo(datURL);
- if (datInfo) {
- if (!datInfo->deleteCache()) return false;
+ if (m_searchDatInfo && !m_searchDatInfo->deleteCache()) {
+ return false;
}
/* reset readNum & veiwPos */
@@ -210,35 +206,31 @@
thread->setViewPos(0);
/* delete cache */
- Cache cache(datURL);
+ Cache cache(m_datUrl);
QString cachePath = cache.getPath();
QString indexPath = cache.getIndexPath();
QFile::remove(indexPath);
QFile::remove(cachePath);
/* delete log from "cache" */
- ThreadInfo::removeThreadInfo(datURL.prettyUrl());
+ ThreadInfo::removeThreadInfo(m_datUrl.prettyUrl());
return true;
}
/* public */
-bool DatManager::isLoadingNow(const KUrl& url)
+bool DatManager::isLoadingNow()
{
- DatInfo * datInfo = searchDatInfo(url);
- if (datInfo == 0) return false;
-
- return datInfo->isLoadingNow();
+ return (m_searchDatInfo == 0) ? false : m_searchDatInfo->isLoadingNow();
}
/* public */
-void DatManager::stopLoading(const KUrl& url)
+void DatManager::stopLoading()
{
- DatInfo * datInfo = searchDatInfo(url);
- if (datInfo == 0) return ;
-
- return datInfo->stopLoading();
+ if (m_searchDatInfo == 0)
+ return;
+ m_searchDatInfo->stopLoading();
}
/*--------------------------------------*/
@@ -246,324 +238,256 @@
/* public */
-QString DatManager::getDat(const KUrl& url, int num)
+QString DatManager::getDat(int num)
{
- DatInfo * datInfo = getDatInfo(url);
- if (datInfo == 0) return QString();
-
- return datInfo->getDat(num);
+ return (m_datInfo == 0) ? QString() : m_datInfo->getDat(num);
}
/* public */
-QString DatManager::getId(const KUrl& url, int num)
+QString DatManager::getId(int num)
{
- DatInfo * datInfo = getDatInfo(url);
- if (datInfo == 0) return QString();
-
- return datInfo->getId(num);
+ return (m_datInfo == 0) ? QString() : m_datInfo->getId(num);
}
/* public */
-QString DatManager::getPlainName(const KUrl& url, int num)
+QString DatManager::getPlainName(int num)
{
- DatInfo * datInfo = getDatInfo(url);
- if (datInfo == 0) return QString();
-
- return datInfo->getPlainName(num);
+ return (m_datInfo == 0) ? QString() : m_datInfo->getPlainName(num);
}
/* public */
-QString DatManager::getPlainBody(const KUrl& url, int num)
+QString DatManager::getPlainBody(int num)
{
- DatInfo * datInfo = getDatInfo(url);
- if (datInfo == 0) return QString();
-
- return datInfo->getPlainBody(num);
+ return (m_datInfo == 0) ? QString() : m_datInfo->getPlainBody(num);
}
/* public */
-QString DatManager::getPlainTitle(const KUrl& url, int num)
+QString DatManager::getPlainTitle(int num)
{
- DatInfo * datInfo = getDatInfo(url);
- if (datInfo == 0) return QString();
-
- return datInfo->getPlainTitle(num);
+ return (m_datInfo == 0) ? QString() : m_datInfo->getPlainTitle(num);
}
/* get name (i.e. subject) of thread from URL of dat file. */ /* public */
-const QString DatManager::threadName(const KUrl& url)
+QString DatManager::threadName()
{
- KUrl datURL = getDatUrl(url);
- Thread* thread = Thread::getByURLNew(datURL);
- if (thread != 0) return thread->threadName();
-
- return QString();
+ Thread* thread = Thread::getByURLNew(m_datUrl);
+ return (thread != 0) ? thread->threadName() : QString();
}
/* public */
-const QString DatManager::threadID(const KUrl& url)
+QString DatManager::threadID()
{
- KUrl datURL = getDatUrl(url);
- return datURL.fileName().section('.', 0, 0);
+ return m_datUrl.fileName().section('.', 0, 0);
}
/*---------------------------------------*/
/* HTML data */
/* public */
-QString DatManager::getHtml(const KUrl& url, int startnum, int endnum, bool checkAbone)
+QString DatManager::getHtml(int startnum, int endnum, bool checkAbone)
{
- DatInfo * datInfo = getDatInfo(url);
- if (datInfo == 0) return QString();
-
- return datInfo->getHTMLString(startnum, endnum, checkAbone);
+ return (m_datInfo == 0)
+ ? QString() : m_datInfo->getHTMLString(startnum, endnum, checkAbone);
}
/* public */
-QString DatManager::getHtmlByID(const KUrl& url, const QString& strid, int &count)
+QString DatManager::getHtmlById(const QString& strid, int &count)
{
- DatInfo * datInfo = getDatInfo(url);
- if (datInfo == 0) return QString();
-
- return datInfo->getHtmlByID(strid, count);
+ return (m_datInfo == 0) ? QString() : m_datInfo->getHtmlByID(strid, count);
}
/* Get HTML document of res tree.*/ /* public */
-QString DatManager::getTreeByRes(const KUrl& url, const int rootnum, int &count)
+QString DatManager::getTreeByRes(const int rootnum, int &count)
{
- DatInfo * datInfo = getDatInfo(url);
- if (datInfo == 0) return QString();
-
- return datInfo->getTreeByRes(rootnum, count);
+ return (m_datInfo == 0)
+ ? QString() : m_datInfo->getTreeByRes(rootnum, count);
}
/* Get HTML document of reverse res tree.*/ /* public */
-QString DatManager::getTreeByResReverse(const KUrl& url, const int rootnum, int &count)
+QString DatManager::getTreeByResReverse(int rootnum, int &count)
{
- DatInfo * datInfo = getDatInfo(url);
- if (datInfo == 0) return QString();
-
- return datInfo->getTreeByResReverse(rootnum, count);
+ return (m_datInfo == 0)
+ ? QString() : m_datInfo->getTreeByResReverse(rootnum, count);
}
/* public */
-int DatManager::getResNum(const KUrl& url)
+int DatManager::getResNum()
{
- KUrl datURL = getDatUrl(url);
- Thread* thread = Thread::getByURLNew(datURL);
- if (thread != 0) return thread->resNum();
-
- return 0;
+ Thread* thread = Thread::getByURLNew(m_datUrl);
+ return (thread != 0) ? thread->resNum() : 0;
}
/* public */
-int DatManager::getReadNum(const KUrl& url)
+int DatManager::getReadNum()
{
- KUrl datURL = getDatUrl(url);
- Thread* thread = Thread::getByURLNew(datURL);
- if (thread != 0) return thread->readNum();
-
- return 0;
+ Thread* thread = Thread::getByURLNew(m_datUrl);
+ return (thread != 0) ? thread->readNum() : 0;
}
/* public */
-int DatManager::getViewPos(const KUrl& url)
+int DatManager::getViewPos()
{
- KUrl datURL = getDatUrl(url);
- Thread* thread = Thread::getByURLNew(datURL);
- if (thread != 0) return thread->viewPos();
-
- return 0;
+ Thread* thread = Thread::getByURLNew(m_datUrl);
+ return (thread != 0) ? thread->viewPos() : 0;
}
/* public */
-void DatManager::setViewPos(const KUrl& url , int num)
+void DatManager::setViewPos(int num)
{
- KUrl datURL = getDatUrl(url);
- Thread* thread = Thread::getByURLNew(datURL);
- if (thread != 0) thread->setViewPos(num);
+ Thread* thread = Thread::getByURLNew(m_datUrl);
+ if (thread != 0)
+ thread->setViewPos(num);
/* save idx */
- ThreadIndex threadIndex(url);
+ ThreadIndex threadIndex(m_url);
threadIndex.setViewPos(num);
/* save "cache" */
- ThreadInfo::setReadNum(datURL.prettyUrl(), num);
+ ThreadInfo::setReadNum(m_datUrl.prettyUrl(), num);
}
/* public */
-int DatManager::getDatSize(const KUrl& url)
+int DatManager::getDatSize()
{
- DatInfo * datInfo = getDatInfo(url);
- if (datInfo == 0) return 0;
-
- return datInfo->getDatSize();
+ return (m_datInfo == 0) ? 0 : m_datInfo->getDatSize();
}
/* get number of responses which have same ID. */ /* public */
-int DatManager::getNumByID(const KUrl& url, const QString& strid)
+int DatManager::getNumByID(const QString& strid)
{
- DatInfo * datInfo = getDatInfo(url);
- if (datInfo == 0) return 0;
-
- return datInfo->getNumByID(strid);
+ return (m_datInfo == 0) ? 0 : m_datInfo->getNumByID(strid);
}
/* public */
-bool DatManager::isThreadEnrolled(const KUrl& url)
+bool DatManager::isThreadEnrolled()
{
- if (getDatUrl(url).isEmpty()) return false;
-
- return true;
+ return !m_datUrl.isEmpty();
}
/* public */
-bool DatManager::is2chThread(const KUrl& url)
+bool DatManager::is2chThread()
{
- if (BoardManager::type(url) != Board_2ch) return false;
- if (getDatUrl(url).isEmpty()) return false;
+ if (BoardManager::type(m_url) != Board_2ch)
+ return false;
+ if (m_datUrl.isEmpty())
+ return false;
QRegExp url_2ch(".*\\.2ch\\.net");
QRegExp url_bbspink(".*\\.bbspink\\.com");
- if (url_2ch.indexIn(url.host()) != -1
- || url_bbspink.indexIn(url.host()) != -1) return true;
+ if (url_2ch.indexIn(m_url.host()) != -1
+ || url_bbspink.indexIn(m_url.host()) != -1)
+ return true;
return false;
}
/* public */
-bool DatManager::isResValid(const KUrl& url, int num)
+bool DatManager::isResValid(int num)
{
- DatInfo * datInfo = getDatInfo(url);
- if (datInfo == 0) return false;
-
- return datInfo->isResValid(num);
+ return (m_datInfo == 0) ? false : m_datInfo->isResValid(num);
}
/* public */
-bool DatManager::isBroken(const KUrl& url)
+bool DatManager::isBroken()
{
- DatInfo * datInfo = getDatInfo(url);
- if (datInfo == 0) return false;
-
- return datInfo->isBroken();
+ return (m_datInfo == 0) ? false : m_datInfo->isBroken();
}
/* public */
-bool DatManager::isResBroken(const KUrl& url, int num)
+bool DatManager::isResBroken(int num)
{
- DatInfo * datInfo = getDatInfo(url);
- if (datInfo == 0) return false;
-
- return datInfo->isResBroken(num);
+ return (m_datInfo == 0) ? false : m_datInfo->isResBroken(num);
}
/* check if ID == strid */ /* public */
-bool DatManager::checkID(const KUrl& url, const QString& strid, int num)
+bool DatManager::checkId(const QString& strid, int num)
{
- DatInfo * datInfo = getDatInfo(url);
- if (datInfo == 0) return false;
-
- return datInfo->checkID(strid, num);
+ return (m_datInfo == 0) ? false : m_datInfo->checkID(strid, num);
}
/* check if keywords are included */ /* public */
-bool DatManager::checkWord(const KUrl& url,
- const QStringList& strlist, int num,
- bool checkOR /* AND or OR search */
+bool DatManager::checkWord(const QStringList& strlist, int num,
+ bool checkOr /* AND or OR search */
)
{
- DatInfo * datInfo = getDatInfo(url);
- if (datInfo == 0) return false;
-
- return datInfo->checkWord(strlist, num, checkOR);
+ return (m_datInfo == 0)
+ ? false : m_datInfo->checkWord(strlist, num, checkOr);
}
/* public */
-bool DatManager::isMarked(const KUrl& url, int num)
+bool DatManager::isMarked(int num)
{
- KUrl datURL = getDatUrl(url);
- Thread* thread = Thread::getByURLNew(datURL);
- if (thread == 0) return false;
-
- return thread->isMarked(num);
+ Thread* thread = Thread::getByURLNew(m_datUrl);
+ return (thread == 0) ? false : thread->isMarked(num);
}
/* public */
-void DatManager::setMark(const KUrl& url, int num, bool mark)
+void DatManager::setMark(int num, bool mark)
{
- KUrl datURL = getDatUrl(url);
- Thread* thread = Thread::getByURLNew(datURL);
- if (thread == 0) return ;
+ Thread* thread = Thread::getByURLNew(m_datUrl);
+ if (thread == 0)
+ return;
if (thread->setMark(num, mark)) {
- ThreadIndex threadIndex(url);
+ ThreadIndex threadIndex(m_url);
threadIndex.setMarkList(thread->markList());
}
}
/* public */
-bool DatManager::checkAbone(const KUrl& url, int num)
+bool DatManager::checkAbone(int num)
{
- DatInfo * datInfo = getDatInfo(url);
- if (datInfo == 0) return false;
-
- return datInfo->checkAbone(num);
+ return (m_datInfo == 0) ? false : m_datInfo->checkAbone(num);
}
/* public */
-void DatManager::resetAbone(const KUrl& url)
+void DatManager::resetAbone()
{
- DatInfo * datInfo = getDatInfo(url);
- if (datInfo == 0) return ;
-
- datInfo->resetAbone();
+ if (m_datInfo == 0)
+ return;
+ m_datInfo->resetAbone();
}
/* check if the thread is shown on the main thread tab. */ /* public */
-bool DatManager::isMainThreadOpened(const KUrl& url)
+bool DatManager::isMainThreadOpened()
{
- DatInfo * datInfo = getDatInfo(url);
- if (datInfo == 0) return false;
-
- return datInfo->isOpened();
+ return (m_datInfo == 0) ? false : m_datInfo->isOpened();
}
-void DatManager::setMainThreadOpened(const KUrl& url, bool isOpened)
+void DatManager::setMainThreadOpened(bool isOpened)
{
- DatInfo * datInfo = getDatInfo(url);
- if (datInfo == 0) return;
-
- datInfo->setIsOpened(isOpened);
+ if (m_datInfo == 0)
+ return;
+ m_datInfo->setIsOpened(isOpened);
}
@@ -571,8 +495,7 @@
/* obsolete */
/* public */
-const QString DatManager::threadURL(const KUrl& url)
+QString DatManager::threadURL()
{
- return getThreadURL(url);
+ return getThreadURL(m_url);
}
-
Modified: kita/branches/KITA-KDE4/kita/src/libkita/datmanager.h
===================================================================
--- kita/branches/KITA-KDE4/kita/src/libkita/datmanager.h 2009-08-08 21:40:58 UTC (rev 2532)
+++ kita/branches/KITA-KDE4/kita/src/libkita/datmanager.h 2009-08-08 23:32:43 UTC (rev 2533)
@@ -12,9 +12,8 @@
#include <QtCore/QList>
-#include <kdemacros.h>
+#include <kurl.h>
-class KUrl;
class QObject;
class QStringList;
@@ -29,73 +28,81 @@
static DatInfoList m_datInfoList;
public:
+ explicit DatManager(const KUrl& url);
- static bool createDatInfo(const KUrl& url);
- static DatInfo* getDatInfoPointer(const KUrl& url);
+ bool createDatInfo();
+ DatInfo* getDatInfoPointer();
static void deleteAllDatInfo();
/* caching */
- static bool updateCache(const KUrl& url , const QObject* parent);
- static int getResponseCode(const KUrl& url);
- static int getServerTime(const KUrl& url);
- static bool deleteCache(const KUrl& url);
- static bool isLoadingNow(const KUrl& url);
- static void stopLoading(const KUrl& url);
+ bool updateCache(const QObject* parent);
+ int getResponseCode();
+ int getServerTime();
+ bool deleteCache();
+ bool isLoadingNow();
+ void stopLoading();
/* string data */
- static QString getDat(const KUrl& url, int num);
- static QString getId(const KUrl& url, int num);
- static QString getPlainName(const KUrl& url, int num);
- static QString getPlainBody(const KUrl& url, int num);
- static QString getPlainTitle(const KUrl& url, int num);
+ QString getDat(int num);
+ QString getId(int num);
+ QString getPlainName(int num);
+ QString getPlainBody(int num);
+ QString getPlainTitle(int num);
- static const QString threadName(const KUrl& url); /* = subject of thread */
- static const QString threadID(const KUrl& url);
+ QString threadName(); /* = subject of thread */
+ QString threadID();
/* HTML data */
- static QString getHtml(const KUrl& url, int startnum, int endnum, bool checkAbone = true);
- static QString getHtmlByID(const KUrl& url, const QString& strid, int &count);
- static QString getTreeByRes(const KUrl& url, const int rootnum, int &count);
- static QString getTreeByResReverse(const KUrl& url, const int rootnum, int &count);
+ QString getHtml(int startnum, int endnum, bool checkAbone = true);
+ QString getHtmlById(const QString& strid, int &count);
+ QString getTreeByRes(int rootnum, int &count);
+ QString getTreeByResReverse(int rootnum, int &count);
/* numerical data */
- static int getResNum(const KUrl& url);
- static int getReadNum(const KUrl& url);
- static int getViewPos(const KUrl& url);
- static void setViewPos(const KUrl& url, int num);
- static int getDatSize(const KUrl& url);
- static int getNumByID(const KUrl& url, const QString& strid);
+ int getResNum();
+ int getReadNum();
+ int getViewPos();
+ void setViewPos(int num);
+ int getDatSize();
+ int getNumByID(const QString& strid);
/* another information */
- static bool isThreadEnrolled(const KUrl& url);
- static bool is2chThread(const KUrl& url);
- static bool isResValid(const KUrl& url , int num);
- static bool isBroken(const KUrl& url);
- static bool isResBroken(const KUrl& url , int num);
- static bool checkID(const KUrl& url, const QString& strid, int num);
- static bool checkWord(const KUrl& url, const QStringList& stlist, int num, bool checkOR);
- static bool isMarked(const KUrl& url, int num);
- static void setMark(const KUrl& url, int num, bool mark);
+ bool isThreadEnrolled();
+ bool is2chThread();
+ bool isResValid(int num);
+ bool isBroken();
+ bool isResBroken(int num);
+ bool checkId(const QString& strid, int num);
+ bool checkWord(const QStringList& stlist, int num, bool checkOr);
+ bool isMarked(int num);
+ void setMark(int num, bool mark);
/* abone check */
- static bool checkAbone(const KUrl& url, int num);
- static void resetAbone(const KUrl& url);
+ bool checkAbone(int num);
+ void resetAbone();
/* check if the thread is shown on the main thread tab. */
- static bool isMainThreadOpened(const KUrl& url);
- static void setMainThreadOpened(const KUrl& url, bool isOpened);
+ bool isMainThreadOpened();
+ void setMainThreadOpened(bool isOpened);
/* obsolete. Don't use them. */
- static const QString threadURL(const KUrl& url);
+ QString threadURL();
private:
+ DatInfo* getDatInfo(bool checkCached = true);
+ DatInfo* searchDatInfo();
+ DatInfo* enrollDatInfo(bool checkCached);
- static DatInfo* getDatInfo(const KUrl& url, bool checkCached = true);
- static DatInfo* searchDatInfo(const KUrl& url);
- static DatInfo* enrollDatInfo(const KUrl& url, bool checkCached);
+ KUrl m_url;
+ KUrl m_datUrl;
+ DatInfo* m_datInfo;
+ DatInfo* m_searchDatInfo;
+
+ DatManager(const DatManager&);
+ DatManager& operator=(const DatManager&);
};
}
Modified: kita/branches/KITA-KDE4/kita/src/libkita/favoritethreads.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/libkita/favoritethreads.cpp 2009-08-08 21:40:58 UTC (rev 2532)
+++ kita/branches/KITA-KDE4/kita/src/libkita/favoritethreads.cpp 2009-08-08 23:32:43 UTC (rev 2533)
@@ -139,12 +139,13 @@
threadElement.appendChild(datURLElement);
datURLElement.appendChild(document.createTextNode(datURL));
- QString threadName = DatManager::threadName(datURL);
+ DatManager datManager(datURL);
+ QString threadName = datManager.threadName();
QDomElement nameElement = document.createElement("name");
threadElement.appendChild(nameElement);
nameElement.appendChild(document.createTextNode(threadName));
- QString resNum = QString::number(DatManager::getResNum(datURL));
+ QString resNum = QString::number(datManager.getResNum());
QDomElement resNumElement = document.createElement("resnum");
threadElement.appendChild(resNumElement);
resNumElement.appendChild(document.createTextNode(resNum));
Modified: kita/branches/KITA-KDE4/kita/src/libkita/kita_misc.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/libkita/kita_misc.cpp 2009-08-08 21:40:58 UTC (rev 2532)
+++ kita/branches/KITA-KDE4/kita/src/libkita/kita_misc.cpp 2009-08-08 23:32:43 UTC (rev 2533)
@@ -248,7 +248,7 @@
QString cgipath = BoardManager::boardRoot(m_datURL)
+ "/bbs/write.cgi/" + BoardManager::boardID(m_datURL) + '/';
- cgipath += DatManager::threadID(m_datURL) + '/';
+ cgipath += DatManager(m_datURL).threadID() + '/';
m_bbscgi = cgipath;
}
Modified: kita/branches/KITA-KDE4/kita/src/libkita/postdata.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/libkita/postdata.cpp 2009-08-08 21:40:58 UTC (rev 2532)
+++ kita/branches/KITA-KDE4/kita/src/libkita/postdata.cpp 2009-08-08 23:32:43 UTC (rev 2533)
@@ -22,10 +22,11 @@
m_mail = mail;
m_body = body;
m_boardId = boardId;
- m_threadId = DatManager::threadID(m_datUrl);
- m_serverTime = DatManager::getServerTime(m_datUrl);
+ DatManager datManager(m_datUrl);
+ m_threadId = datManager.threadID();
+ m_serverTime = datManager.getServerTime();
/* login */
- if (DatManager::is2chThread(m_datUrl) && Account::isLogged()) {
+ if (datManager.is2chThread() && Account::isLogged()) {
m_sessionId = KUrl::toPercentEncoding(Account::getSessionID());
}
}
Modified: kita/branches/KITA-KDE4/kita/src/threadlistview.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/threadlistview.cpp 2009-08-08 21:40:58 UTC (rev 2532)
+++ kita/branches/KITA-KDE4/kita/src/threadlistview.cpp 2009-08-08 23:32:43 UTC (rev 2533)
@@ -187,7 +187,8 @@
}
QString datURL = subjectList->item(item->row(), ColumnDatUrl)->text();
- QString threadURL = DatManager::threadURL(datURL);
+ DatManager datManager(datURL);
+ QString threadURL = datManager.threadURL();
// create popup menu.
KMenu popup(0);
@@ -201,7 +202,7 @@
? i18n("Remove from Favorites") : i18n("Add to Favorites"));
popup.addAction(m_favoritesAct);
- if (DatManager::getReadNum(datURL)) {
+ if (datManager.getReadNum()) {
popup.addSeparator();
popup.addAction(m_deleteLogAct);
}
@@ -221,7 +222,7 @@
clipboard->setText(threadURL, QClipboard::Clipboard);
clipboard->setText(threadURL, QClipboard::Selection);
} else if (action == m_copyTitleAndURLAct) {
- QString cliptxt = DatManager::threadName(datURL) + '\n' + threadURL;
+ QString cliptxt = datManager.threadName() + '\n' + threadURL;
clipboard->setText(cliptxt , QClipboard::Clipboard);
clipboard->setText(cliptxt , QClipboard::Selection);
} else if (action == m_favoritesAct) {
@@ -237,17 +238,17 @@
propertyWidget->datURLLabel->setText(datURL);
propertyWidget->threadNameLabel
- ->setText(DatManager::threadName(datURL));
+ ->setText(datManager.threadName());
propertyWidget->cachePathLabel
->setText(Cache(datURL).getPath());
propertyWidget->indexPathLabel
->setText(Cache(datURL).getIndexPath());
propertyWidget->resNumLabel
- ->setText(QString::number(DatManager::getResNum(datURL)));
+ ->setText(QString::number(datManager.getResNum()));
propertyWidget->readNumLabel
- ->setText(QString::number(DatManager::getReadNum(datURL)));
+ ->setText(QString::number(datManager.getReadNum()));
propertyWidget->viewPosLabel
- ->setText(QString::number(DatManager::getViewPos(datURL)));
+ ->setText(QString::number(datManager.getViewPos()));
ThreadIndex threadIndex(datURL);
propertyWidget->idx_threadNameWithIndexLabel
Modified: kita/branches/KITA-KDE4/kita/src/threadtabwidget.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/threadtabwidget.cpp 2009-08-08 21:40:58 UTC (rev 2532)
+++ kita/branches/KITA-KDE4/kita/src/threadtabwidget.cpp 2009-08-08 23:32:43 UTC (rev 2533)
@@ -49,7 +49,7 @@
{
QString refstr;
KUrl datURL = ParseMisc::parseURL(url, refstr);
- QString threadName = DatManager::threadName(datURL);
+ QString threadName = DatManager(datURL).threadName();
int jumpNum = 0;
int viewMode = VIEWMODE_MAINVIEW;
@@ -164,7 +164,7 @@
ThreadView * view = findMainView(datURL);
if (view) {
- QString threadName = DatManager::threadName(datURL);
+ QString threadName = DatManager(datURL).threadName();
setTabText(indexOf(view), threadName);
setTabToolTip(indexOf(view), threadName);
Modified: kita/branches/KITA-KDE4/kita/src/threadview.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/threadview.cpp 2009-08-08 21:40:58 UTC (rev 2532)
+++ kita/branches/KITA-KDE4/kita/src/threadview.cpp 2009-08-08 23:32:43 UTC (rev 2533)
@@ -307,7 +307,7 @@
/* If this widget is not parent, then do nothing. */
if (m_viewmode != VIEWMODE_MAINVIEW) return ;
- if (num == 0) num = DatManager::getViewPos(datURL);
+ if (num == 0) num = DatManager(datURL).getViewPos();
if (topLevelWidget() ->isMinimized()) topLevelWidget() ->showNormal();
topLevelWidget() ->raise();
@@ -357,7 +357,7 @@
return ;
}
- DatManager::stopLoading(m_datURL);
+ DatManager(m_datURL).stopLoading();
}
@@ -371,10 +371,11 @@
QString captionStr;
QString infostr;
QString errstr;
- int viewPos = DatManager::getViewPos(m_datURL);
- int resNum = DatManager::getResNum(m_datURL);
- bool broken = DatManager::isBroken(m_datURL);
- int datSize = DatManager::getDatSize(m_datURL);
+ DatManager datManager(m_datURL);
+ int viewPos = datManager.getViewPos();
+ int resNum = datManager.getResNum();
+ bool broken = datManager.isBroken();
+ int datSize = datManager.getDatSize();
switch (m_viewmode) {
@@ -386,11 +387,12 @@
if (broken) info += " " + i18n("This thread is broken.");
/* show status bar,caption, url */
- infostr = DatManager::threadName(m_datURL) +
- QString(" [Total: %1 New: %2] %3 k").arg(resNum).arg(resNum - viewPos).arg(datSize / 1024)
- + info + ' ' + errstr;
+ infostr = datManager.threadName() +
+ QString(" [Total: %1 New: %2] %3 k").arg(resNum)
+ .arg(resNum - viewPos).arg(datSize / 1024)
+ + info + ' ' + errstr;
- captionStr = DatManager::threadName(m_datURL) + QString(" (%1)").arg(viewPos);
+ captionStr = datManager.threadName() + QString(" (%1)").arg(viewPos);
ViewMediator::getInstance()->setMainCaption(captionStr);
ViewMediator::getInstance()->setMainStatus(infostr);
@@ -412,21 +414,22 @@
/* update information */ /* public */
void ThreadView::slotUpdateInfo()
{
- m_rescode = DatManager::getResponseCode(m_datURL);
- m_serverTime = DatManager::getServerTime(m_datURL);
+ DatManager datManager(m_datURL);
+ m_rescode = datManager.getResponseCode();
+ m_serverTime = datManager.getServerTime();
/* uptate information */
setSubjectLabel(BoardManager::boardName(m_datURL),
- DatManager::threadName(m_datURL)
+ datManager.threadName()
+ QString(" (%1)")
- .arg(DatManager::getReadNum(m_datURL)),
+ .arg(datManager.getReadNum()),
BoardManager::boardURL(m_datURL));
updateButton();
gotoCombo->clear();
gotoCombo->addItem(QString::fromUtf8(KITAUTF8_GOTO));
gotoCombo->addItem(QString::fromUtf8(KITAUTF8_KOKOYON));
- for (int i = 1; i < DatManager::getReadNum(m_datURL); i += 100) {
+ for (int i = 1; i < datManager.getReadNum(); i += 100) {
gotoCombo->addItem(QString::number(i) + '-');
}
gotoCombo->addItem(QString::fromUtf8(KITAUTF8_SAIGO));
@@ -496,10 +499,11 @@
QStringList query;
query += searchCombo->currentText();
- int ResNum = DatManager::getResNum(m_datURL);
+ DatManager datManager(m_datURL);
+ int ResNum = datManager.getResNum();
for (int i = 1; i <= ResNum; i++) {
- if (DatManager::checkWord(m_datURL, query, i, false)) {
+ if (datManager.checkWord(query, i, false)) {
/* if this is parent, then show all responses, and search */
if (m_viewmode == VIEWMODE_MAINVIEW) m_threadPart->showAll();
@@ -543,7 +547,8 @@
if (m_datURL.isEmpty())
return;
- int rescode = DatManager::getResponseCode(m_datURL);
+ DatManager datManager(m_datURL);
+ int rescode = datManager.getResponseCode();
if ((rescode != 200 && rescode != 206)
|| FavoriteThreads::getInstance()->contains(m_datURL.prettyUrl())) {
if (KMessageBox::warningYesNo(this, i18n("Do you want to delete Log?"),
@@ -551,7 +556,7 @@
return;
}
- if (DatManager::deleteCache(m_datURL)) {
+ if (datManager.deleteCache()) {
m_parent->slotCloseThreadTab(m_datURL);
ViewMediator::getInstance()->updateBoardView(m_datURL);
}
Modified: kita/branches/KITA-KDE4/kita/src/viewmediator.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/viewmediator.cpp 2009-08-08 21:40:58 UTC (rev 2532)
+++ kita/branches/KITA-KDE4/kita/src/viewmediator.cpp 2009-08-08 23:32:43 UTC (rev 2533)
@@ -137,7 +137,7 @@
void ViewMediator::openURL(const KUrl& url)
{
// open thread.
- if (DatManager::isThreadEnrolled(url)) {
+ if (DatManager(url).isThreadEnrolled()) {
m_threadTabWidget->slotShowMainThread(url);
return;
}
Modified: kita/branches/KITA-KDE4/kita/src/writetabwidget.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/writetabwidget.cpp 2009-08-08 21:40:58 UTC (rev 2532)
+++ kita/branches/KITA-KDE4/kita/src/writetabwidget.cpp 2009-08-08 23:32:43 UTC (rev 2533)
@@ -75,7 +75,7 @@
/* write res */
WriteView* new_dlg;
- threadName = DatManager::threadName(url);
+ threadName = DatManager(url).threadName();
new_dlg = new WriteView(this, url);
new_dlg->setMessage(resStr);
addTab(new_dlg, threadName);
Modified: kita/branches/KITA-KDE4/kita/src/writeview.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/writeview.cpp 2009-08-08 21:40:58 UTC (rev 2532)
+++ kita/branches/KITA-KDE4/kita/src/writeview.cpp 2009-08-08 23:32:43 UTC (rev 2533)
@@ -114,7 +114,7 @@
}
// init thread name field.
- threadNameLine->setText(DatManager::threadName(m_datURL));
+ threadNameLine->setText(DatManager(m_datURL).threadName());
threadNameLine->setReadOnly(true);
threadNameLine->setFrame(false);
threadNameLine->setFocusPolicy(Qt::NoFocus);
@@ -338,7 +338,7 @@
int WriteView::getWriteResNum()
{
- return DatManager::getReadNum(m_datURL) + 1;
+ return DatManager(m_datURL).getReadNum() + 1;
}
/* private slot */
@@ -366,7 +366,7 @@
/* save post log */ /* private */
void WriteView::logPostMessage()
{
- QString threadURL = DatManager::threadURL(m_datURL);
+ QString threadURL = DatManager(m_datURL).threadURL();
QDateTime now = QDateTime::currentDateTime();
QString logPath = KStandardDirs::locateLocal("appdata", "log.txt");