refactoring.

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

diff --git a/kita/src/bbsview.cpp b/kita/src/bbsview.cpp
index f397eba..d2ec8c9 100644 (file)
--- a/kita/src/bbsview.cpp
+++ b/kita/src/bbsview.cpp
@@ -106,8 +106,6 @@ KitaBBSView::KitaBBSView( QWidget *parent, const char *name )
     connect( m_boardList, SIGNAL( contextMenuRequested( QListViewItem*, const QPoint&, int ) ),
              SLOT( slotContextMenuRequested( QListViewItem*, const QPoint&, int ) ) );
     connect( Kita::FavoriteBoards::getInstance(), SIGNAL( changed() ), SLOT( refreshFavoriteBoards() ) );
-    connect( this, SIGNAL( openURLRequestExt( const KURL&, const QString ) ),
-             signalCollection, SIGNAL( openURLRequestExt( const KURL&, const QString ) ) );
     connect( SearchCombo, SIGNAL( textChanged( const QString& ) ),
              SLOT( filter( const QString& ) ) );
 }

diff --git a/kita/src/bbsview.h b/kita/src/bbsview.h
index d62f835..f57c58f 100644 (file)
--- a/kita/src/bbsview.h
+++ b/kita/src/bbsview.h
@@ -79,9 +79,6 @@ public slots:
 private:
     void loadExtBoard();
     bool downloadBoardList();
-
-signals:
-    void openURLRequestExt( const KURL& url, const QString mimetype = QString::null );
 };
 
 #endif

diff --git a/kita/src/htmlpart.cpp b/kita/src/htmlpart.cpp
index dd0b5ff..5a16cf5 100644 (file)
--- a/kita/src/htmlpart.cpp
+++ b/kita/src/htmlpart.cpp
@@ -166,10 +166,6 @@ void KitaHTMLPart::connectSignals()
     connect( view(), SIGNAL( horizontalSliderReleased() ), SLOT( slotHSliderReleased() ) );
 
     connect( signalCollection, SIGNAL( windowDeactivated() ), SLOT( slotHideChildPopup() ) );
-
-    /* click */
-    connect( this, SIGNAL( openURLRequestExt( const KURL&, const QString ) ),
-             signalCollection, SIGNAL( openURLRequestExt( const KURL&, const QString ) ) );
 }
 
 
@@ -373,7 +369,7 @@ bool KitaHTMLPart::reload( int jumpNum )
     if ( !m_domtree ) return FALSE;
     if ( m_mode != HTMLPART_MODE_MAINPART ) {
         /* If this is not MainPart, then open MainPart.  */
-        emit openURLRequestExt( m_datURL );
+        ViewMediator::getInstance()->openURL( m_datURL );
         return FALSE;
     }
 
@@ -984,7 +980,7 @@ void KitaHTMLPart::clickAnchor( const KURL& urlin )
         }
         /* right click */
 
-        emit openURLRequestExt( urlin );
+        ViewMediator::getInstance()->openURL( urlin );
         return ;
     }
 
@@ -1047,7 +1043,7 @@ void KitaHTMLPart::clickAnchor( const KURL& urlin )
     if ( !refNum ) return ;
 
     if ( m_mode == HTMLPART_MODE_POPUP ) {
-        emit openURLRequestExt( urlin );
+        ViewMediator::getInstance()->openURL( urlin );
     } else {
         gotoAnchor( QString().setNum( refNum ), TRUE );
     }

diff --git a/kita/src/htmlpart.h b/kita/src/htmlpart.h
index 07d8f2c..e5c2046 100644 (file)
--- a/kita/src/htmlpart.h
+++ b/kita/src/htmlpart.h
@@ -180,7 +180,6 @@ private slots:
 
 
 signals:
-    void openURLRequestExt( const KURL& url, const QString mimetype = QString::null );
     void mousePressed(); /* to KitaThreadView */
 
     /* cache */

