use signal-slot

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

diff --git a/src/kita.cpp b/src/kita.cpp
index e00e439..9937cc8 100644 (file)
--- a/src/kita.cpp
+++ b/src/kita.cpp
@@ -58,6 +58,8 @@ Kita::Kita()
     // allow the view to change the statusbar and caption
     connect(m_threadview, SIGNAL(signalChangeStatusbar(const QString&)),
             this,   SLOT(changeStatusbar(const QString&)));
+    connect(m_boardView, SIGNAL(signalLoadBoard(const KURL&, const QString&)),
+    m_subjectView, SLOT(slotLoadBoard(const KURL&, const QString&)));
 //    connect(m_view, SIGNAL(signalChangeCaption(const QString&)),
 //            this,   SLOT(changeCaption(const QString&)));
   m_boardView->loadBoardList();
@@ -328,8 +330,3 @@ void Kita::showThread(KURL _datURL, KURL _boardURL, QString boardName)
 {
   m_threadview->showThread(_datURL, _boardURL, boardName);
 }
-
-void Kita::loadBoard(KURL url, QString boardName)
-{
-  m_subjectView->loadBoard(url, boardName);
-}

diff --git a/src/kita.h b/src/kita.h
index 42ae73c..ea87d73 100644 (file)
--- a/src/kita.h
+++ b/src/kita.h
@@ -100,8 +100,6 @@ private:
     KPrinter   *m_printer;
     KToggleAction *m_toolbarAction;
     KToggleAction *m_statusbarAction;
-public slots:
-  void loadBoard(KURL url, QString boardName);
 };
 
 #endif // _KITA_H_

diff --git a/src/kitaboardview.cpp b/src/kitaboardview.cpp
index 32c017c..e3d281f 100644 (file)
--- a/src/kitaboardview.cpp
+++ b/src/kitaboardview.cpp
@@ -88,5 +88,5 @@ void KitaBoardView::loadBoard(QListViewItem* item)
   QString boardName = item->text(0);
   KURL url = item->text(1);
   
-  mainWindow->loadBoard(url, boardName);
+  emit signalLoadBoard(url, boardName);
 }

diff --git a/src/kitaboardview.h b/src/kitaboardview.h
index 8e6bb88..8480138 100644 (file)
--- a/src/kitaboardview.h
+++ b/src/kitaboardview.h
@@ -16,6 +16,7 @@
 #include "kitaboardviewbase.h"
 
 class Kita;
+class KURL;
 
 /**
  * 
@@ -33,6 +34,8 @@ public slots:
   void loadBoard(QListViewItem* item);
 private: // Private attributes
   Kita* mainWindow;
+signals:
+  void signalLoadBoard(const KURL& url, const QString& boardName);
 };
 
 #endif

diff --git a/src/kitasubjectview.cpp b/src/kitasubjectview.cpp
index 4297581..2ec71bf 100644 (file)
--- a/src/kitasubjectview.cpp
+++ b/src/kitasubjectview.cpp
@@ -55,7 +55,7 @@ void KitaSubjectView::loadThread(QListViewItem* item)
   mainWindow->showThread(url, boardURL, m_boardName);
 }
 
-void KitaSubjectView::loadBoard(KURL url, QString boardName)
+void KitaSubjectView::slotLoadBoard(const KURL& url, const QString& boardName)
 {
   boardURL = url;
   m_boardName = boardName;
@@ -63,8 +63,8 @@ void KitaSubjectView::loadBoard(KURL url, QString boardName)
   KIO::SlaveConfig::self()->setConfigData("http", url.host() , "UserAgent", "Monazilla/1.00 (test)");
   
   QString tmpFile;
-  url.addPath("subject.txt");
-  if(KIO::NetAccess::download(url, tmpFile)) {
+  KURL subjectURL = KURL(url, "subject.txt");
+  if(KIO::NetAccess::download(subjectURL, tmpFile)) {
     QIODevice* tmpDevice = KFilterDev::deviceForFile(tmpFile, "application/x-gzip");
     tmpDevice->open(IO_ReadOnly);
     

diff --git a/src/kitasubjectview.h b/src/kitasubjectview.h
index 3503e85..2b9fea4 100644 (file)
--- a/src/kitasubjectview.h
+++ b/src/kitasubjectview.h
@@ -28,10 +28,10 @@ class KitaSubjectView : public KitaSubjectViewBase
 public:
   KitaSubjectView(QWidget *parent, Kita* _mainWindow, const char *name=0);
   ~KitaSubjectView();
-  void loadBoard(KURL url, QString boardName);
 public slots:
   void reloadSubject();
   void loadThread(QListViewItem* item);
+  void slotLoadBoard(const KURL& url, const QString& boardName);
 private: // Private attributes
   Kita* mainWindow;
   KURL boardURL;