seiri

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

diff --git a/kita/src/board/boardtabwidget.cpp b/kita/src/board/boardtabwidget.cpp
index 120a6be..698e8ff 100644 (file)
--- a/kita/src/board/boardtabwidget.cpp
+++ b/kita/src/board/boardtabwidget.cpp
@@ -309,26 +309,3 @@ KitaBoardDock::~KitaBoardDock()
 {
     if ( m_boardTab ) delete m_boardTab;
 }
-
-
-/* setup & create KitaBoardDock */ /* public */
-KitaBoardTabWidget* KitaBoardDock::setup()
-{
-    /* create KitaNaviTabWidget */
-    m_boardTab = new KitaBoardTabWidget( this, "Subject" );
-    setWidget( m_boardTab );
-
-    Kita::SignalCollection* signalCollection = Kita::SignalCollection::getInstance();
-    connect( signalCollection, SIGNAL( switchToSubject() ),
-             SLOT( slotShowDock() ) );
-
-    return m_boardTab;
-}
-
-/* public slot */
-void KitaBoardDock::slotLoadBoard( const KURL& boardURL, bool withNewTab )
-{
-    slotShowDock();
-
-    if ( m_boardTab ) m_boardTab->loadBoard( boardURL, withNewTab );
-}

diff --git a/kita/src/board/boardtabwidget.h b/kita/src/board/boardtabwidget.h
index e8c4dd6..a0541a9 100644 (file)
--- a/kita/src/board/boardtabwidget.h
+++ b/kita/src/board/boardtabwidget.h
@@ -85,11 +85,6 @@ public:
                      const QString& strTabPageLabel = QString::fromLatin1( " " ),
                      WFlags f = 0 );
     ~KitaBoardDock();
-
-    KitaBoardTabWidget* setup();
-
-public slots:
-    void slotLoadBoard( const KURL& boardURL, bool withNewTab );
 };
 
 

diff --git a/kita/src/mainwindow.cpp b/kita/src/mainwindow.cpp
index 9e1353a..662d4bf 100644 (file)
--- a/kita/src/mainwindow.cpp
+++ b/kita/src/mainwindow.cpp
@@ -460,7 +460,7 @@ void KitaMainWindow::slotOpenURLRequestExt(
     /* if usr1 == 1, open the board with new tab. */
     if ( mimetype == "kita_open_2chboard" ) {
         bool withNewTab = ( usr1 == 1 );
-        m_boardDock->slotLoadBoard( url, withNewTab );
+        m_boardTab->loadBoard( url, withNewTab );
         return ;
     }
 
@@ -653,7 +653,8 @@ void KitaMainWindow::setupView()
 
     /* Subject View */
     m_boardDock = new KitaBoardDock( manager(), "subject", 0L, 0L, i18n( "subject" ), i18n( "subject" ) );
-    m_boardTab = m_boardDock->setup();
+    m_boardTab = new KitaBoardTabWidget( this, "Subject" );
+    m_boardDock->setWidget( m_boardTab );
     connect( m_boardDock, SIGNAL( checkToggleAction( bool ) ), SLOT( slotCheckSubjectToggleAction( bool ) ) );
 
     /* Board View */