diff --git a/kita/src/kitaui/tabwidgetbase.cpp b/kita/src/kitaui/tabwidgetbase.cpp
index c436260..8f3ee3f 100644 (file)
--- a/kita/src/kitaui/tabwidgetbase.cpp
+++ b/kita/src/kitaui/tabwidgetbase.cpp
@@ -174,14 +174,8 @@ KParts::Part* KitaTabWidgetBase::findPartFromWidget( QWidget* w )
 /* private */
 void KitaTabWidgetBase::connectSignals()
 {
-    /* connect signals */
-    Kita::SignalCollection * signalCollection = Kita::SignalCollection::getInstance();
-
     connect( this, SIGNAL( currentChanged ( QWidget * ) ),
              SLOT( slotCurrentChanged ( QWidget * ) ) );
-
-    connect( this, SIGNAL( openURLRequestExt( const KURL&, const QString ) ),
-             signalCollection, SIGNAL( openURLRequestExt( const KURL&, const QString ) ) );
 }
 
 

diff --git a/kita/src/kitaui/tabwidgetbase.h b/kita/src/kitaui/tabwidgetbase.h
index e9e45c6..729eed5 100644 (file)
--- a/kita/src/kitaui/tabwidgetbase.h
+++ b/kita/src/kitaui/tabwidgetbase.h
@@ -88,9 +88,6 @@ public slots:
     void slotCloseRightTab( int idx = -1 );
     void slotCloseLeftTab( int idx = -1 );
     void slotCloseAllTab();
-
-signals:
-    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 b0c847b..3230346 100644 (file)
--- a/kita/src/libkita/signalcollection.h
+++ b/kita/src/libkita/signalcollection.h
@@ -31,23 +31,6 @@ namespace Kita
         static SignalCollection* getInstance();
 
     signals:
-        /**
-         *
-         * @param url URL to open.
-         * @param args arguments of URL. @see KParts::URLArgs
-         * @param mimetype MIME Type to open.
-         *     "text/html" : open url with web browser. 
-         *     QString::null : use KIO::NetAccess::mimetype to decide mime type of url.
-         * @param usr1
-         *     1: open with tab(board, thread), image viewer is not hidden.
-         *     2: open by background(thread).
-         * @param usrUrl1 dat's URL(image viewer only)
-         *
-         */
-        void openURLRequestExt( const KURL& url, const QString mimetype = QString::null );
-
-        /*--------------------------------*/
-
         /* from: KitaDockWidgetBase            */
         /* to  : KitaHTMLPart                  */
         /* see also KitaHTMLPart::slotOnURL    */

diff --git a/kita/src/mainwindow.cpp b/kita/src/mainwindow.cpp
index 07bc821..787821a 100644 (file)
--- a/kita/src/mainwindow.cpp
+++ b/kita/src/mainwindow.cpp
@@ -140,9 +140,6 @@ KitaMainWindow::KitaMainWindow()
     // allow the view to change the statusbar and caption
     Kita::SignalCollection* signalCollection = Kita::SignalCollection::getInstance();
 
-    connect( signalCollection, SIGNAL( openURLRequestExt( const KURL&, const QString ) ),
-             SLOT( slotOpenURLRequestExt( const KURL&, const QString ) ) );
-
     connect( m_urlLine, SIGNAL( returnPressed() ),
              SLOT( slotURLLine() ) );
 
@@ -334,30 +331,6 @@ void KitaMainWindow::slotEditCopy()
     }
 }
 
