refactoring.

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

diff --git a/kita/src/favoritelistview.cpp b/kita/src/favoritelistview.cpp
index 61724bf..85a93a5 100644 (file)
--- a/kita/src/favoritelistview.cpp
+++ b/kita/src/favoritelistview.cpp
@@ -95,7 +95,7 @@ void FavoriteListView::loadThread( QListViewItem* item )
         const Kita::Thread* thread = it.current();
 
         if ( thread->datURL() == item->text( Col_DatURL ) ) {
-            emit signalShowThread( thread );
+            emit showThreadRequested( thread, false );
         }
     }
 }
@@ -133,7 +133,7 @@ void FavoriteListView::slotContextMenuRequested( QListViewItem* item, const QPoi
         KRun::runURL( thread->url(), "text/html" );
         break;
     case 1:
-        emit signalShowThreadWithNewTab( thread );
+        emit showThreadRequested( thread, true );
         break;
     case 2:
         clipboard->setText( thread->name() + "\n" + thread->url() );

diff --git a/kita/src/favoritelistview.h b/kita/src/favoritelistview.h
index d137144..f74edf9 100644 (file)
--- a/kita/src/favoritelistview.h
+++ b/kita/src/favoritelistview.h
@@ -59,8 +59,7 @@ signals:
     /**
      * @param thread ɽ¼¨¤¹¤ë¥¹¥ì
      */
-    void signalShowThread( const Kita::Thread* thread );
-    void signalShowThreadWithNewTab( const Kita::Thread* thread );
+    void showThreadRequested( const Kita::Thread* thread, bool withNewTab );
 };
 
 #endif

diff --git a/kita/src/kita.cpp b/kita/src/kita.cpp
index a3b8312..bd20de9 100644 (file)
--- a/kita/src/kita.cpp
+++ b/kita/src/kita.cpp
@@ -94,12 +94,8 @@ KitaMainWindow::KitaMainWindow()
     connect( m_boardView, SIGNAL( openBoardRequested( const QString&, bool ) ),
              m_subjectTab, SLOT( loadBoard( const QString&, bool ) ) );
 
-    connect( m_subjectTab, SIGNAL( signalShowThread( const Kita::Thread* ) ),
-             m_threadTab, SLOT( showThread( const Kita::Thread* ) ) );
-
-    // ad-hoc
-    connect( m_subjectTab, SIGNAL( signalShowThreadWithNewTab( const Kita::Thread* ) ),
-             m_threadTab, SLOT( showThreadWithNewTab( const Kita::Thread* ) ) );
+    connect( m_subjectTab, SIGNAL( showThreadRequested( const Kita::Thread*, bool ) ),
+             m_threadTab, SLOT( showThread( const Kita::Thread*, bool ) ) );
 
     connect( m_threadTab, SIGNAL( thread( const Kita::Thread* ) ),
              m_subjectTab, SLOT( updateThread( const Kita::Thread* ) ) );

diff --git a/kita/src/kitasubjecttabwidget.cpp b/kita/src/kitasubjecttabwidget.cpp
index 92b1117..d3f9011 100644 (file)
--- a/kita/src/kitasubjecttabwidget.cpp
+++ b/kita/src/kitasubjecttabwidget.cpp
@@ -82,10 +82,8 @@ void KitaSubjectTabWidget::updateThread( const Kita::Thread* thread )
 
 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( showThreadRequested( const Kita::Thread*, bool ) ),
+             this, SIGNAL( showThreadRequested( const Kita::Thread*, bool ) ) );
 }
 
 void KitaSubjectTabWidget::slotCurrentChanged( QWidget* widget )

diff --git a/kita/src/kitasubjecttabwidget.h b/kita/src/kitasubjecttabwidget.h
index 09681b8..3415093 100644 (file)
--- a/kita/src/kitasubjecttabwidget.h
+++ b/kita/src/kitasubjecttabwidget.h
@@ -43,8 +43,7 @@ private slots:
     void deleteView( KitaSubjectView* view );
 
 signals:
