svnno****@sourc*****
svnno****@sourc*****
2009年 7月 29日 (水) 18:16:02 JST
ForkRevision: 2487
http://sourceforge.jp/projects/kita/svn/view?view=rev&revision=2487
Author: nogu
Date: 2009-07-29 18:16:02 +0900 (Wed, 29 Jul 2009)
Log Message:
-----------
add Cache::getDirPath()
Modified Paths:
--------------
kita/branches/KITA-KDE4/kita/src/libkita/boardmanager.cpp
kita/branches/KITA-KDE4/kita/src/libkita/cache.cpp
kita/branches/KITA-KDE4/kita/src/libkita/cache.h
kita/branches/KITA-KDE4/kita/src/libkita/datinfo.cpp
Modified: kita/branches/KITA-KDE4/kita/src/libkita/boardmanager.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/libkita/boardmanager.cpp 2009-07-29 09:10:42 UTC (rev 2486)
+++ kita/branches/KITA-KDE4/kita/src/libkita/boardmanager.cpp 2009-07-29 09:16:02 UTC (rev 2487)
@@ -459,8 +459,7 @@
/* make directory */
Cache cache(url);
- QString cacheDir
- = Cache::baseDir() + cache.serverDir() + cache.boardDir();
+ QString cacheDir = cache.getDirPath();
if (!mkdir(cacheDir)) return;
KIO::SlaveConfig::self() ->setConfigData("http",
@@ -493,7 +492,7 @@
void BoardManager::getCachedThreadList(const KUrl& url, QList<Thread*>& threadList)
{
Cache cache(url);
- QString cacheDir = Cache::baseDir() + cache.serverDir() + cache.boardDir();
+ QString cacheDir = cache.getDirPath();
QDir d(cacheDir);
if (d.exists()) {
@@ -531,8 +530,7 @@
QStringList cacheList;
if (!bdata->readIdx()) {
Cache cache(url);
- QString cacheDir
- = Cache::baseDir() + cache.serverDir() + cache.boardDir();
+ QString cacheDir = cache.getDirPath();
QDir d(cacheDir);
if (d.exists()) {
QString ext = BoardManager::getBoardData(url) ->ext();
@@ -889,8 +887,7 @@
keyHosts.prepend(oldhost);
bdata->createKeys(keyHosts);
Cache cache(bdata->basePath());
- QString oldCachePath = Cache::baseDir() + cache.serverDir()
- + cache.boardDir();
+ QString oldCachePath = cache.getDirPath();
/* update URL */
bdata->setHostName(newhost);
Modified: kita/branches/KITA-KDE4/kita/src/libkita/cache.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/libkita/cache.cpp 2009-07-29 09:10:42 UTC (rev 2486)
+++ kita/branches/KITA-KDE4/kita/src/libkita/cache.cpp 2009-07-29 09:16:02 UTC (rev 2487)
@@ -56,7 +56,7 @@
QString Cache::getPath()
{
- QString path = baseDir() + serverDir() + boardDir();
+ QString path = getDirPath();
if (path.isEmpty()) return QString();
// qDebug("%s -> %s",url.prettyUrl().ascii(),path.ascii());
@@ -82,7 +82,7 @@
/* public */
QString Cache::getSettingPath()
{
- QString path = baseDir() + serverDir() + boardDir();
+ QString path = getDirPath();
if (path.isEmpty()) return QString();
return path + "SETTING.TXT";
@@ -91,7 +91,7 @@
/* public */
QString Cache::getBBSHistoryPath()
{
- QString path = baseDir() + serverDir() + boardDir();
+ QString path = getDirPath();
if (path.isEmpty()) return QString();
return path + "BBSHISTORY";
@@ -100,8 +100,13 @@
/* public */
QString Cache::getSubjectPath()
{
- QString path = baseDir() + serverDir() + boardDir();
+ QString path = getDirPath();
if (path.isEmpty()) return QString();
return path + "subject.txt";
}
+
+QString Cache::getDirPath()
+{
+ return baseDir() + serverDir() + boardDir();
+}
Modified: kita/branches/KITA-KDE4/kita/src/libkita/cache.h
===================================================================
--- kita/branches/KITA-KDE4/kita/src/libkita/cache.h 2009-07-29 09:10:42 UTC (rev 2486)
+++ kita/branches/KITA-KDE4/kita/src/libkita/cache.h 2009-07-29 09:16:02 UTC (rev 2487)
@@ -33,6 +33,7 @@
QString getSettingPath();
QString getBBSHistoryPath();
QString getSubjectPath();
+ QString getDirPath();
static QString baseDir();
Modified: kita/branches/KITA-KDE4/kita/src/libkita/datinfo.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/libkita/datinfo.cpp 2009-07-29 09:10:42 UTC (rev 2486)
+++ kita/branches/KITA-KDE4/kita/src/libkita/datinfo.cpp 2009-07-29 09:16:02 UTC (rev 2487)
@@ -62,7 +62,7 @@
/* make directory */
Cache cache(m_datURL);
- QString cacheDir = Cache::baseDir() + cache.serverDir() + cache.boardDir();
+ QString cacheDir = cache.getDirPath();
if (!mkdir(cacheDir)) return ;
initPrivate(