-/* open url */
-/*
-  If mimetype == "text/html", open url with web browser.
-  if mimetype == QString::null, use KIO::NetAccess::mimetype to decide mime type of url.
- 
-*/  /* public slot */
-void KitaMainWindow::slotOpenURLRequestExt( const KURL& url, const QString mimetype )
-{
-    /*  open url with web browser, etc. */
-    if ( mimetype != QString::null ) {
-        KRun::runURL( url, mimetype );
-        return ;
-    }
-
-    /* open thread with new thread tab */
-    if ( Kita::DatManager::isThreadEnrolled( url ) ) {
-        m_threadTab->slotShowMainThread( url );
-        return ;
-    }
-
-    QString url_mimetype = KIO::NetAccess::mimetype( url , this );
-    KRun::runURL( url, url_mimetype );
-}
-
 void KitaMainWindow::slotSetMainStatusbar( const QString& statusStr )
 {
     // display the text on the statusbar

diff --git a/kita/src/mainwindow.h b/kita/src/mainwindow.h
index 3c7a347..65e5007 100644 (file)
--- a/kita/src/mainwindow.h
+++ b/kita/src/mainwindow.h
@@ -74,7 +74,6 @@ private slots:
     void slotCheckSubjectToggleAction( bool check );
     void slotCheckWriteToggleAction( bool check );
     void slotEditCopy();
-    void slotOpenURLRequestExt( const KURL& url, const QString mimetype = QString::null );
     void slotURLLine();
 
 private:

diff --git a/kita/src/previewpart.cpp b/kita/src/previewpart.cpp
index cb0a4c7..3cf16c4 100644 (file)
--- a/kita/src/previewpart.cpp
+++ b/kita/src/previewpart.cpp
@@ -89,10 +89,6 @@ void KitaPreviewPart::connectSignals()
     connect( view(), SIGNAL( horizontalSliderReleased() ), SLOT( slotHSliderReleased() ) );
 
     connect( signalCollection, SIGNAL( windowDeactivated() ), SLOT( slotHideChildPopup() ) );
-
-    /* click */
-    connect( this, SIGNAL( openURLRequestExt( const KURL&, const QString ) ),
-             signalCollection, SIGNAL( openURLRequestExt( const KURL&, const QString ) ) );
 }
 
 void KitaPreviewPart::createHTMLDocument()
@@ -201,7 +197,7 @@ void KitaPreviewPart::clickAnchor( const KURL& urlin )
     /* If this is not anchor, then    */
     /* emit openURLRequest and return */
     if ( datURL.host() != m_datURL.host() || datURL.path() != m_datURL.path() ) {
-        emit openURLRequestExt( urlin );
+        ViewMediator::getInstance()->openURL( urlin );
         return ;
     }
 
@@ -226,7 +222,7 @@ void KitaPreviewPart::clickAnchor( const KURL& urlin )
 
     if ( !refNum ) return ;
 
-    emit openURLRequestExt( urlin );
+    ViewMediator::getInstance()->openURL( urlin );
 }
 
 void KitaPreviewPart::slotDeletePopup()

diff --git a/kita/src/previewpart.h b/kita/src/previewpart.h
index 385f3ee..6c50793 100644 (file)
--- a/kita/src/previewpart.h
+++ b/kita/src/previewpart.h
@@ -88,8 +88,6 @@ private slots:
     void slotOnURL( const QString& url );
 
 signals:
-
-    void openURLRequestExt( const KURL& url, const QString mimetype = QString::null );
     void mousePressed(); /* to KitaThreadView */
 };
 

diff --git a/kita/src/threadlistview.cpp b/kita/src/threadlistview.cpp
index c4c79f6..1a7b4cd 100644 (file)
--- a/kita/src/threadlistview.cpp
+++ b/kita/src/threadlistview.cpp
@@ -76,8 +76,6 @@ ThreadListView::ThreadListView( QWidget* parent, const char* name )
              SLOT( slotHideButton( bool ) ) );
     connect( subjectList, SIGNAL( mouseButtonClicked( int, QListViewItem*, const QPoint&, int ) ),
              SLOT( slotMouseButtonClicked( int, QListViewItem* ) ) );
-    connect( this, SIGNAL( openURLRequestExt( const KURL&, const QString ) ),
-             Kita::SignalCollection::getInstance(), SIGNAL( openURLRequestExt( const KURL&, const QString ) ) );
 }
 
 ThreadListView::~ThreadListView()

diff --git a/kita/src/threadlistview.h b/kita/src/threadlistview.h
index 0f0e184..fe5e93a 100644 (file)
--- a/kita/src/threadlistview.h
+++ b/kita/src/threadlistview.h
@@ -58,8 +58,6 @@ namespace Kita
     private slots:
         void slotSearchButton();
 
-    signals:
-        void openURLRequestExt( const KURL& url, const QString mimetype = QString::null );
     };
 }
 

