OSDN > 浏览软件 > Internet > WWW/HTTP > Browsers > Kita - 2ch client for KDE > SCM > git > kita > 提交

Kita - 2ch client for KDE
Fork

kita: 提交

use signal/slot

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

--- a/src/kita.cpp

+++ b/src/kita.cpp

		@@ -60,6 +60,8 @@ Kita::Kita()
60	60	this, SLOT(changeStatusbar(const QString&)));
61	61	connect(m_boardView, SIGNAL(signalLoadBoard(const KURL&, const QString&)),
62	62	m_subjectView, SLOT(slotLoadBoard(const KURL&, const QString&)));
	63	+ connect(m_subjectView, SIGNAL(signalShowThread(const KURL&, const KURL&, const QString&)),
	64	+ m_threadview, SLOT(slotShowThread(const KURL&, const KURL&, const QString&)));
63	65	// connect(m_view, SIGNAL(signalChangeCaption(const QString&)),
64	66	// this, SLOT(changeCaption(const QString&)));
65	67	m_boardView->loadBoardList();

		@@ -325,8 +327,3 @@ void Kita::setupView()
325	327	boardDock->manualDock(mainDock, KDockWidget::DockLeft, 20);
326	328	subjectDock->manualDock(mainDock, KDockWidget::DockTop);
327	329	}
328		-
329		-void Kita::showThread(KURL _datURL, KURL _boardURL, QString boardName)
330		-{
331		- m_threadview->showThread(_datURL, _boardURL, boardName);
332		-}

--- a/src/kita.h

+++ b/src/kita.h

		@@ -47,7 +47,6 @@ public:
47	47	* Use this method to load whatever file/URL you have
48	48	*/
49	49	void load(const KURL& url);
50		- void showThread(KURL _datURL, KURL _boardURL, QString boardName);
51	50
52	51	protected:
53	52	/**

--- a/src/kitasubjectview.cpp

+++ b/src/kitasubjectview.cpp

		@@ -52,7 +52,7 @@ void KitaSubjectView::loadThread(QListViewItem* item)
52	52	QString tmpFile;
53	53	KURL url = boardURL;
54	54	url.addPath("/dat/" + datName);
55		- mainWindow->showThread(url, boardURL, m_boardName);
	55	+ emit signalShowThread(url, boardURL, m_boardName);
56	56	}
57	57
58	58	void KitaSubjectView::slotLoadBoard(const KURL& url, const QString& boardName)

--- a/src/kitasubjectview.h

+++ b/src/kitasubjectview.h

		@@ -36,6 +36,8 @@ private: // Private attributes
36	36	Kita* mainWindow;
37	37	KURL boardURL;
38	38	QString m_boardName;
	39	+signals:
	40	+ void signalShowThread(const KURL& datURL, const KURL& boardURL, const QString& boardName);
39	41	};
40	42
41	43	#endif

--- a/src/kitathreadview.cpp

+++ b/src/kitathreadview.cpp

		@@ -51,7 +51,7 @@ KitaThreadView::KitaThreadView(QWidget parent, const char name)
51	51
52	52	KitaThreadView::~KitaThreadView() {}
53	53
54		-void KitaThreadView::showThread(KURL _datURL, KURL _boardURL, QString boardName)
	54	+void KitaThreadView::slotShowThread(const KURL& _datURL, const KURL& _boardURL, const QString& boardName)
55	55	{
56	56	KIO::SlaveConfig::self()->setConfigData("http", _datURL.host() ,
57	57	"UserAgent", "Monazilla/1.00 (test)");

--- a/src/kitathreadview.h

+++ b/src/kitathreadview.h

		@@ -35,7 +35,6 @@ class KitaThreadView : public KitaThreadViewBase
35	35	public:
36	36	KitaThreadView(QWidget parent, const char name=0);
37	37	~KitaThreadView();
38		- void showThread(KURL _datURL, KURL _boardURL, QString boardName);
39	38	private: // Private attributes
40	39	KHTMLPart* threadPart;
41	40	QCString m_threadData;

		@@ -56,6 +55,7 @@ public slots:
56	55	void slotCanceled(KIO::Job* job);
57	56	void slotOnURL(const QString& url);
58	57	void slotOpenURLRequest(const KURL& url);
	58	+ void slotShowThread(const KURL& _datURL, const KURL& _boardURL, const QString& boardName);
59	59	signals:
60	60	void signalChangeStatusbar(const QString&);
61	61	};