refactoring.

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

diff --git a/kita/src/boardview.cpp b/kita/src/boardview.cpp
index 6acde72..5def2a4 100644 (file)
--- a/kita/src/boardview.cpp
+++ b/kita/src/boardview.cpp
@@ -73,8 +73,6 @@ KitaBoardView::KitaBoardView( KitaBoardTabWidget* parent, const char* name )
     Kita::SignalCollection* signalCollection = Kita::SignalCollection::getInstance();
     connect( signalCollection, SIGNAL( updateSubjectTab( const KURL& ) ),
              SLOT( slotUpdateSubject( const KURL& ) ) );
-    connect( this, SIGNAL( loadBoardCompleted( const KURL& ) ),
-             signalCollection, SIGNAL( setMainURLLine( const KURL& ) ) );
 
     connect( closeButton, SIGNAL( clicked() ),
              SLOT( slotCloseButton() ) );
@@ -189,7 +187,7 @@ void KitaBoardView::loadBoard( const KURL& url, bool online )
     if ( HideButton->isOn() ) {
         HideButton->toggle();
     }
-    emit loadBoardCompleted( m_boardURL );
+    ViewMediator::getInstance()->setMainURLLine( m_boardURL );
 
     switch ( Kita::Config::listSortOrder() ) {
     case Kita::Config::EnumListSortOrder::Mark:

diff --git a/kita/src/kitaui/tabwidgetbase.cpp b/kita/src/kitaui/tabwidgetbase.cpp
index a0dfd20..0f956f7 100644 (file)
--- a/kita/src/kitaui/tabwidgetbase.cpp
+++ b/kita/src/kitaui/tabwidgetbase.cpp
@@ -180,9 +180,6 @@ void KitaTabWidgetBase::connectSignals()
     connect( this, SIGNAL( currentChanged ( QWidget * ) ),
              SLOT( slotCurrentChanged ( QWidget * ) ) );
 
-    connect( this, SIGNAL( setMainURLLine( const KURL& ) ),
-             signalCollection, SIGNAL( setMainURLLine( const KURL& ) ) );
-
     connect( this, SIGNAL( setMainCaption( const QString& ) ),
              signalCollection, SIGNAL( setMainCaption( const QString& ) ) );
 

diff --git a/kita/src/kitaui/tabwidgetbase.h b/kita/src/kitaui/tabwidgetbase.h
index 34041ee..633eb4f 100644 (file)
--- a/kita/src/kitaui/tabwidgetbase.h
+++ b/kita/src/kitaui/tabwidgetbase.h
@@ -90,7 +90,6 @@ public slots:
     void slotCloseAllTab();
 
 signals:
-    void setMainURLLine( const KURL& url );
     void setMainCaption( const QString& captionStr );
     void openURLRequestExt( const KURL& url, const QString mimetype = QString::null );
 };

diff --git a/kita/src/libkita/signalcollection.h b/kita/src/libkita/signalcollection.h
index f85e2ca..dd2393a 100644 (file)
--- a/kita/src/libkita/signalcollection.h
+++ b/kita/src/libkita/signalcollection.h
@@ -50,7 +50,6 @@ namespace Kita
          *
          */
         void openURLRequestExt( const KURL& url, const QString mimetype = QString::null );
-        void setMainURLLine( const KURL& url );
         void setMainCaption( const QString& captionStr );
 
         /*--------------------------------*/
@@ -69,7 +68,6 @@ namespace Kita
         /*--------------------------------*/
 
         /* to : KitaHTMLPart */
-        void redrawHTMLPart( const KURL& url, bool force );
         void redrawAllHTMLPart( bool force );
         void setStyleSheetOfHTMLPart();
 

diff --git a/kita/src/mainwindow.cpp b/kita/src/mainwindow.cpp
index 38cc76a..e8f4bab 100644 (file)
--- a/kita/src/mainwindow.cpp
+++ b/kita/src/mainwindow.cpp
@@ -156,9 +156,6 @@ KitaMainWindow::KitaMainWindow()
     connect( signalCollection, SIGNAL( setMainCaption( const QString& ) ),
              SLOT( slotSetMainCaption( const QString& ) ) );
 
-    connect( signalCollection, SIGNAL( setMainURLLine( const KURL& ) ),
-             SLOT( setUrl( const KURL& ) ) );
-
     connect( signalCollection, SIGNAL( bookmarked( const QString&, bool ) ),
              SLOT( bookmark( const QString&, bool ) ) );
 

