refactoring.

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

diff --git a/kita/src/boardview.cpp b/kita/src/boardview.cpp
index 5def2a4..a95792a 100644 (file)
--- a/kita/src/boardview.cpp
+++ b/kita/src/boardview.cpp
@@ -386,9 +386,9 @@ void KitaBoardView::slotContextMenuRequested( QListViewItem* item, const QPoint&
         break;
     case Menu_Favorites:
         if ( isFavorites ) {
-            emit bookmarked( datURL, false );
+            ViewMediator::getInstance()->bookmark( datURL, false );
         } else {
-            emit bookmarked( datURL, true );
+            ViewMediator::getInstance()->bookmark( datURL, true );
         }
         break;
     case Menu_DeleteLog:

diff --git a/kita/src/favoritelistview.cpp b/kita/src/favoritelistview.cpp
index 30a6730..116be35 100644 (file)
--- a/kita/src/favoritelistview.cpp
+++ b/kita/src/favoritelistview.cpp
@@ -162,7 +162,7 @@ void FavoriteListView::slotContextMenuRequested( QListViewItem* item, const QPoi
         clipboard->setText( cliptxt , QClipboard::Selection );
         break;
     case Menu_RemoveFromFavorites:
-        emit bookmarked( datURL, false );
+        ViewMediator::getInstance()->bookmark( datURL, false );
         break;
     default:
         break;

diff --git a/kita/src/libkita/signalcollection.h b/kita/src/libkita/signalcollection.h
index 33388fe..121fc94 100644 (file)
--- a/kita/src/libkita/signalcollection.h
+++ b/kita/src/libkita/signalcollection.h
@@ -34,7 +34,6 @@ namespace Kita
         /*--------------------------------*/
 
         /* to : KitaMainWindow */
-        void bookmarked( const QString& datURL, bool on );
         void openURLRequest( const KURL& url, const KParts::URLArgs& args = KParts::URLArgs() );
         /**
          *

diff --git a/kita/src/mainwindow.cpp b/kita/src/mainwindow.cpp
index 2eaa110..230feb7 100644 (file)
--- a/kita/src/mainwindow.cpp
+++ b/kita/src/mainwindow.cpp
@@ -153,9 +153,6 @@ KitaMainWindow::KitaMainWindow()
     connect( signalCollection, SIGNAL( openURLRequestExt( const KURL&, const QString ) ),
              SLOT( slotOpenURLRequestExt( const KURL&, const QString ) ) );
 
-    connect( signalCollection, SIGNAL( bookmarked( const QString&, bool ) ),
-             SLOT( bookmark( const QString&, bool ) ) );
-
     connect( this, SIGNAL( favoritesUpdated() ),
              signalCollection, SIGNAL( favoritesUpdated() ) );
 

diff --git a/kita/src/mainwindow.h b/kita/src/mainwindow.h
index 138b83a..a958e36 100644 (file)
--- a/kita/src/mainwindow.h
+++ b/kita/src/mainwindow.h
@@ -57,9 +57,9 @@ public:
     void load( const KURL& url );
     void slotSetMainStatusbar( const QString& statusStr );
     void setUrl( const KURL& url );
+    void bookmark( const QString& datURL, bool on );
 
 private slots:
-    void bookmark( const QString& datURL, bool on );
     void closeSubjectView();
     void login();
     void newToolbarConfig();

diff --git a/kita/src/threadlistview.cpp b/kita/src/threadlistview.cpp
index 00600c8..c4c79f6 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( bookmarked( const QString&, bool ) ),
-             Kita::SignalCollection::getInstance(), SIGNAL( bookmarked( const QString&, bool ) ) );
     connect( this, SIGNAL( openURLRequestExt( const KURL&, const QString ) ),
              Kita::SignalCollection::getInstance(), SIGNAL( openURLRequestExt( const KURL&, const QString ) ) );
 }

diff --git a/kita/src/threadlistview.h b/kita/src/threadlistview.h
index 74f8af6..0f0e184 100644 (file)
--- a/kita/src/threadlistview.h
+++ b/kita/src/threadlistview.h
@@ -60,7 +60,6 @@ namespace Kita
 
     signals:
         void openURLRequestExt( const KURL& url, const QString mimetype = QString::null );
-        void bookmarked( const QString& datURL, bool on );
     };
 }
 

diff --git a/kita/src/threadview.cpp b/kita/src/threadview.cpp
index 25edfb3..cf19e6d 100644 (file)
--- a/kita/src/threadview.cpp
+++ b/kita/src/threadview.cpp
@@ -162,8 +162,6 @@ KitaThreadView::KitaThreadView( KitaThreadTabWidget* parent, const char* name )
              SLOT( slotCloseButton() ) );
 
     Kita::SignalCollection* signalCollection = Kita::SignalCollection::getInstance();
-    connect( this, SIGNAL( bookmarked( const QString&, bool ) ),
-             signalCollection, SIGNAL( bookmarked( const QString&, bool ) ) );
     connect( this, SIGNAL( updateSubjectTab( const KURL& ) ),
              signalCollection, SIGNAL( updateSubjectTab( const KURL& ) ) );
     connect( this, SIGNAL( updateThreadTab( const KURL& ) ),
@@ -287,7 +285,7 @@ void KitaThreadView::setFont( const QFont& font )
 
 void KitaThreadView::slotBookmarkButtonClicked( bool on )
 {
-    emit bookmarked( m_datURL.prettyURL(), on );
+    ViewMediator::getInstance()->bookmark( m_datURL.prettyURL(), on );
 }
 
 

diff --git a/kita/src/threadview.h b/kita/src/threadview.h
index a685f23..b8e93dc 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 bookmarked( const QString& datURL, bool on );
     void showThreadCompleted(); /* to KitaThreadPart */
     void openURLRequestExt( const KURL& url, const QString mimetype = QString::null );
 

diff --git a/kita/src/viewmediator.cpp b/kita/src/viewmediator.cpp
index 3371023..8793dae 100644 (file)
--- a/kita/src/viewmediator.cpp
+++ b/kita/src/viewmediator.cpp
@@ -75,3 +75,10 @@ void ViewMediator::setMainCaption( const QString& str )
 
     m_mainWindow->setCaption( str );
 }
+
+void ViewMediator::bookmark( const QString& datURL, bool on )
+{
+    Q_ASSERT( m_mainWindow );
+
+    m_mainWindow->bookmark( datURL, on );
+}

diff --git a/kita/src/viewmediator.h b/kita/src/viewmediator.h
index f04aedb..198b0e3 100644 (file)
--- a/kita/src/viewmediator.h
+++ b/kita/src/viewmediator.h
@@ -45,6 +45,7 @@ public:
     void setMainStatusBar( const QString& statusStr );
     void setMainURLLine( const KURL& url );
     void setMainCaption( const QString& str );
+    void bookmark( const QString& datURL, bool on );
 };
 
 #endif