refactoring.

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

diff --git a/kita/src/libkita/signalcollection.h b/kita/src/libkita/signalcollection.h
index 4967ec7..ea6c0f7 100644 (file)
--- a/kita/src/libkita/signalcollection.h
+++ b/kita/src/libkita/signalcollection.h
@@ -110,7 +110,6 @@ namespace Kita
         void closeWriteTab( const KURL& url );
 
         /* to : KitaWriteDock */
-        void showWriteView( const KURL& , const QString& );
         void switchToWritedock();
     };
 

diff --git a/kita/src/mainwindow.cpp b/kita/src/mainwindow.cpp
index f4eccac..2d7fe82 100644 (file)
--- a/kita/src/mainwindow.cpp
+++ b/kita/src/mainwindow.cpp
@@ -573,6 +573,7 @@ void KitaMainWindow::setupView()
     m_writeDock->setWidget( m_writeTab );
     m_writeDock->setWriteTabWidget( m_writeTab );
     m_writeDock->setup();
+    ViewMediator::getInstance()->setWriteDock( m_writeDock );
     connect( m_writeDock, SIGNAL( checkToggleAction( bool ) ), SLOT( slotCheckWriteToggleAction( bool ) ) );
 
     /* reset dock status */

diff --git a/kita/src/threadview.cpp b/kita/src/threadview.cpp
index 84f2e8f..763656a 100644 (file)
--- a/kita/src/threadview.cpp
+++ b/kita/src/threadview.cpp
@@ -43,6 +43,7 @@
 #include <qpopupmenu.h>
 
 #include "htmlpart.h"
+#include "viewmediator.h"
 
 #include "libkita/kitaconfig.h"
 #include "libkita/kita-utf8.h"
@@ -181,10 +182,6 @@ KitaThreadView::KitaThreadView( QWidget* parent, const char* name )
     connect( this, SIGNAL( activateThreadView( const KURL& ) ),
              signalCollection, SIGNAL( activateThreadView( const KURL& ) ) );
 
-    /* write dock */
-    connect( this, SIGNAL( showWriteView( const KURL& , const QString& ) ),
-             signalCollection, SIGNAL( showWriteView( const KURL& , const QString& ) ) );
-
     m_viewmode = VIEWMODE_MAINVIEW;
     m_rescode = 200;
     m_serverTime = 0;
@@ -260,9 +257,9 @@ void KitaThreadView::updateButton()
 /*--------------------*/
 /* write response     */
 /*--------------------*/  /* private slots */
-void KitaThreadView::slotWriteButtonClicked( QString resstr )
+void KitaThreadView::slotWriteButtonClicked( QString resStr )
 {
-    emit showWriteView( m_datURL, resstr );
+    ViewMediator::getInstance()->showWriteView( m_datURL, resStr );
 }
 
 

diff --git a/kita/src/threadview.h b/kita/src/threadview.h
index ce63e68..d3a50ab 100644 (file)
--- a/kita/src/threadview.h
+++ b/kita/src/threadview.h
@@ -128,7 +128,6 @@ signals:
     void closeCurrentTab(); /* to KitaThreadTabWidget */
     void openURLRequestExt( const KURL& url, const QString mimetype = QString::null );
 
-    void showWriteView( const KURL& , const QString& );
     void activateThreadView( const KURL& );
 };
 

diff --git a/kita/src/viewmediator.cpp b/kita/src/viewmediator.cpp
index 038e706..87f3d9d 100644 (file)
--- a/kita/src/viewmediator.cpp
+++ b/kita/src/viewmediator.cpp
@@ -33,3 +33,10 @@ void ViewMediator::closeThreadTab( const KURL& url )
 
     m_threadTabWidget->slotCloseThreadTab( url );
 }
+
+void ViewMediator::showWriteView( const KURL& url, const QString& resStr )
+{
+    Q_ASSERT( m_writeDock );
+
+    m_writeDock->slotShowWriteView( url, resStr );
+}

diff --git a/kita/src/viewmediator.h b/kita/src/viewmediator.h
index 6648cd6..5e0e72e 100644 (file)
--- a/kita/src/viewmediator.h
+++ b/kita/src/viewmediator.h
@@ -11,6 +11,7 @@
 #define VIEWMEDIATOR_H
 
 #include "threadtabwidget.h"
+#include "writetabwidget.h"
 
 /**
  * @author Hideki Ikemoto <ikemo@wakaba.jp>
@@ -18,6 +19,7 @@
 class ViewMediator {
     static ViewMediator* instance;
     KitaThreadTabWidget* m_threadTabWidget;
+    KitaWriteDock* m_writeDock;
 
     ViewMediator();
     ~ViewMediator();
@@ -26,8 +28,10 @@ public:
     static ViewMediator* getInstance();
 
     void setThreadTabWidget( KitaThreadTabWidget* threadTabWidget ) { m_threadTabWidget = threadTabWidget; }
+    void setWriteDock( KitaWriteDock* writeDock ) { m_writeDock = writeDock; }
 
     void closeThreadTab( const KURL& url );
+    void showWriteView( const KURL& url, const QString& resStr );
 };
 
 #endif

diff --git a/kita/src/writetabwidget.cpp b/kita/src/writetabwidget.cpp
index 9a429f6..36c2527 100644 (file)
--- a/kita/src/writetabwidget.cpp
+++ b/kita/src/writetabwidget.cpp
@@ -247,8 +247,6 @@ KitaWriteDock::~KitaWriteDock() {}
 void KitaWriteDock::setup()
 {
     Kita::SignalCollection* signalCollection = Kita::SignalCollection::getInstance();
-    connect( signalCollection, SIGNAL( showWriteView( const KURL& , const QString& ) ),
-             this, SLOT( slotShowWriteView( const KURL& , const QString& ) ) );
     connect( signalCollection, SIGNAL( switchToWritedock() ),
              this, SLOT( slotShowDock() ) );
 }

diff --git a/kita/src/writetabwidget.h b/kita/src/writetabwidget.h
index a8dcf96..04b402c 100644 (file)
--- a/kita/src/writetabwidget.h
+++ b/kita/src/writetabwidget.h
@@ -25,9 +25,9 @@ class KitaWriteTabWidget : public KitaTabWidgetBase
 public:
     KitaWriteTabWidget( QWidget* parent = 0, const char* name = 0, WFlags f = 0 );
     ~KitaWriteTabWidget();
+    void slotShowWriteView( const KURL& url, const QString& resStr );
 
 public slots:
-    void slotShowWriteView( const KURL& url, const QString& resStr );
     void slotCloseWriteTab( const KURL& url );
 
 private:
@@ -74,8 +74,6 @@ public:
 
     void setup();
     void setWriteTabWidget( KitaWriteTabWidget* w ) { m_writeTab = w; }
-
-public slots:
     void slotShowWriteView( const KURL& url, const QString& resStr );
 };