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

Kita - 2ch client for KDE
Fork

kita: 提交

refactoring.

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

--- a/kita/src/libkita/signalcollection.h

+++ b/kita/src/libkita/signalcollection.h

		@@ -64,7 +64,6 @@ namespace Kita
64	64	void activateThreadView( const KURL& );
65	65
66	66	/* to : KitaThreadTabWidget */
67		- void updateThreadTab( const KURL& url );
68	67	void threadFaceChanged();
69	68
70	69	/* to : FavoriteListView */

--- a/kita/src/threadtabwidget.cpp

+++ b/kita/src/threadtabwidget.cpp

		@@ -53,7 +53,6 @@ KitaThreadTabWidget::KitaThreadTabWidget( QWidget* parent, const char* name, WFl
53	53
54	54	KitaThreadTabWidget::~KitaThreadTabWidget() {}
55	55
56		-
57	56	/* show "Main thread" view / / public slots */
58	57	void KitaThreadTabWidget::slotShowMainThread( const KURL& url )
59	58	{

		@@ -139,9 +138,6 @@ KitaThreadView* KitaThreadTabWidget::createView( QString label )
139	138	void KitaThreadTabWidget::connectSignals()
140	139	{
141	140	Kita::SignalCollection * signalCollection = Kita::SignalCollection::getInstance();
142		-
143		- connect( signalCollection, SIGNAL( updateThreadTab( const KURL& ) ),
144		- this, SLOT( slotUpdateThreadTab( const KURL& ) ) );
145	141	connect( signalCollection, SIGNAL( threadFaceChanged() ),
146	142	SLOT( slotFontChanged() ) );
147	143	}

--- a/kita/src/threadtabwidget.h

+++ b/kita/src/threadtabwidget.h

		@@ -29,6 +29,7 @@ public:
29	29	public slots:
30	30	void slotShowMainThread( const KURL& datURL );
31	31	void slotCloseThreadTab( const KURL& url );
	32	+ void slotUpdateThreadTab( const KURL& url );
32	33
33	34	private:
34	35	KitaThreadView* createView( QString label );

		@@ -37,7 +38,6 @@ private:
37	38	KitaThreadView* isThreadView( QWidget* w );
38	39
39	40	private slots:
40		- void slotUpdateThreadTab( const KURL& url );
41	41	void slotFontChanged();
42	42
43	43

--- a/kita/src/threadview.cpp

+++ b/kita/src/threadview.cpp

		@@ -162,8 +162,6 @@ KitaThreadView::KitaThreadView( KitaThreadTabWidget* parent, const char* name )
162	162	SLOT( slotCloseButton() ) );
163	163
164	164	Kita::SignalCollection* signalCollection = Kita::SignalCollection::getInstance();
165		- connect( this, SIGNAL( updateThreadTab( const KURL& ) ),
166		- signalCollection, SIGNAL( updateThreadTab( const KURL& ) ) );
167	165	connect( this, SIGNAL( openURLRequestExt( const KURL&, const QString ) ),
168	166	signalCollection, SIGNAL( openURLRequestExt( const KURL&, const QString ) ) );
169	167

		@@ -471,7 +469,7 @@ void KitaThreadView::slotUpdateInfo()
471	469	gotoCombo->adjustSize();
472	470
473	471	ViewMediator::getInstance()->updateBoardView( m_datURL );
474		- emit updateThreadTab( m_datURL );
	472	+ ViewMediator::getInstance()->updateThreadView( m_datURL );
475	473
476	474	showStatusBar( "" );
477	475

--- a/kita/src/threadview.h

+++ b/kita/src/threadview.h

		@@ -120,7 +120,6 @@ private slots:
120	120
121	121	signals:
122	122	void popupMenu( KXMLGUIClient*, const QPoint&, const KURL&, const QString&, mode_t );
123		- void updateThreadTab( const KURL& datURL );
124	123	void showThreadCompleted(); /* to KitaThreadPart */
125	124	void openURLRequestExt( const KURL& url, const QString mimetype = QString::null );
126	125

--- a/kita/src/viewmediator.cpp

+++ b/kita/src/viewmediator.cpp

		@@ -104,3 +104,10 @@ void ViewMediator::updateBoardView( const KURL& datURL )
104	104
105	105	m_boardTabWidget->updateBoardView( datURL );
106	106	}
	107	+
	108	+void ViewMediator::updateThreadView( const KURL& datURL )
	109	+{
	110	+ Q_ASSERT( m_threadTabWidget );
	111	+
	112	+ m_threadTabWidget->slotUpdateThreadTab( datURL );
	113	+}

--- a/kita/src/viewmediator.h

+++ b/kita/src/viewmediator.h

		@@ -53,6 +53,7 @@ public:
53	53	void bookmark( const QString& datURL, bool on );
54	54	bool isKitaActive();
55	55	void updateBoardView( const KURL& datURL );
	56	+ void updateThreadView( const KURL& datURL );
56	57	};
57	58
58	59	#endif