diff options
Diffstat (limited to 'kmail/kmmainwin.cpp')
| -rw-r--r-- | kmail/kmmainwin.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/kmail/kmmainwin.cpp b/kmail/kmmainwin.cpp index ce0c64607..7d69e2ee2 100644 --- a/kmail/kmmainwin.cpp +++ b/kmail/kmmainwin.cpp @@ -25,7 +25,7 @@ #include "kmmainwin.moc" -KMMainWin::KMMainWin(QWidget *) +KMMainWin::KMMainWin(TQWidget *) : KMainWindow( 0, "kmail-mainwindow#" ), mReallyClose( false ) { @@ -36,7 +36,7 @@ KMMainWin::KMMainWin(QWidget *) kapp->ref(); (void) new KAction( i18n("New &Window"), "window_new", 0, - this, SLOT(slotNewMailReader()), + this, TQT_SLOT(slotNewMailReader()), actionCollection(), "new_mail_client" ); mKMMainWidget = new KMMainWidget( this, "KMMainWidget", this, actionCollection() ); @@ -47,17 +47,17 @@ KMMainWin::KMMainWin(QWidget *) setInstance( kmkernel->xmlGuiInstance() ); if ( kmkernel->firstInstance() ) - QTimer::singleShot( 200, this, SLOT(slotShowTipOnStart()) ); + TQTimer::singleShot( 200, this, TQT_SLOT(slotShowTipOnStart()) ); setStandardToolBarMenuEnabled(true); - KStdAction::configureToolbars(this, SLOT(slotEditToolbars()), + KStdAction::configureToolbars(this, TQT_SLOT(slotEditToolbars()), actionCollection()); - KStdAction::keyBindings(mKMMainWidget, SLOT(slotEditKeys()), + KStdAction::keyBindings(mKMMainWidget, TQT_SLOT(slotEditKeys()), actionCollection()); - KStdAction::quit( this, SLOT(slotQuit()), actionCollection()); + KStdAction::quit( this, TQT_SLOT(slotQuit()), actionCollection()); createGUI( "kmmainwin.rc", false ); // Don't use conserveMemory() because this renders dynamic plugging // of actions unusable! @@ -66,14 +66,14 @@ KMMainWin::KMMainWin(QWidget *) applyMainWindowSettings(KMKernel::config(), "Main Window"); - connect( KPIM::BroadcastStatus::instance(), SIGNAL( statusMsg( const QString& ) ), - this, SLOT( displayStatusMsg(const QString&) ) ); + connect( KPIM::BroadcastStatus::instance(), TQT_SIGNAL( statusMsg( const TQString& ) ), + this, TQT_SLOT( displayStatusMsg(const TQString&) ) ); - connect(kmkernel, SIGNAL(configChanged()), - this, SLOT(slotConfigChanged())); + connect(kmkernel, TQT_SIGNAL(configChanged()), + this, TQT_SLOT(slotConfigChanged())); - connect(mKMMainWidget, SIGNAL(captionChangeRequest(const QString&)), - SLOT(setCaption(const QString&)) ); + connect(mKMMainWidget, TQT_SIGNAL(captionChangeRequest(const TQString&)), + TQT_SLOT(setCaption(const TQString&)) ); // Enable mail checks again (see destructor) kmkernel->enableMailCheck(); @@ -91,7 +91,7 @@ KMMainWin::~KMMainWin() if ( !kmkernel->haveSystemTrayApplet() ) { // Check if this was the last KMMainWin int not_withdrawn = 0; - QPtrListIterator<KMainWindow> it(*KMainWindow::memberList); + TQPtrListIterator<KMainWindow> it(*KMainWindow::memberList); for (it.toFirst(); it.current(); ++it){ if ( !it.current()->isHidden() && it.current()->isTopLevel() && @@ -111,12 +111,12 @@ KMMainWin::~KMMainWin() } } -void KMMainWin::displayStatusMsg(const QString& aText) +void KMMainWin::displayStatusMsg(const TQString& aText) { if ( !statusBar() || !mLittleProgress) return; int statusWidth = statusBar()->width() - mLittleProgress->width() - fontMetrics().maxWidth(); - QString text = KStringHandler::rPixelSqueeze( " " + aText, fontMetrics(), + TQString text = KStringHandler::rPixelSqueeze( " " + aText, fontMetrics(), statusWidth ); // ### FIXME: We should disable richtext/HTML (to avoid possible denial of service attacks), @@ -145,8 +145,8 @@ void KMMainWin::slotEditToolbars() saveMainWindowSettings(KMKernel::config(), "Main Window"); KEditToolbar dlg(actionCollection(), "kmmainwin.rc"); - connect( &dlg, SIGNAL(newToolbarConfig()), - SLOT(slotUpdateToolbars()) ); + connect( &dlg, TQT_SIGNAL(newToolbarConfig()), + TQT_SLOT(slotUpdateToolbars()) ); dlg.exec(); } |