KitaSubjectTabWidget -> KitaBoardTabWidget

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

diff --git a/kita/src/board/boardtabwidget.cpp b/kita/src/board/boardtabwidget.cpp
index 0e72e42..12185ed 100644 (file)
--- a/kita/src/board/boardtabwidget.cpp
+++ b/kita/src/board/boardtabwidget.cpp
@@ -24,7 +24,7 @@
 #include <qclipboard.h>
 
 
-KitaSubjectTabWidget::KitaSubjectTabWidget( QWidget* parent, const char* name, WFlags f )
+KitaBoardTabWidget::KitaBoardTabWidget( QWidget* parent, const char* name, WFlags f )
         : KitaTabWidgetBase( parent, name, f )
 {
     setXMLFile( "boardtabwidgetui.rc" );
@@ -37,11 +37,11 @@ KitaSubjectTabWidget::KitaSubjectTabWidget( QWidget* parent, const char* name, W
     setupActions();
 }
 
-KitaSubjectTabWidget::~KitaSubjectTabWidget()
+KitaBoardTabWidget::~KitaBoardTabWidget()
 {}
 
 /* public slots */
-void KitaSubjectTabWidget::loadBoard( const KURL& boardURL, bool withNewTab )
+void KitaBoardTabWidget::loadBoard( const KURL& boardURL, bool withNewTab )
 {
     KitaBoardView * view = findView( boardURL );
     QString boardName = Kita::BoardManager::boardName( boardURL );
@@ -67,7 +67,7 @@ void KitaSubjectTabWidget::loadBoard( const KURL& boardURL, bool withNewTab )
 }
 
 /* create KitaBoardView */ /* private */
-KitaBoardView* KitaSubjectTabWidget::createView( QString label )
+KitaBoardView* KitaBoardTabWidget::createView( QString label )
 {
     KitaBoardView * view = new KitaBoardView( this );
     if ( view ) {
@@ -79,7 +79,7 @@ KitaBoardView* KitaSubjectTabWidget::createView( QString label )
 }
 
 /* private */
-KitaBoardView* KitaSubjectTabWidget::findView( const KURL& boardURL )
+KitaBoardView* KitaBoardTabWidget::findView( const KURL& boardURL )
 {
     int max = count() - 1;
     if ( max <= 0 ) return NULL;
@@ -96,7 +96,7 @@ KitaBoardView* KitaSubjectTabWidget::findView( const KURL& boardURL )
 
 
 /* protected */ /* virtual */
-void KitaSubjectTabWidget::deleteWidget( QWidget* w )
+void KitaBoardTabWidget::deleteWidget( QWidget* w )
 {
     KitaBoardView * view = isSubjectView( w );
     if ( !view ) return ;
@@ -106,7 +106,7 @@ void KitaSubjectTabWidget::deleteWidget( QWidget* w )
 
 
 /* private */
-KitaBoardView* KitaSubjectTabWidget::isSubjectView( QWidget* w )
+KitaBoardView* KitaBoardTabWidget::isSubjectView( QWidget* w )
 {
     KitaBoardView * view = NULL;
     if ( w ) {
@@ -120,7 +120,7 @@ KitaBoardView* KitaSubjectTabWidget::isSubjectView( QWidget* w )
 /* KitaBoardView actions */
 
 /* private */
-void KitaSubjectTabWidget::setupActions()
+void KitaBoardTabWidget::setupActions()
 {
     new KAction( i18n( "Find" ),
                  "find",
@@ -161,21 +161,21 @@ void KitaSubjectTabWidget::setupActions()
 }
 
 /* public slot */
-void KitaSubjectTabWidget::slotReloadButton()
+void KitaBoardTabWidget::slotReloadButton()
 {
     KitaBoardView * view = isSubjectView( currentPage() );
     if ( view ) view->reloadSubject();
 }
 
 /* public slot */
-void KitaSubjectTabWidget::slotFocusSearchCombo()
+void KitaBoardTabWidget::slotFocusSearchCombo()
 {
     KitaBoardView * view = isSubjectView( currentPage() );
     if ( view ) view->slotFocusSearchCombo();
 }
 
 /* public slot */
-void KitaSubjectTabWidget::slotNewThread()
+void KitaBoardTabWidget::slotNewThread()
 {
     KitaBoardView * view = isSubjectView( currentPage() );
     if ( view ) view->slotCreateNewThread();
@@ -183,7 +183,7 @@ void KitaSubjectTabWidget::slotNewThread()
 
 
 /* public slot */
-void KitaSubjectTabWidget::slotShowOldLogs( int idx )
+void KitaBoardTabWidget::slotShowOldLogs( int idx )
 {
     KitaBoardView * view;
     if ( idx == -1 ) view = isSubjectView( currentPage() );
@@ -192,7 +192,7 @@ void KitaSubjectTabWidget::slotShowOldLogs( int idx )
 }
 
 /* public slot */
-void KitaSubjectTabWidget::slotShowTitleImg( int idx )
+void KitaBoardTabWidget::slotShowTitleImg( int idx )
 {
     KitaBoardView * view;
     if ( idx == -1 ) view = isSubjectView( currentPage() );
@@ -234,7 +234,7 @@ void SubjectTabBar::showPopupMenu( int idx, QPoint global )
         MENU_SHOWOLDLOGS
     };
 
-    KitaSubjectTabWidget* tabwidget = static_cast<KitaSubjectTabWidget*>( parentWidget() );
+    KitaBoardTabWidget* tabwidget = static_cast<KitaBoardTabWidget*>( parentWidget() );
     KActionCollection * collection = tabwidget->actionCollection();
 
     if ( QString::compare( tabwidget->page( idx ) ->name(), "favoriteTab" ) == 0 ) return ;
@@ -304,22 +304,22 @@ KitaBoardDock::KitaBoardDock( KDockManager* dockManager,
 
 KitaBoardDock::~KitaBoardDock()
 {
-    if ( m_subjectTab ) delete m_subjectTab;
+    if ( m_boardTab ) delete m_boardTab;
 }
 
 
 /* setup & create KitaBoardDock */ /* public */
-KitaSubjectTabWidget* KitaBoardDock::setup()
+KitaBoardTabWidget* KitaBoardDock::setup()
 {
     /* create KitaNaviTabWidget */
-    m_subjectTab = new KitaSubjectTabWidget( this, "Subject" );
-    setWidget( m_subjectTab );
+    m_boardTab = new KitaBoardTabWidget( this, "Subject" );
+    setWidget( m_boardTab );
 
     Kita::SignalCollection* signalCollection = Kita::SignalCollection::getInstance();
     connect( signalCollection, SIGNAL( switchToSubject() ),
              SLOT( slotShowDock() ) );
 
-    return m_subjectTab;
+    return m_boardTab;
 }
 
 /* public slot */
@@ -327,5 +327,5 @@ void KitaBoardDock::slotLoadBoard( const KURL& boardURL, bool withNewTab )
 {
     slotShowDock();
 
-    if ( m_subjectTab ) m_subjectTab->loadBoard( boardURL, withNewTab );
+    if ( m_boardTab ) m_boardTab->loadBoard( boardURL, withNewTab );
 }

diff --git a/kita/src/board/boardtabwidget.h b/kita/src/board/boardtabwidget.h
index 0e91eaf..6e191d3 100644 (file)
--- a/kita/src/board/boardtabwidget.h
+++ b/kita/src/board/boardtabwidget.h
@@ -8,8 +8,8 @@
 *   (at your option) any later version.                                   *
 ***************************************************************************/
 
-#ifndef KITASUBJECTTABWIDGET_H
-#define KITASUBJECTTABWIDGET_H
+#ifndef KITABOARDTABWIDGET_H
+#define KITABOARDTABWIDGET_H
 
 #include "kitaui/tabwidgetbase.h"
 
@@ -19,13 +19,13 @@
 /**
 @author Hideki Ikemoto
 */
-class KitaSubjectTabWidget : public KitaTabWidgetBase
+class KitaBoardTabWidget : public KitaTabWidgetBase
 {
     Q_OBJECT
 
 public:
-    KitaSubjectTabWidget( QWidget* parent = 0, const char* name = 0, WFlags f = 0 );
-    ~KitaSubjectTabWidget();
+    KitaBoardTabWidget( QWidget* parent = 0, const char* name = 0, WFlags f = 0 );
+    ~KitaBoardTabWidget();
 
 public slots:
     void loadBoard( const KURL&, bool withNewTab = false );
@@ -75,7 +75,7 @@ class KitaBoardDock : public KitaDockWidgetBase
 {
 
     Q_OBJECT
-    KitaSubjectTabWidget* m_subjectTab;
+    KitaBoardTabWidget* m_boardTab;
 public:
     KitaBoardDock( KDockManager* dockManager,
                      const char* name,
@@ -86,7 +86,7 @@ public:
                      WFlags f = 0 );
     ~KitaBoardDock();
 
-    KitaSubjectTabWidget* setup();
+    KitaBoardTabWidget* setup();
 
 public slots:
     void slotLoadBoard( const KURL& boardURL, bool withNewTab );

diff --git a/kita/src/mainwindow.cpp b/kita/src/mainwindow.cpp
index 3c7347a..3ed1091 100644 (file)
--- a/kita/src/mainwindow.cpp
+++ b/kita/src/mainwindow.cpp
@@ -401,7 +401,7 @@ void KitaMainWindow::setupActions()
     setXMLFile( "kitaui.rc" );
     KMainWindow::createGUI();
     factory() ->addClient( m_bbsTab );
-    factory() ->addClient( m_subjectTab );
+    factory() ->addClient( m_boardTab );
     factory() ->addClient( m_threadTab );
     factory() ->addClient( m_imgTab );
     factory() ->addClient( m_naviTab );
@@ -698,7 +698,7 @@ void KitaMainWindow::setupView()
 
     /* Subject View */
     m_boardDock = new KitaBoardDock( manager(), "subject", 0L, 0L, i18n( "subject" ), i18n( "subject" ) );
-    m_subjectTab = m_boardDock->setup();
+    m_boardTab = m_boardDock->setup();
     connect( m_boardDock, SIGNAL( checkToggleAction( bool ) ), SLOT( slotCheckSubjectToggleAction( bool ) ) );
 
     /* Board View */
@@ -925,7 +925,7 @@ void KitaMainWindow::saveCache()
 
 void KitaMainWindow::setFont( const QFont& font )
 {
-    m_subjectTab->setFont( font );
+    m_boardTab->setFont( font );
     m_bbsTab->setFont( font );
 }
 

diff --git a/kita/src/mainwindow.h b/kita/src/mainwindow.h
index c91e97d..6d6dbb5 100644 (file)
--- a/kita/src/mainwindow.h
+++ b/kita/src/mainwindow.h
@@ -25,7 +25,7 @@ class KLineEdit;
 
 class KitaBBSDock;
 class KitaBBSTabWidget;
-class KitaSubjectTabWidget;
+class KitaBoardTabWidget;
 class KitaBoardDock;
 class KitaThreadDock;
 class KitaThreadTabWidget;
@@ -147,7 +147,7 @@ private:
 
     KitaThreadTabWidget* m_threadTab;
     KitaBBSTabWidget* m_bbsTab;
-    KitaSubjectTabWidget* m_subjectTab;
+    KitaBoardTabWidget* m_boardTab;
     KitaImgTabWidget* m_imgTab;
     KitaThreadTabWidget* m_naviTab;
     KitaWriteTabWidget* m_writeTab;