remove unused code.

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

diff --git a/kita/src/mainwindow.cpp b/kita/src/mainwindow.cpp
index 9d5150f..f6943b4 100644 (file)
--- a/kita/src/mainwindow.cpp
+++ b/kita/src/mainwindow.cpp
@@ -115,20 +115,11 @@ KitaMainWindow::KitaMainWindow()
     statusBar() ->show();
 
     // read dock status
-//    m_bbsDock->loadSession();
-//    m_boardDock->loadSession();
-//    m_threadDock->loadSession();
     m_writeDock->loadSession();
     QString dockConfigPath = locateLocal( "appdata", "dock.conf" );
     KConfig dockConfig( dockConfigPath );
     readDockConfig( &dockConfig );
 
-    // show subject dock
-//    m_boardDock->slotShowDock();
-
-    // show thread view
-//    m_threadDock->slotShowDock();
-
     // hide writedock
     makeDockInvisible( m_writeDock );
 
@@ -176,9 +167,6 @@ KitaMainWindow::KitaMainWindow()
     // load favorites
     loadFavorites();
 
-    // show board dock
-//    m_bbsDock->slotShowDock();
-
     // update favorite list
     ViewMediator::getInstance()->updateFavoriteListView();
 
@@ -189,10 +177,6 @@ KitaMainWindow::KitaMainWindow()
 
 KitaMainWindow::~KitaMainWindow()
 {
-    /* save dock status */
-//    m_bbsDock->saveSession();
-//    m_boardDock->saveSession();
-//    m_threadDock->saveSession();
     m_writeDock->saveSession();
 
     Kita::AboneConfig::self()->writeConfig();
@@ -216,8 +200,6 @@ KitaMainWindow::~KitaMainWindow()
     KConfig dockConfig( dockConfigPath );
     writeDockConfig( &dockConfig );
 
-//    delete m_bbsDock;
-//    delete m_threadDock;
     delete m_writeDock;
 
     Kita::DatManager::deleteAllDatInfo();
@@ -332,17 +314,6 @@ void KitaMainWindow::setUrl( const KURL& url )
     m_urlLine->setText( url.url() );
 }
 
