refactoring...

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

diff --git a/kita/src/kita.cpp b/kita/src/kita.cpp
index f7e72e5..a79a409 100644 (file)
--- a/kita/src/kita.cpp
+++ b/kita/src/kita.cpp
@@ -86,7 +86,8 @@ KitaMainWindow::KitaMainWindow()
   connect(m_threadView, SIGNAL(writeSucceeded()), SLOT(slotWriteSucceeded()));
   connect(m_threadView, SIGNAL(showThreadCompleted(const KURL&)), SLOT(setUrl(const KURL&)));
   connect(m_subjectView, SIGNAL(loadBoardCompleted(const KURL&)), SLOT(setUrl(const KURL&)));
-  connect( m_threadView, SIGNAL( bookmark( const Kita::Thread& ) ), SLOT( addBookmark( const Kita::Thread& ) ) );
+  connect( m_threadView, SIGNAL( bookmarked( const Kita::Thread&, bool) ),
+                         SLOT( bookmark( const Kita::Thread&, bool ) ) );
   m_boardView->loadBoardList();
 }
 
@@ -425,7 +426,7 @@ void KitaMainWindow::setUrl(const KURL& url)
   m_urlLine->setText(url.url());
 }
 
-void KitaMainWindow::addBookmark( const Kita::Thread& thread )
+void KitaMainWindow::bookmark( const Kita::Thread& thread, bool on )
 {
   FavoriteThreads* favorite = FavoriteThreads::getInstance();
   favorite->insert( thread );

diff --git a/kita/src/kita.h b/kita/src/kita.h
index e03e935..788df18 100644 (file)
--- a/kita/src/kita.h
+++ b/kita/src/kita.h
@@ -107,7 +107,7 @@ private slots:
     void slotWriteSucceeded();
     void slotUrlLine();
     void setUrl(const KURL& url);
-    void addBookmark( const Kita::Thread& thread);
+    void bookmark( const Kita::Thread& thread, bool on );
 
 private:
     KitaThreadView *m_threadView;

diff --git a/kita/src/part/kitathreadview.cpp b/kita/src/part/kitathreadview.cpp
index 789b849..46d7ebe 100644 (file)
--- a/kita/src/part/kitathreadview.cpp
+++ b/kita/src/part/kitathreadview.cpp
@@ -87,7 +87,7 @@ KitaThreadView::KitaThreadView(QWidget *parent, const char *name)
   connect( m_threadPart, SIGNAL( onURL(const QString&) ), SLOT( slotOnURL(const QString&) ) );
   connect( m_threadPart, SIGNAL( setLocationBarURL(const QString &) ),
                         SIGNAL( setLocationBarURL(const QString &) ) );
-  connect( BookmarkButton, SIGNAL( clicked() ), SLOT( slotAddBookmarkButtonClicked() ) );
+  connect( BookmarkButton, SIGNAL( toggled(bool) ), SLOT( slotBookmarkButtonClicked(bool) ) );
   connect( SearchButton, SIGNAL( clicked() ), SLOT( slotSearchButton() ) );
   connect( SearchCombo, SIGNAL( activated(int) ), SLOT( slotSearchButton() ) );
   connect( HighLightButton, SIGNAL( toggled(bool) ), SLOT( slotHighLightenButton(bool) ) );
@@ -496,8 +496,8 @@ void KitaThreadView::slotPostStarted( KIO::Job*, const Kita::PostInfo& info)
   m_postInfo = info;
 }
 
-void KitaThreadView::slotAddBookmarkButtonClicked()
+void KitaThreadView::slotBookmarkButtonClicked( bool on )
 {
-  emit bookmark( m_thread );
+  emit bookmarked( m_thread, on );
 }
 // vim:sw=2:

diff --git a/kita/src/part/kitathreadview.h b/kita/src/part/kitathreadview.h
index 1d21117..4436d4e 100644 (file)
--- a/kita/src/part/kitathreadview.h
+++ b/kita/src/part/kitathreadview.h
@@ -92,7 +92,7 @@ private slots:
   void slotOnURL(const QString& url);
   void slotReloadButton();
   void slotPostStarted( KIO::Job*, const Kita::PostInfo&);
-  void slotAddBookmarkButtonClicked();
+  void slotBookmarkButtonClicked( bool on );
 
 signals:
   void showThreadCompleted(const KURL& threadUrl);
@@ -107,7 +107,7 @@ signals:
   void popupMenu(KXMLGUIClient *, const QPoint&, const KURL&, const QString&, mode_t);
   void thread( const Kita::Thread& );
   void writeSucceeded();
-  void bookmark( const Kita::Thread& );
+  void bookmarked( const Kita::Thread&, bool on );
 
   friend class KitaThreadPart;
 };