OSDN -- 开发和下载开源软件
简体中文翻译状态 translation status for zh
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

kita: 提交


Commit MetaInfo

修订版6d7bc9a7d0fec0a38e933b073182015a529856bb (tree)
时间2007-07-12 22:34:21
作者ikemo <ikemo@56b1...>
Commiterikemo

Log Message

refactoring.

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

更改概述

差异

--- a/kita/src/kitaui/tabwidgetbase.cpp
+++ b/kita/src/kitaui/tabwidgetbase.cpp
@@ -180,9 +180,6 @@ void KitaTabWidgetBase::connectSignals()
180180 connect( this, SIGNAL( currentChanged ( QWidget * ) ),
181181 SLOT( slotCurrentChanged ( QWidget * ) ) );
182182
183- connect( this, SIGNAL( setMainCaption( const QString& ) ),
184- signalCollection, SIGNAL( setMainCaption( const QString& ) ) );
185-
186183 connect( this, SIGNAL( openURLRequestExt( const KURL&, const QString ) ),
187184 signalCollection, SIGNAL( openURLRequestExt( const KURL&, const QString ) ) );
188185 }
--- a/kita/src/kitaui/tabwidgetbase.h
+++ b/kita/src/kitaui/tabwidgetbase.h
@@ -90,7 +90,6 @@ public slots:
9090 void slotCloseAllTab();
9191
9292 signals:
93- void setMainCaption( const QString& captionStr );
9493 void openURLRequestExt( const KURL& url, const QString mimetype = QString::null );
9594 };
9695
--- a/kita/src/libkita/signalcollection.h
+++ b/kita/src/libkita/signalcollection.h
@@ -50,7 +50,6 @@ namespace Kita
5050 *
5151 */
5252 void openURLRequestExt( const KURL& url, const QString mimetype = QString::null );
53- void setMainCaption( const QString& captionStr );
5453
5554 /*--------------------------------*/
5655
--- a/kita/src/mainwindow.cpp
+++ b/kita/src/mainwindow.cpp
@@ -153,9 +153,6 @@ KitaMainWindow::KitaMainWindow()
153153 connect( signalCollection, SIGNAL( openURLRequestExt( const KURL&, const QString ) ),
154154 SLOT( slotOpenURLRequestExt( const KURL&, const QString ) ) );
155155
156- connect( signalCollection, SIGNAL( setMainCaption( const QString& ) ),
157- SLOT( slotSetMainCaption( const QString& ) ) );
158-
159156 connect( signalCollection, SIGNAL( bookmarked( const QString&, bool ) ),
160157 SLOT( bookmark( const QString&, bool ) ) );
161158
@@ -424,11 +421,6 @@ void KitaMainWindow::slotOpenURLRequestExt( const KURL& url, const QString mimet
424421 }
425422 }
426423
427-void KitaMainWindow::slotSetMainCaption( const QString& captionStr )
428-{
429- setCaption( captionStr );
430-}
431-
432424 void KitaMainWindow::slotSetMainStatusbar( const QString& statusStr )
433425 {
434426 // display the text on the statusbar
--- a/kita/src/mainwindow.h
+++ b/kita/src/mainwindow.h
@@ -78,7 +78,6 @@ private slots:
7878 void slotEditCopy();
7979 void slotOpenURLRequest( const KURL& url, const KParts::URLArgs& );
8080 void slotOpenURLRequestExt( const KURL& url, const QString mimetype = QString::null );
81- void slotSetMainCaption( const QString& captionStr );
8281 void slotURLLine();
8382
8483 private:
--- a/kita/src/threadtabwidget.cpp
+++ b/kita/src/threadtabwidget.cpp
@@ -211,7 +211,7 @@ void KitaThreadTabWidget::deleteWidget( QWidget* w )
211211 KitaTabWidgetBase::deleteWidget( w );
212212
213213 if ( count() == 0 ) {
214- emit setMainCaption( QString::null );
214+ ViewMediator::getInstance()->setMainCaption( QString::null );
215215 ViewMediator::getInstance()->setMainStatusBar( QString::null );
216216 ViewMediator::getInstance()->setMainURLLine( QString::null );
217217
--- a/kita/src/threadview.cpp
+++ b/kita/src/threadview.cpp
@@ -170,8 +170,6 @@ KitaThreadView::KitaThreadView( KitaThreadTabWidget* parent, const char* name )
170170 signalCollection, SIGNAL( updateThreadTab( const KURL& ) ) );
171171 connect( this, SIGNAL( openURLRequestExt( const KURL&, const QString ) ),
172172 signalCollection, SIGNAL( openURLRequestExt( const KURL&, const QString ) ) );
173- connect( this, SIGNAL( setMainCaption( const QString& ) ),
174- signalCollection, SIGNAL( setMainCaption( const QString& ) ) );
175173
176174 connect( this, SIGNAL( activateThreadView( const KURL& ) ),
177175 signalCollection, SIGNAL( activateThreadView( const KURL& ) ) );
@@ -436,7 +434,7 @@ void KitaThreadView::showStatusBar( QString info )
436434
437435 captionStr = Kita::DatManager::threadName( m_datURL ) + QString( " (%1)" ).arg( viewPos );
438436
439- emit setMainCaption( captionStr );
437+ ViewMediator::getInstance()->setMainCaption( captionStr );
440438 ViewMediator::getInstance()->setMainStatusBar( infostr );
441439 ViewMediator::getInstance()->setMainURLLine( Kita::getThreadURL( m_datURL ) );
442440
--- a/kita/src/threadview.h
+++ b/kita/src/threadview.h
@@ -122,7 +122,6 @@ signals:
122122 void popupMenu( KXMLGUIClient*, const QPoint&, const KURL&, const QString&, mode_t );
123123 void updateSubjectTab( const KURL& datURL );
124124 void updateThreadTab( const KURL& datURL );
125- void setMainCaption( const QString& captionStr );
126125 void bookmarked( const QString& datURL, bool on );
127126 void showThreadCompleted(); /* to KitaThreadPart */
128127 void openURLRequestExt( const KURL& url, const QString mimetype = QString::null );
--- a/kita/src/viewmediator.cpp
+++ b/kita/src/viewmediator.cpp
@@ -68,3 +68,10 @@ void ViewMediator::setMainURLLine( const KURL& url )
6868
6969 m_mainWindow->setUrl( url );
7070 }
71+
72+void ViewMediator::setMainCaption( const QString& str )
73+{
74+ Q_ASSERT( m_mainWindow );
75+
76+ m_mainWindow->setCaption( str );
77+}
--- a/kita/src/viewmediator.h
+++ b/kita/src/viewmediator.h
@@ -44,6 +44,7 @@ public:
4444 void openThread( const KURL& url );
4545 void setMainStatusBar( const QString& statusStr );
4646 void setMainURLLine( const KURL& url );
47+ void setMainCaption( const QString& str );
4748 };
4849
4950 #endif
Show on old repository browser