refactoring...

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/kita/kita/trunk@230 56b19765-1e22-0410-a548-a0f45d66c51a

diff --git a/kita/src/kita.cpp b/kita/src/kita.cpp
index 3fd9342..45c48f7 100644 (file)
--- a/kita/src/kita.cpp
+++ b/kita/src/kita.cpp
@@ -73,8 +73,10 @@ Kita::Kita()
   // allow the view to change the statusbar and caption
   connect(m_threadView, SIGNAL(signalChangeStatusbar(const QString&)),
           this,   SLOT(changeStatusbar(const QString&)));
-  connect(m_boardView, SIGNAL(signalLoadBoard(const KURL&, const QString&)),
-          m_subjectView, SLOT(slotLoadBoard(const KURL&, const QString&)));
+//  connect(m_boardView, SIGNAL(signalLoadBoard(const KURL&, const QString&)),
+//          m_subjectView, SLOT(slotLoadBoard(const KURL&, const QString&)));
+  connect(m_boardView, SIGNAL(clicked(const Kita2ch::Board&)),
+          m_subjectView, SLOT(loadBoard(const Kita2ch::Board&)));
   connect(m_subjectView, SIGNAL(signalShowThread(const Kita2ch::Board&, const Kita2ch::Thread&)),
           m_threadView, SLOT(slotShowThread(const Kita2ch::Board&, const Kita2ch::Thread&)));
   //    connect(m_view, SIGNAL(signalChangeCaption(const QString&)),

diff --git a/kita/src/kitaboardview.cpp b/kita/src/kitaboardview.cpp
index aade13b..ea4e5a4 100644 (file)
--- a/kita/src/kitaboardview.cpp
+++ b/kita/src/kitaboardview.cpp
@@ -17,6 +17,7 @@
 #include <klistview.h>
 
 #include "part/qcp932codec.h"
+#include "part/kita2ch.h"
 #include "kitaboardview.h"
 #include "kita.h"
 
@@ -101,8 +102,9 @@ void KitaBoardView::slotLoadBoard(QListViewItem* item)
   if(item->text(1).isEmpty()) {
     return;
   }
-  
-  emit signalLoadBoard(url, boardName);
+
+  Kita2ch::Board board(url, boardName);
+  emit clicked(board);
 }
 
 void KitaBoardView::slotFontChanged(QFont& font)

diff --git a/kita/src/kitaboardview.h b/kita/src/kitaboardview.h
index ec70b0a..e25967c 100644 (file)
--- a/kita/src/kitaboardview.h
+++ b/kita/src/kitaboardview.h
@@ -18,8 +18,12 @@
 class Kita;
 class KURL;
 
+namespace Kita2ch {
+  class Board;
+}
+
 /**
- * 
+ *
  * Hideki Ikemoto
  **/
 class KitaBoardView : public KitaBoardViewBase
@@ -34,7 +38,7 @@ public slots:
   void slotLoadBoard(QListViewItem* item);
   void slotFontChanged(QFont& font);
 signals:
-  void signalLoadBoard(const KURL& url, const QString& boardName);
+  void clicked(const Kita2ch::Board& board);
 };
 
 #endif

diff --git a/kita/src/kitasubjectview.cpp b/kita/src/kitasubjectview.cpp
index 93f377f..f114a9c 100644 (file)
--- a/kita/src/kitasubjectview.cpp
+++ b/kita/src/kitasubjectview.cpp
@@ -84,7 +84,7 @@ void KitaSubjectView::loadThread(QListViewItem* item)
   emit signalShowThread(m_board, Kita2ch::Thread(datURL));
 }
 
-void KitaSubjectView::slotLoadBoard(const KURL& url, const QString& boardName)
+void KitaSubjectView::loadBoard(const Kita2ch::Board& board)
 {
   // reset member variables.
   {
@@ -93,7 +93,7 @@ void KitaSubjectView::slotLoadBoard(const KURL& url, const QString& boardName)
     m_prevquery = "";
   }
 
-  m_board = Kita2ch::Board(url, boardName);
+  m_board = board;
   m_board.refreshChildList();
 
   KitaCacheInfo* cache = KitaCacheInfo::getInstance();

diff --git a/kita/src/kitasubjectview.h b/kita/src/kitasubjectview.h
index b2a5655..03f7690 100644 (file)
--- a/kita/src/kitasubjectview.h
+++ b/kita/src/kitasubjectview.h
@@ -20,7 +20,7 @@ class Kita;
 class KListViewItem;
 
 /**
- * 
+ *
  * Hideki Ikemoto
  **/
 class KitaSubjectView : public KitaSubjectViewBase
@@ -34,7 +34,7 @@ public:
 public slots:
   void reloadSubject();
   void loadThread(QListViewItem* item);
-  void slotLoadBoard(const KURL& url, const QString& boardName);
+  void loadBoard(const Kita2ch::Board& board);
   void slotHideButton(bool on);
   void slotFontChanged(QFont& font);