refactoring.

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

diff --git a/kita/src/kitasubjecttabwidget.cpp b/kita/src/kitasubjecttabwidget.cpp
index 29c05bb..a2baec2 100644 (file)
--- a/kita/src/kitasubjecttabwidget.cpp
+++ b/kita/src/kitasubjecttabwidget.cpp
@@ -31,6 +31,8 @@ KitaSubjectTabWidget::KitaSubjectTabWidget( QWidget* parent, const char* name, W
 
     connectSignals( m_favoriteList );
     connectSignals( view );
+    connect( view, SIGNAL( loadBoardCompleted( const KURL& ) ),
+             this, SIGNAL( loadBoardCompleted( const KURL& ) ) );
 
     connect( this, SIGNAL( currentChanged( QWidget* ) ),
              SLOT( slotCurrentChanged( QWidget* ) ) );
@@ -57,6 +59,8 @@ void KitaSubjectTabWidget::loadBoardWithNewTab( const Kita::Board* board )
     m_latestView = view;
     m_latestView->loadBoard( board );
     connectSignals( view );
+    connect( view, SIGNAL( loadBoardCompleted( const KURL& ) ),
+             this, SIGNAL( loadBoardCompleted( const KURL& ) ) );
     showPage( m_latestView );
 }
 
@@ -73,24 +77,12 @@ void KitaSubjectTabWidget::updateThread( const Kita::Thread* thread )
     }
 }
 
-void KitaSubjectTabWidget::connectSignals( FavoriteListView* view )
+void KitaSubjectTabWidget::connectSignals( Kita::ThreadListView* view )
 {
     connect( view, SIGNAL( signalShowThread( const Kita::Thread* ) ),
              this, SIGNAL( signalShowThread( const Kita::Thread* ) ) );
     connect( view, SIGNAL( signalShowThreadWithNewTab( const Kita::Thread* ) ),
              this, SIGNAL( signalShowThreadWithNewTab( const Kita::Thread* ) ) );
-    //  connect( view, SIGNAL( loadBoardCompleted( const KURL& ) ),
-    //           this, SIGNAL( loadBoardCompleted( const KURL& ) ) );
-}
-
-void KitaSubjectTabWidget::connectSignals( KitaSubjectView* view )
-{
-    connect( view, SIGNAL( signalShowThread( const Kita::Thread* ) ),
-             this, SIGNAL( signalShowThread( const Kita::Thread* ) ) );
-    connect( view, SIGNAL( signalShowThreadWithNewTab( const Kita::Thread* ) ),
-             this, SIGNAL( signalShowThreadWithNewTab( const Kita::Thread* ) ) );
-    connect( view, SIGNAL( loadBoardCompleted( const KURL& ) ),
-             this, SIGNAL( loadBoardCompleted( const KURL& ) ) );
 }
 
 void KitaSubjectTabWidget::slotCurrentChanged( QWidget* widget )

diff --git a/kita/src/kitasubjecttabwidget.h b/kita/src/kitasubjecttabwidget.h
index 59b9ad8..ff0f3d9 100644 (file)
--- a/kita/src/kitasubjecttabwidget.h
+++ b/kita/src/kitasubjecttabwidget.h
@@ -36,8 +36,7 @@ public slots:
 private:
     FavoriteListView* m_favoriteList;
     KitaSubjectView* m_latestView;
-    void connectSignals( FavoriteListView* );
-    void connectSignals( KitaSubjectView* );
+    void connectSignals( Kita::ThreadListView* );
 
 private slots:
     void slotCurrentChanged( QWidget* widget );