svnno****@sourc*****
svnno****@sourc*****
2009年 7月 29日 (水) 18:23:02 JST
ForkRevision: 2488
http://sourceforge.jp/projects/kita/svn/view?view=rev&revision=2488
Author: nogu
Date: 2009-07-29 18:23:02 +0900 (Wed, 29 Jul 2009)
Log Message:
-----------
remove DatManager::getCachePath()
Modified Paths:
--------------
kita/branches/KITA-KDE4/kita/src/libkita/cache.h
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/threadindex.cpp
kita/branches/KITA-KDE4/kita/src/threadlistview.cpp
Modified: kita/branches/KITA-KDE4/kita/src/libkita/cache.h
===================================================================
--- kita/branches/KITA-KDE4/kita/src/libkita/cache.h 2009-07-29 09:16:02 UTC (rev 2487)
+++ kita/branches/KITA-KDE4/kita/src/libkita/cache.h 2009-07-29 09:23:02 UTC (rev 2488)
@@ -20,7 +20,7 @@
/**
@author Hideki Ikemoto
*/
- class Cache
+ class KDE_EXPORT Cache
{
public:
Cache(const KUrl& url);
Modified: kita/branches/KITA-KDE4/kita/src/libkita/datmanager.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/libkita/datmanager.cpp 2009-07-29 09:16:02 UTC (rev 2487)
+++ kita/branches/KITA-KDE4/kita/src/libkita/datmanager.cpp 2009-07-29 09:23:02 UTC (rev 2488)
@@ -314,12 +314,6 @@
return datURL.fileName().section('.', 0, 0);
}
-
-const QString DatManager::getCachePath(const KUrl& url)
-{
- return Cache(url).getPath();
-}
-
const QString DatManager::getCacheIndexPath(const KUrl& url)
{
return Cache(url).getIndexPath();
Modified: kita/branches/KITA-KDE4/kita/src/libkita/datmanager.h
===================================================================
--- kita/branches/KITA-KDE4/kita/src/libkita/datmanager.h 2009-07-29 09:16:02 UTC (rev 2487)
+++ kita/branches/KITA-KDE4/kita/src/libkita/datmanager.h 2009-07-29 09:23:02 UTC (rev 2488)
@@ -52,7 +52,6 @@
static const QString threadName(const KUrl& url); /* = subject of thread */
static const QString threadID(const KUrl& url);
- static const QString getCachePath(const KUrl& url);
static const QString getCacheIndexPath(const KUrl& url);
/* HTML data */
Modified: kita/branches/KITA-KDE4/kita/src/libkita/threadindex.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/libkita/threadindex.cpp 2009-07-29 09:16:02 UTC (rev 2487)
+++ kita/branches/KITA-KDE4/kita/src/libkita/threadindex.cpp 2009-07-29 09:23:02 UTC (rev 2488)
@@ -214,9 +214,9 @@
{
/* If cache does not exist, return 0 */
if (checkCached) {
-
- QString path = DatManager::getCachePath(url);
- if (! QFile::exists(path)) {
+ Cache cache(url);
+ QString path = cache.getPath();
+ if (!QFile::exists(path)) {
return 0;
}
}
Modified: kita/branches/KITA-KDE4/kita/src/threadlistview.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/threadlistview.cpp 2009-07-29 09:16:02 UTC (rev 2487)
+++ kita/branches/KITA-KDE4/kita/src/threadlistview.cpp 2009-07-29 09:23:02 UTC (rev 2488)
@@ -23,6 +23,7 @@
#include "threadlistviewitem.h"
#include "ui_threadproperty.h"
#include "viewmediator.h"
+#include "libkita/cache.h"
#include "libkita/datmanager.h"
#include "libkita/favoritethreads.h"
#include "libkita/kita_misc.h"
@@ -238,7 +239,7 @@
propertyWidget->threadNameLabel
->setText(DatManager::threadName(datURL));
propertyWidget->cachePathLabel
- ->setText(DatManager::getCachePath(datURL));
+ ->setText(Cache(datURL).getPath());
propertyWidget->indexPathLabel
->setText(DatManager::getCacheIndexPath(datURL));
propertyWidget->resNumLabel