diff --git a/kita/src/mainwindow.h b/kita/src/mainwindow.h
index d1de05f..f9dc108 100644 (file)
--- a/kita/src/mainwindow.h
+++ b/kita/src/mainwindow.h
@@ -56,6 +56,7 @@ public:
 
     void load( const KURL& url );
     void slotSetMainStatusbar( const QString& statusStr );
+    void setUrl( const KURL& url );
 
 private slots:
     void bookmark( const QString& datURL, bool on );
@@ -69,7 +70,6 @@ private slots:
     void optionsPreferences();
     void settingsMenuAboutToShow();
     void setFont( const QFont& font );
-    void setUrl( const KURL& url );
     void windowToggleView();
 
     void slotCheckBoardToggleAction( bool check );

diff --git a/kita/src/threadtabwidget.cpp b/kita/src/threadtabwidget.cpp
index 6885150..7313906 100644 (file)
--- a/kita/src/threadtabwidget.cpp
+++ b/kita/src/threadtabwidget.cpp
@@ -213,7 +213,7 @@ void KitaThreadTabWidget::deleteWidget( QWidget* w )
     if ( count() == 0 ) {
         emit setMainCaption( QString::null );
         ViewMediator::getInstance()->setMainStatusBar( QString::null );
-        emit setMainURLLine( QString::null );
+        ViewMediator::getInstance()->setMainURLLine( QString::null );
 
         /* default view */
         KitaThreadView * threadView = createView( "thread" );

diff --git a/kita/src/threadview.cpp b/kita/src/threadview.cpp
index 297730c..1de827c 100644 (file)
--- a/kita/src/threadview.cpp
+++ b/kita/src/threadview.cpp
@@ -164,8 +164,6 @@ KitaThreadView::KitaThreadView( KitaThreadTabWidget* parent, const char* name )
     Kita::SignalCollection* signalCollection = Kita::SignalCollection::getInstance();
     connect( this, SIGNAL( bookmarked( const QString&, bool ) ),
              signalCollection, SIGNAL( bookmarked( const QString&, bool ) ) );
-    connect( this, SIGNAL( setMainURLLine( const KURL& ) ),
-             signalCollection, SIGNAL( setMainURLLine( const KURL& ) ) );
     connect( this, SIGNAL( updateSubjectTab( const KURL& ) ),
              signalCollection, SIGNAL( updateSubjectTab( const KURL& ) ) );
     connect( this, SIGNAL( updateThreadTab( const KURL& ) ),
@@ -440,7 +438,7 @@ void KitaThreadView::showStatusBar( QString info )
 
         emit setMainCaption( captionStr );
         ViewMediator::getInstance()->setMainStatusBar( infostr );
-        emit setMainURLLine( Kita::getThreadURL( m_datURL ) );
+        ViewMediator::getInstance()->setMainURLLine( Kita::getThreadURL( m_datURL ) );
 
         return ;
         break;

diff --git a/kita/src/threadview.h b/kita/src/threadview.h
index 0fcc879..fe95215 100644 (file)
--- a/kita/src/threadview.h
+++ b/kita/src/threadview.h
@@ -122,7 +122,6 @@ signals:
     void popupMenu( KXMLGUIClient*, const QPoint&, const KURL&, const QString&, mode_t );
     void updateSubjectTab( const KURL& datURL );
     void updateThreadTab( const KURL& datURL );
-    void setMainURLLine( const KURL& url );
     void setMainCaption( const QString& captionStr );
     void bookmarked( const QString& datURL, bool on );
     void showThreadCompleted(); /* to KitaThreadPart */

diff --git a/kita/src/viewmediator.cpp b/kita/src/viewmediator.cpp
index 8a678b5..b3de6ec 100644 (file)
--- a/kita/src/viewmediator.cpp
+++ b/kita/src/viewmediator.cpp
@@ -61,3 +61,10 @@ void ViewMediator::setMainStatusBar( const QString& statusStr )
 
     m_mainWindow->slotSetMainStatusbar( statusStr );
 }
+
+void ViewMediator::setMainURLLine( const KURL& url )
+{
+    Q_ASSERT( m_mainWindow );
+
+    m_mainWindow->setUrl( url );
+}

diff --git a/kita/src/viewmediator.h b/kita/src/viewmediator.h
index 6e817fa..c498d06 100644 (file)
--- a/kita/src/viewmediator.h
+++ b/kita/src/viewmediator.h
@@ -43,6 +43,7 @@ public:
     void openBoard( const KURL& url );
     void openThread( const KURL& url );
     void setMainStatusBar( const QString& statusStr );
+    void setMainURLLine( const KURL& url );
 };
 
 #endif