From 161f81718646e92c10df0a121cdf3634ca25304a Mon Sep 17 00:00:00 2001 From: ikemo Date: Sun, 14 Dec 2003 06:44:14 +0000 Subject: [PATCH] change class name & file location git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/kita/kita/trunk@673 56b19765-1e22-0410-a548-a0f45d66c51a --- kita/src/Makefile.am | 2 +- kita/src/favoritelistview.cpp | 4 ++-- kita/src/kita.cpp | 10 ++++---- kita/src/kitasubjectview.cpp | 4 ++-- kita/src/libkita/Makefile.am | 2 +- .../{kitacacheinfo.cpp => libkita/threadinfo.cpp} | 28 +++++++++++----------- kita/src/{kitacacheinfo.h => libkita/threadinfo.h} | 21 ++++++++-------- kita/src/part/kitathreadview.cpp | 2 +- 8 files changed, 37 insertions(+), 36 deletions(-) rename kita/src/{kitacacheinfo.cpp => libkita/threadinfo.cpp} (63%) rename kita/src/{kitacacheinfo.h => libkita/threadinfo.h} (71%) diff --git a/kita/src/Makefile.am b/kita/src/Makefile.am index 119bdf5..055c7ff 100644 --- a/kita/src/Makefile.am +++ b/kita/src/Makefile.am @@ -18,7 +18,7 @@ kita_la_LIBADD = $(LIB_KFILE) $(LIB_KDEPRINT) ./part/libkitapart.la ./libkita/li kita_LDADD = kita.la # which sources should be compiled for kita -kita_la_SOURCES = main.cpp kita.cpp pref.cpp kitaiface.skel kitasubjectview.h kitasubjectview.cpp kitaboardview.h kitaboardview.cpp kitasubjectviewbase.ui kitaboardviewbase.ui kitafontprefbase.ui kitacacheinfo.h kitacacheinfo.cpp favoritelistview.h favoritelistview.cpp kitathreadtabwidget.h kitathreadtabwidget.cpp kitasubjecttabwidget.h kitasubjecttabwidget.cpp +kita_la_SOURCES = main.cpp kita.cpp pref.cpp kitaiface.skel kitasubjectview.h kitasubjectview.cpp kitaboardview.h kitaboardview.cpp kitasubjectviewbase.ui kitaboardviewbase.ui kitafontprefbase.ui favoritelistview.h favoritelistview.cpp kitathreadtabwidget.h kitathreadtabwidget.cpp kitasubjecttabwidget.h kitasubjecttabwidget.cpp kita_SOURCES = dummy.cpp diff --git a/kita/src/favoritelistview.cpp b/kita/src/favoritelistview.cpp index 0b48283..e7278ef 100644 --- a/kita/src/favoritelistview.cpp +++ b/kita/src/favoritelistview.cpp @@ -13,7 +13,7 @@ #include "libkita/favoritethreads.h" #include "libkita/board.h" #include "libkita/kita_misc.h" -#include "kitacacheinfo.h" +#include "libkita/threadinfo.h" #include #include @@ -66,7 +66,7 @@ void FavoriteListView::update() clear(); - KitaCacheInfo* cache = KitaCacheInfo::getInstance(); + KitaThreadInfo* cache = KitaThreadInfo::getInstance(); QDictIterator it( threads ); for(; it.current(); ++it) { diff --git a/kita/src/kita.cpp b/kita/src/kita.cpp index d2b63be..3f81b51 100644 --- a/kita/src/kita.cpp +++ b/kita/src/kita.cpp @@ -13,7 +13,7 @@ #include "kitathreadview.h" #include "kitasubjectview.h" #include "kitaboardview.h" -#include "kitacacheinfo.h" +#include "libkita/threadinfo.h" #include "kitathreadtabwidget.h" #include "kitasubjecttabwidget.h" @@ -463,13 +463,13 @@ void KitaMainWindow::slotOpenURLRequest(const KURL& url, const KParts::URLArgs&) void KitaMainWindow::updateThreadCache( const Kita::Thread& thread ) { - KitaCacheInfo::getInstance()->setReadNum( thread.datURL().url(), thread.resNum() ); - KitaCacheInfo::getInstance()->setResNum( thread.datURL().url(), thread.resNum() ); + KitaThreadInfo::getInstance()->setReadNum( thread.datURL().url(), thread.resNum() ); + KitaThreadInfo::getInstance()->setResNum( thread.datURL().url(), thread.resNum() ); } void KitaMainWindow::loadCache() { - KitaCacheInfo* cache = KitaCacheInfo::getInstance(); + KitaThreadInfo* cache = KitaThreadInfo::getInstance(); QString cacheConfigPath = locateLocal("appdata", "cache"); QFile file(cacheConfigPath); if( file.open(IO_ReadOnly) ) { @@ -480,7 +480,7 @@ void KitaMainWindow::loadCache() void KitaMainWindow::saveCache() { - KitaCacheInfo* cache = KitaCacheInfo::getInstance(); + KitaThreadInfo* cache = KitaThreadInfo::getInstance(); QString cacheConfigPath = locateLocal("appdata", "cache"); QFile file(cacheConfigPath); if( file.open(IO_WriteOnly) ) { diff --git a/kita/src/kitasubjectview.cpp b/kita/src/kitasubjectview.cpp index 4da0a66..f3b3e6d 100644 --- a/kita/src/kitasubjectview.cpp +++ b/kita/src/kitasubjectview.cpp @@ -31,7 +31,7 @@ #include "kitasubjectview.h" #include "favoritelistview.h" #include "kita.h" -#include "kitacacheinfo.h" +#include "libkita/threadinfo.h" #include "part/kita2ch.h" #include "libkita/thread.h" #include "libkita/kita_misc.h" @@ -112,7 +112,7 @@ void KitaSubjectView::loadBoard(const Kita::Board& board) m_board = board; - KitaCacheInfo* cache = KitaCacheInfo::getInstance(); + KitaThreadInfo* cache = KitaThreadInfo::getInstance(); QPtrList threadList = m_board.getThreadList(); // clear list diff --git a/kita/src/libkita/Makefile.am b/kita/src/libkita/Makefile.am index dc07d8d..7fadbd3 100644 --- a/kita/src/libkita/Makefile.am +++ b/kita/src/libkita/Makefile.am @@ -2,7 +2,7 @@ INCLUDES = $(all_includes) lib_LTLIBRARIES = libkita.la -libkita_la_SOURCES = comment.cpp comment.h thread.h thread.cpp qcp932codec.cpp qcp932codec.h board.h board.cpp bbs.h bbs.cpp category.h category.cpp favoritethreads.h favoritethreads.cpp k2ch_articlefile.h k2ch_articlefile.cpp kita_misc.cpp +libkita_la_SOURCES = comment.cpp comment.h thread.h thread.cpp qcp932codec.cpp qcp932codec.h board.h board.cpp bbs.h bbs.cpp category.h category.cpp favoritethreads.h favoritethreads.cpp k2ch_articlefile.h k2ch_articlefile.cpp kita_misc.cpp threadinfo.h threadinfo.cpp METASOURCES = AUTO diff --git a/kita/src/kitacacheinfo.cpp b/kita/src/libkita/threadinfo.cpp similarity index 63% rename from kita/src/kitacacheinfo.cpp rename to kita/src/libkita/threadinfo.cpp index 0d13aed..16d097b 100644 --- a/kita/src/kitacacheinfo.cpp +++ b/kita/src/libkita/threadinfo.cpp @@ -8,46 +8,46 @@ * (at your option) any later version. * ***************************************************************************/ -#include "kitacacheinfo.h" +#include "threadinfo.h" #include #include #include -KitaCacheInfo* KitaCacheInfo::instance = 0; +KitaThreadInfo* KitaThreadInfo::instance = 0; -KitaCacheInfo::KitaCacheInfo() : m_readDict() +KitaThreadInfo::KitaThreadInfo() : m_readDict() { } -KitaCacheInfo::~KitaCacheInfo() +KitaThreadInfo::~KitaThreadInfo() { } -KitaCacheInfo* KitaCacheInfo::getInstance() +KitaThreadInfo* KitaThreadInfo::getInstance() { if( instance == 0 ) { - instance = new KitaCacheInfo(); + instance = new KitaThreadInfo(); } return instance; } -int KitaCacheInfo::readNum(const QString& url) +int KitaThreadInfo::readNum( const QString& url ) { - if( m_readDict.contains(url) ) { - return m_readDict[url]; + if( m_readDict.contains( url ) ) { + return m_readDict[ url ]; } else { return 0; } } -void KitaCacheInfo::setReadNum(const QString& url, int num) +void KitaThreadInfo::setReadNum( const QString& url, int num ) { m_readDict.insert( url, num ); } -int KitaCacheInfo::resNum( const QString& url ) +int KitaThreadInfo::resNum( const QString& url ) { if( m_resNumDict.contains( url ) ) { return m_resNumDict[ url ]; @@ -56,18 +56,18 @@ int KitaCacheInfo::resNum( const QString& url ) } } -void KitaCacheInfo::setResNum( const QString& url, int num ) +void KitaThreadInfo::setResNum( const QString& url, int num ) { m_resNumDict.insert( url, num ); } -QDataStream& operator<<(QDataStream& s, KitaCacheInfo& c) +QDataStream& ::operator<<( QDataStream& s, KitaThreadInfo& c ) { s << c.m_readDict; return s; } -QDataStream& operator>>(QDataStream& s, KitaCacheInfo& c) +QDataStream& ::operator>>( QDataStream& s, KitaThreadInfo& c ) { s >> c.m_readDict; return s; diff --git a/kita/src/kitacacheinfo.h b/kita/src/libkita/threadinfo.h similarity index 71% rename from kita/src/kitacacheinfo.h rename to kita/src/libkita/threadinfo.h index 61c295d..50c254a 100644 --- a/kita/src/kitacacheinfo.h +++ b/kita/src/libkita/threadinfo.h @@ -8,8 +8,8 @@ * (at your option) any later version. * ***************************************************************************/ -#ifndef _KITACACHEINFO_H_ -#define _KITACACHEINFO_H_ +#ifndef _KITATHREADINFO_H_ +#define _KITATHREADINFO_H_ #include @@ -19,22 +19,23 @@ * * Hideki Ikemoto **/ -class KitaCacheInfo + +class KitaThreadInfo { public: - static KitaCacheInfo* getInstance(); - void setReadNum( const QString& url, int num); + static KitaThreadInfo* getInstance(); + void setReadNum( const QString& url, int num ); int readNum( const QString& url ); void setResNum( const QString& url, int num ); int resNum( const QString& url ); - friend QDataStream& operator<<(QDataStream& s, KitaCacheInfo& c); - friend QDataStream& operator>>(QDataStream& s, KitaCacheInfo& c); + friend QDataStream& operator<<( QDataStream& s, KitaThreadInfo& c ); + friend QDataStream& operator>>( QDataStream& s, KitaThreadInfo& c ); private: - KitaCacheInfo(); - ~KitaCacheInfo(); + KitaThreadInfo(); + ~KitaThreadInfo(); QMap m_readDict; QMap m_resNumDict; - static KitaCacheInfo* instance; + static KitaThreadInfo* instance; }; #endif diff --git a/kita/src/part/kitathreadview.cpp b/kita/src/part/kitathreadview.cpp index f11be80..937ac34 100644 --- a/kita/src/part/kitathreadview.cpp +++ b/kita/src/part/kitathreadview.cpp @@ -35,7 +35,7 @@ #include "kitahtmlpart.h" #include "kitawritedialog.h" -#include "../kitacacheinfo.h" +#include "libkita/threadinfo.h" #include "kita2ch.h" #include "kitaconfig.h" -- 2.11.0