use signal/slot

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

diff --git a/src/kita.cpp b/src/kita.cpp
index 9937cc8..f8f9947 100644 (file)
--- a/src/kita.cpp
+++ b/src/kita.cpp
@@ -60,6 +60,8 @@ Kita::Kita()
             this,   SLOT(changeStatusbar(const QString&)));
     connect(m_boardView, SIGNAL(signalLoadBoard(const KURL&, const QString&)),
     m_subjectView, SLOT(slotLoadBoard(const KURL&, const QString&)));
+    connect(m_subjectView, SIGNAL(signalShowThread(const KURL&, const KURL&, const QString&)),
+    m_threadview, SLOT(slotShowThread(const KURL&, const KURL&, const QString&)));
 //    connect(m_view, SIGNAL(signalChangeCaption(const QString&)),
 //            this,   SLOT(changeCaption(const QString&)));
   m_boardView->loadBoardList();
@@ -325,8 +327,3 @@ void Kita::setupView()
     boardDock->manualDock(mainDock, KDockWidget::DockLeft, 20);
     subjectDock->manualDock(mainDock, KDockWidget::DockTop);
 }
-
-void Kita::showThread(KURL _datURL, KURL _boardURL, QString boardName)
-{
-  m_threadview->showThread(_datURL, _boardURL, boardName);
-}

diff --git a/src/kita.h b/src/kita.h
index ea87d73..a0ea614 100644 (file)
--- a/src/kita.h
+++ b/src/kita.h
@@ -47,7 +47,6 @@ public:
      * Use this method to load whatever file/URL you have
      */
     void load(const KURL& url);
-  void showThread(KURL _datURL, KURL _boardURL, QString boardName);
 
 protected:
     /**

diff --git a/src/kitasubjectview.cpp b/src/kitasubjectview.cpp
index 2ec71bf..6433795 100644 (file)
--- a/src/kitasubjectview.cpp
+++ b/src/kitasubjectview.cpp
@@ -52,7 +52,7 @@ void KitaSubjectView::loadThread(QListViewItem* item)
   QString tmpFile;
   KURL url = boardURL;
   url.addPath("/dat/" + datName);
-  mainWindow->showThread(url, boardURL, m_boardName);
+  emit signalShowThread(url, boardURL, m_boardName);
 }
 
 void KitaSubjectView::slotLoadBoard(const KURL& url, const QString& boardName)

diff --git a/src/kitasubjectview.h b/src/kitasubjectview.h
index 2b9fea4..aa3ffc8 100644 (file)
--- a/src/kitasubjectview.h
+++ b/src/kitasubjectview.h
@@ -36,6 +36,8 @@ private: // Private attributes
   Kita* mainWindow;
   KURL boardURL;
   QString m_boardName;
+signals:
+  void signalShowThread(const KURL& datURL, const KURL& boardURL, const QString& boardName);
 };
 
 #endif

diff --git a/src/kitathreadview.cpp b/src/kitathreadview.cpp
index 17f9ac0..994c3eb 100644 (file)
--- a/src/kitathreadview.cpp
+++ b/src/kitathreadview.cpp
@@ -51,7 +51,7 @@ KitaThreadView::KitaThreadView(QWidget *parent, const char *name)
 
 KitaThreadView::~KitaThreadView() {}
 
-void KitaThreadView::showThread(KURL _datURL, KURL _boardURL, QString boardName)
+void KitaThreadView::slotShowThread(const KURL& _datURL, const KURL& _boardURL, const QString& boardName)
 {
   KIO::SlaveConfig::self()->setConfigData("http", _datURL.host() ,
                                           "UserAgent", "Monazilla/1.00 (test)");

diff --git a/src/kitathreadview.h b/src/kitathreadview.h
index 6b6dcdb..fd49f31 100644 (file)
--- a/src/kitathreadview.h
+++ b/src/kitathreadview.h
@@ -35,7 +35,6 @@ class KitaThreadView : public KitaThreadViewBase
 public:
   KitaThreadView(QWidget *parent, const char *name=0);
   ~KitaThreadView();
-  void showThread(KURL _datURL, KURL _boardURL, QString boardName);
 private: // Private attributes
   KHTMLPart* threadPart;
   QCString m_threadData;
@@ -56,6 +55,7 @@ public slots:
   void slotCanceled(KIO::Job* job);
   void slotOnURL(const QString& url);
   void slotOpenURLRequest(const KURL& url);
+  void slotShowThread(const KURL& _datURL, const KURL& _boardURL, const QString& boardName);
 signals:
   void signalChangeStatusbar(const QString&);
 };