refactoring.

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

diff --git a/ChangeLog b/ChangeLog
index 2689ae3..a99fcdb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,8 @@
 
        * various fixes. >>833
        * various fixes. >>849
-       
+       * add Mediator class.
+
 2004-05-29  Hideki Ikemoto  <ikemo@users.sourceforge.jp>
 
        * refactoring. >>823

diff --git a/kita/src/kita.cpp b/kita/src/kita.cpp
index cefb728..3e72c73 100644 (file)
--- a/kita/src/kita.cpp
+++ b/kita/src/kita.cpp
@@ -101,15 +101,12 @@ KitaMainWindow::KitaMainWindow()
     connect( signalCollection, SIGNAL( signalChangeStatusbar( const QString& ) ),
              SLOT( changeStatusbar( const QString& ) ) );
 
-    connect( m_boardView, SIGNAL( openBoardRequested( const QString&, bool ) ),
+    connect( signalCollection, SIGNAL( openBoardRequested( const QString&, bool ) ),
              m_subjectTab, SLOT( loadBoard( const QString&, bool ) ) );
 
     connect( m_subjectTab, SIGNAL( showThreadRequested( const QString&, bool ) ),
              m_threadTab, SLOT( showThread( const QString&, bool ) ) );
 
-    connect( m_threadTab, SIGNAL( openBoardRequested( const QString&, bool ) ),
-             m_subjectTab, SLOT( loadBoard( const QString&, bool ) ) );
-
     connect( signalCollection, SIGNAL( signalThread( const Kita::Thread* ) ),
              m_subjectTab, SLOT( updateThread( const Kita::Thread* ) ) );
 

diff --git a/kita/src/kitaboardview.cpp b/kita/src/kitaboardview.cpp
index 1ad4132..35f6213 100644 (file)
--- a/kita/src/kitaboardview.cpp
+++ b/kita/src/kitaboardview.cpp
@@ -30,7 +30,7 @@
 #include "libkita/board.h"
 #include "libkita/category.h"
 #include "libkita/kitaconfig.h"
-
+#include "libkita/signalcollection.h"
 
 KitaBoardView::KitaBoardView( QWidget *parent, const char *name )
         : KitaBoardViewBase( parent, name )
@@ -39,12 +39,16 @@ KitaBoardView::KitaBoardView( QWidget *parent, const char *name )
     m_boardList->setSorting( -1 );
     m_boardList->addColumn( i18n( "board name" ) );
     m_boardList->header()->setClickEnabled( FALSE );
+    
+    Kita::SignalCollection* signalCollection = Kita::SignalCollection::getInstance();
     connect( m_boardList, SIGNAL( mouseButtonClicked( int, QListViewItem*, const QPoint&, int ) ),
              SLOT( slotMouseButtonClicked( int, QListViewItem* ) ) );
     connect( m_boardList, SIGNAL( returnPressed( QListViewItem* ) ), SLOT( loadBoard( QListViewItem* ) ) );
     connect( m_boardList, SIGNAL( contextMenuRequested( QListViewItem*, const QPoint&, int ) ),
              SLOT( slotContextMenuRequested( QListViewItem*, const QPoint&, int ) ) );
     connect( Kita::FavoriteBoards::getInstance(), SIGNAL( changed() ), SLOT( refreshFavoriteBoards() ) );
+    connect( this, SIGNAL( openBoardRequested( const QString&, bool ) ),
+             signalCollection, SIGNAL( openBoardRequested( const QString&, bool ) ) );
 }
 
 KitaBoardView::~KitaBoardView()

diff --git a/kita/src/kitaboardview.h b/kita/src/kitaboardview.h
index 555adf8..70800bb 100644 (file)
--- a/kita/src/kitaboardview.h
+++ b/kita/src/kitaboardview.h
@@ -53,7 +53,7 @@ public slots:
     void setFont( const QFont& font );
 
 signals:
-    void openBoardRequested( const QString& boardURL, bool withNewTab = false );
+    void openBoardRequested( const QString& boardURL, bool withNewTab );
     void sigShowSubject();    
 };
 

diff --git a/kita/src/kitathreadtabwidget.cpp b/kita/src/kitathreadtabwidget.cpp
index 9310bd6..c790e56 100644 (file)
--- a/kita/src/kitathreadtabwidget.cpp
+++ b/kita/src/kitathreadtabwidget.cpp
@@ -142,8 +142,6 @@ void KitaThreadTabWidget::connectSignals( KitaThreadView* view )
              signalCollection, SIGNAL( signalChangeStatusbar( const QString& ) ) );
     connect( signalCollection, SIGNAL( signalThread( const Kita::Thread* ) ),
              this, SLOT( slotThread( const Kita::Thread* ) ) );
-    connect( view, SIGNAL( openBoardRequested( const QString&, bool ) ),
-             this, SIGNAL( openBoardRequested( const QString&, bool ) ) );
 }
 
 KitaThreadView* KitaThreadTabWidget::findView( const QString& threadURL )

diff --git a/kita/src/kitathreadtabwidget.h b/kita/src/kitathreadtabwidget.h
index 9ffadf3..588d72d 100644 (file)
--- a/kita/src/kitathreadtabwidget.h
+++ b/kita/src/kitathreadtabwidget.h
@@ -59,7 +59,6 @@ private slots:
 signals:
     void signalChangeStatusbar( const QString& );
     void sigHideSubject();
-    void openBoardRequested( const QString& url, bool useTab );
 };
 
 class KitaThreadTabBar : public QTabBar

diff --git a/kita/src/libkita/signalcollection.h b/kita/src/libkita/signalcollection.h
index a840296..7356e84 100644 (file)
--- a/kita/src/libkita/signalcollection.h
+++ b/kita/src/libkita/signalcollection.h
@@ -38,6 +38,7 @@ namespace Kita
         void bookmarked( const QString& datURL, bool on );
         void showThreadCompleted( const KURL& threadUrl );
         void signalThread( const Kita::Thread* );
+        void openBoardRequested( const QString& boardURL, bool withNewTab );
     };
 
 }

diff --git a/kita/src/part/kitathreadview.cpp b/kita/src/part/kitathreadview.cpp
index 6026778..c3f4147 100644 (file)
--- a/kita/src/part/kitathreadview.cpp
+++ b/kita/src/part/kitathreadview.cpp
@@ -154,6 +154,8 @@ KitaThreadView::KitaThreadView( QWidget* parent, const char* name )
              signalCollection, SIGNAL( showThreadCompleted( const KURL& ) ) );
     connect( this, SIGNAL( signalThread( const Kita::Thread* ) ),
              signalCollection, SIGNAL( signalThread( const Kita::Thread* ) ) );
+    connect( this, SIGNAL( openBoardRequested( const QString&, bool ) ),
+             signalCollection, SIGNAL( openBoardRequested( const QString&, bool ) ) );
     
     setupActions();