-    void signalShowThread( const Kita::Thread* );
-    void signalShowThreadWithNewTab( const Kita::Thread* );
+    void showThreadRequested( const Kita::Thread*, bool withNewTab );
     void loadBoardCompleted( const KURL& );
 };
 

diff --git a/kita/src/kitasubjectview.cpp b/kita/src/kitasubjectview.cpp
index 7d77981..ede484a 100644 (file)
--- a/kita/src/kitasubjectview.cpp
+++ b/kita/src/kitasubjectview.cpp
@@ -83,7 +83,7 @@ void KitaSubjectView::loadThread( QListViewItem* item )
 
     Kita::Thread* thread = Kita::Thread::getByURL( datURL.url() );
 
-    emit signalShowThread( thread );
+    emit showThreadRequested( thread, false );
 }
 
 void KitaSubjectView::loadBoard( const Kita::Board* board )
@@ -200,7 +200,7 @@ void KitaSubjectView::slotContextMenuRequested( QListViewItem* item, const QPoin
         KRun::runURL( thread->url(), "text/html" );
         break;
     case 1:
-        emit signalShowThreadWithNewTab( thread );
+        emit showThreadRequested( thread, true );
         break;
     case 2:
         clipboard->setText( thread->name() + "\n" + thread->url() );
@@ -227,10 +227,10 @@ void KitaSubjectView::slotMouseButtonClicked( int button, QListViewItem* item )
 
     switch ( button ) {
     case MidButton:
-        emit signalShowThreadWithNewTab( thread );
+        emit showThreadRequested( thread, true );
         break;
     case LeftButton:
-        emit signalShowThread( thread );
+        emit showThreadRequested( thread, false );
         break;
     }
 }

diff --git a/kita/src/kitasubjectview.h b/kita/src/kitasubjectview.h
index 012ca5d..c5c27cb 100644 (file)
--- a/kita/src/kitasubjectview.h
+++ b/kita/src/kitasubjectview.h
@@ -50,8 +50,7 @@ private slots:
 
 signals:
     void loadBoardCompleted( const KURL& );
-    void signalShowThread( const Kita::Thread* thread );
-    void signalShowThreadWithNewTab( const Kita::Thread* thread );
+    void showThreadRequested( const Kita::Thread* thread, bool withNewTab );
 };
 
 #endif

diff --git a/kita/src/kitathreadtabwidget.cpp b/kita/src/kitathreadtabwidget.cpp
index 398c98a..bec4f61 100644 (file)
--- a/kita/src/kitathreadtabwidget.cpp
+++ b/kita/src/kitathreadtabwidget.cpp
@@ -66,6 +66,15 @@ void KitaThreadTabWidget::showThread( const QString& datURL, bool withNewTab )
     }
 }
 
+void KitaThreadTabWidget::showThread( const Kita::Thread* thread, bool withNewTab )
+{
+    if ( withNewTab ) {
+        showThreadWithNewTab( thread );
+    } else {
+        showThread( thread );
+    }
+}
+
 KitaThreadView* KitaThreadTabWidget::createView()
 {
     KLibFactory * factory = KLibLoader::self() ->factory( "libkitapart" );

diff --git a/kita/src/kitathreadtabwidget.h b/kita/src/kitathreadtabwidget.h
index 1343588..7d26f64 100644 (file)
--- a/kita/src/kitathreadtabwidget.h
+++ b/kita/src/kitathreadtabwidget.h
@@ -39,6 +39,7 @@ public:
 public slots:
     void showThread( const Kita::Thread* thread );
     void showThread( const QString& datURL, bool withNewTab = false );
+    void showThread( const Kita::Thread* thread, bool withNewTab );
     void showThreadWithNewTab( const Kita::Thread* thread ); // ad-hoc
     void deleteView( KitaThreadView* );
     void reloadThread();