-void KitaMainWindow::windowToggleView()
-{
-/*    //FIXME: m_boardDock->dockSite() & KDockWidget::DockCenter != 0 igai no toki ha dousuru?
-    kdDebug() << "Do toggle" << endl;
-    if ( !m_boardDock->isVisible()
-            || !m_boardDock->isActiveWindow() ) m_boardDock->slotShowDock();
-    else {
-        m_threadDock->slotShowDock();
-    }*/
-}
-
 void KitaMainWindow::slotCheckSubjectToggleAction( bool check )
 {
     if ( m_subjectListAction ) m_subjectListAction->setChecked( check );
@@ -379,7 +350,6 @@ void KitaMainWindow::slotOpenURLRequestExt( const KURL& url, const QString mimet
 
     /* open thread with new thread tab */
     if ( Kita::DatManager::isThreadEnrolled( url ) ) {
-//        m_threadDock->slotShowThread( url );
         m_threadTab->slotShowMainThread( url );
         return ;
     }
@@ -398,7 +368,6 @@ void KitaMainWindow::slotURLLine()
 {
     KURL url = m_urlLine->text();
     KURL datURL = Kita::getDatURL( url );
-//    m_threadDock->slotShowThread( datURL );
     m_threadTab->slotShowMainThread( datURL );
 }
 
@@ -419,13 +388,6 @@ void KitaMainWindow::setupActions()
                         SLOT( optionsShowStatusbar() ),
                         actionCollection() );
 
-/*    m_subjectListAction = new KToggleAction( i18n( "Show subject list" ),
-                          0,
-                          m_boardDock,
-                          SLOT( slotToggleShowHide() ),
-                          actionCollection(),
-                          "window_show_subject_list" );*/
-
     m_showWriteDockAction = new KToggleAction( i18n( "Show Write Dock" ),
                             0,
                             m_writeDock,
@@ -453,14 +415,6 @@ void KitaMainWindow::setupActions()
                  actionCollection(),
                  "load_board_list" );
 
-    m_toggleViewAction = new KAction(
-                             i18n( "&Toggle subject view and thread view" ),
-                             KShortcut( Qt::Key_F7 ),
-                             this,
-                             SLOT( windowToggleView() ),
-                             actionCollection(),
-                             "window_toggle_view" );
-
     new KAction( i18n( "Login" ),
                  0,
                  this,
@@ -496,21 +450,6 @@ void KitaMainWindow::setupView()
 
     setView( mainWidget );
 
-    /* Subject View */
-/*    m_boardDock = new KitaBoardDock( manager(), "subject", 0L, 0L, i18n( "subject" ), i18n( "subject" ) );
-    m_boardTab = new KitaBoardTabWidget( this, "Subject" );
-    m_boardDock->setWidget( m_boardTab );
-    ViewMediator::getInstance()->setBoardDockWidget( m_boardDock );
-    ViewMediator::getInstance()->setBoardTabWidget( m_boardTab );
-    connect( m_boardDock, SIGNAL( checkToggleAction( bool ) ), SLOT( slotCheckSubjectToggleAction( bool ) ) );*/
-
-    /* Thread View */
-/*    m_threadDock = new KitaThreadDock( manager(), "Thread", 0L, 0L, i18n( "Thread" ), i18n( "Thread" ) );
-    m_threadTab = m_threadDock->setupAsMainView();
-    ViewMediator::getInstance()->setThreadDock( m_threadDock );
-    ViewMediator::getInstance()->setThreadTabWidget( m_threadTab );
-    m_threadDock->setDockSite( KDockWidget::DockFullSite );*/
-
     /* write dock */
     m_writeDock = new KitaWriteDock( manager(), "Write", 0L, 0L, i18n( "Write" ), i18n( "Write" ) );
     m_writeTab = new KitaWriteTabWidget( m_writeDock, "Write View" );

diff --git a/kita/src/mainwindow.h b/kita/src/mainwindow.h
index 1c37d51..3c7a347 100644 (file)
--- a/kita/src/mainwindow.h
+++ b/kita/src/mainwindow.h
@@ -70,7 +70,6 @@ private slots:
     void optionsPreferences();
     void settingsMenuAboutToShow();
     void setFont( const QFont& font );
-    void windowToggleView();
 
     void slotCheckSubjectToggleAction( bool check );
     void slotCheckWriteToggleAction( bool check );

diff --git a/kita/src/viewmediator.cpp b/kita/src/viewmediator.cpp
index b12b098..5d8af4f 100644 (file)
--- a/kita/src/viewmediator.cpp
+++ b/kita/src/viewmediator.cpp
@@ -50,9 +50,6 @@ void ViewMediator::openBoard( const KURL& url )
 
 void ViewMediator::openThread( const KURL& url )
 {
-/*    Q_ASSERT( m_threadDock );
-
-    m_threadDock->slotShowThread( url );*/
     Q_ASSERT( m_threadTabWidget );
 
     m_threadTabWidget->slotShowMainThread( url );
@@ -89,13 +86,9 @@ void ViewMediator::bookmark( const QString& datURL, bool on )
 bool ViewMediator::isKitaActive()
 {
     Q_ASSERT( m_writeDock );
-//    Q_ASSERT( m_boardDock );
-//    Q_ASSERT( m_threadDock );
     Q_ASSERT( m_mainWindow );
 
     if( m_writeDock->isActiveWindow() )  return TRUE;
-//    if( m_boardDock->isActiveWindow() )  return TRUE;
-//    if( m_threadDock->isActiveWindow() ) return TRUE;
     if( m_mainWindow->isActiveWindow() ) return TRUE;
 
     return FALSE;

diff --git a/kita/src/viewmediator.h b/kita/src/viewmediator.h
index fa1d0df..dddbf91 100644 (file)
--- a/kita/src/viewmediator.h
+++ b/kita/src/viewmediator.h
@@ -23,10 +23,8 @@ class ViewMediator {
     static ViewMediator* instance;
     KitaThreadTabWidget* m_threadTabWidget;
     KitaBoardTabWidget* m_boardTabWidget;
-//    KitaBoardDock* m_boardDock;
     KitaWriteDock* m_writeDock;
     KitaWriteTabWidget* m_writeTabWidget;
-//    KitaThreadDock* m_threadDock;
     KitaMainWindow* m_mainWindow;
     FavoriteListView* m_favoriteListView;
 
@@ -38,10 +36,8 @@ public:
 
     void setThreadTabWidget( KitaThreadTabWidget* threadTabWidget ) { m_threadTabWidget = threadTabWidget; }
     void setBoardTabWidget( KitaBoardTabWidget* boardTabWidget ) { m_boardTabWidget = boardTabWidget; }
-//    void setBoardDockWidget( KitaBoardDock* boardDock ) { m_boardDock = boardDock; }
     void setWriteDock( KitaWriteDock* writeDock ) { m_writeDock = writeDock; }
     void setWriteTabWidget( KitaWriteTabWidget* writeTabWidget ) { m_writeTabWidget = writeTabWidget; }
-//    void setThreadDock( KitaThreadDock* threadDock ) { m_threadDock = threadDock; }
     void setMainWindow( KitaMainWindow* mainWindow ) { m_mainWindow = mainWindow; }
     void setFavoriteListView( FavoriteListView* favoriteListView ) { m_favoriteListView = favoriteListView; }