diff --git a/kita/src/threadview.cpp b/kita/src/threadview.cpp
index 9d9467c..2400fe3 100644 (file)
--- a/kita/src/threadview.cpp
+++ b/kita/src/threadview.cpp
@@ -161,10 +161,6 @@ KitaThreadView::KitaThreadView( KitaThreadTabWidget* parent, const char* name )
     connect( closeButton, SIGNAL( clicked() ),
              SLOT( slotCloseButton() ) );
 
-    Kita::SignalCollection* signalCollection = Kita::SignalCollection::getInstance();
-    connect( this, SIGNAL( openURLRequestExt( const KURL&, const QString ) ),
-             signalCollection, SIGNAL( openURLRequestExt( const KURL&, const QString ) ) );
-
     m_viewmode = VIEWMODE_MAINVIEW;
     m_rescode = 200;
     m_serverTime = 0;

diff --git a/kita/src/threadview.h b/kita/src/threadview.h
index e9fe67f..d4b04a7 100644 (file)
--- a/kita/src/threadview.h
+++ b/kita/src/threadview.h
@@ -121,7 +121,6 @@ private slots:
 signals:
     void popupMenu( KXMLGUIClient*, const QPoint&, const KURL&, const QString&, mode_t );
     void showThreadCompleted(); /* to KitaThreadPart */
-    void openURLRequestExt( const KURL& url, const QString mimetype = QString::null );
 };
 
 #endif

diff --git a/kita/src/viewmediator.cpp b/kita/src/viewmediator.cpp
index 5d8af4f..478ffb9 100644 (file)
--- a/kita/src/viewmediator.cpp
+++ b/kita/src/viewmediator.cpp
@@ -9,6 +9,11 @@
  ***************************************************************************/
 #include "viewmediator.h"
 
+#include "libkita/datmanager.h"
+
+#include <kio/netaccess.h>
+#include <krun.h>
+
 ViewMediator* ViewMediator::instance = 0;
 
 ViewMediator::ViewMediator()
@@ -121,3 +126,15 @@ void ViewMediator::updateFavoriteListView()
 
     m_favoriteListView->refresh();
 }
+
+void ViewMediator::openURL( const KURL& url )
+{
+    // open thread.
+    if ( Kita::DatManager::isThreadEnrolled( url ) ) {
+        m_threadTabWidget->slotShowMainThread( url );
+        return;
+    }
+
+    QString mimetype = KIO::NetAccess::mimetype( url , m_threadTabWidget );
+    KRun::runURL( url, mimetype );
+}

diff --git a/kita/src/viewmediator.h b/kita/src/viewmediator.h
index dddbf91..e9d068e 100644 (file)
--- a/kita/src/viewmediator.h
+++ b/kita/src/viewmediator.h
@@ -54,6 +54,7 @@ public:
     void updateThreadView( const KURL& datURL );
     void changeWriteTab( const KURL& datURL );
     void updateFavoriteListView();
+    void openURL( const KURL& url );
 };
 
 #endif

diff --git a/kita/src/writeview.cpp b/kita/src/writeview.cpp
index cbcf655..5ac9f75 100644 (file)
--- a/kita/src/writeview.cpp
+++ b/kita/src/writeview.cpp
@@ -88,9 +88,6 @@ void KitaWriteView::initUI()
     connect( buttonCancel, SIGNAL( clicked() ),
              SLOT( slotCancel() ) );
 
-    connect( this, SIGNAL( openURLRequestExt( const KURL&, const QString ) ),
-             signalCollection, SIGNAL( openURLRequestExt( const KURL&, const QString ) ) );
-
     connect( faceCombo, SIGNAL( activated( const QString& ) ),
              bodyText, SLOT( insert( const QString& ) ) );
 

diff --git a/kita/src/writeview.h b/kita/src/writeview.h
index 5516e21..d0c135b 100644 (file)
--- a/kita/src/writeview.h
+++ b/kita/src/writeview.h
@@ -93,8 +93,5 @@ private slots:
 protected slots:
     bool slotBodyTextChanged();
 
-signals:
-
-    void openURLRequestExt( const KURL& url, const QString mimetype = QString::null );
 };
 #endif