diff options
Diffstat (limited to 'kmail/kmmainwidget.cpp')
| -rw-r--r-- | kmail/kmmainwidget.cpp | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp index 1dc08d053..36556a1de 100644 --- a/kmail/kmmainwidget.cpp +++ b/kmail/kmmainwidget.cpp @@ -238,7 +238,7 @@ KMMainWidget::KMMainWidget(TQWidget *parent, const char *name, this, TQT_SLOT(slotFolderRemoved(KMFolder*))); connect( kmkernel, TQT_SIGNAL( onlineStatusChanged( GlobalSettings::EnumNetworkState::type ) ), - this, TQT_SLOT( slotUpdateOnlinetqStatus( GlobalSettings::EnumNetworkState::type ) ) ); + this, TQT_SLOT( slotUpdateOnlineStatus( GlobalSettings::EnumNetworkState::type ) ) ); toggleSystemTray(); @@ -246,7 +246,7 @@ KMMainWidget::KMMainWidget(TQWidget *parent, const char *name, mStartupDone = true; - KMainWindow *mainWin = dynamic_cast<KMainWindow*>(tqtopLevelWidget()); + KMainWindow *mainWin = dynamic_cast<KMainWindow*>(topLevelWidget()); KStatusBar *sb = mainWin ? mainWin->statusBar() : 0; mVacationScriptIndicator = new KStatusBarLabel( TQString(), 0, sb ); mVacationScriptIndicator->hide(); @@ -973,11 +973,11 @@ void KMMainWidget::slotMailChecked( bool newMail, bool sendOnCheck, if(kmkernel->xmlGuiInstance()) { KNotifyClient::Instance instance(kmkernel->xmlGuiInstance()); - KNotifyClient::event( tqtopLevelWidget()->winId(), "new-mail-arrived", + KNotifyClient::event( topLevelWidget()->winId(), "new-mail-arrived", summary ); } else - KNotifyClient::event( tqtopLevelWidget()->winId(), "new-mail-arrived", + KNotifyClient::event( topLevelWidget()->winId(), "new-mail-arrived", summary ); if (mBeepOnNew) { @@ -1713,12 +1713,12 @@ void KMMainWidget::slotApplyFilters() //----------------------------------------------------------------------------- void KMMainWidget::slotCheckVacation() { - updateVactionScriptqStatus( false ); + updateVactionScripStatus( false ); if ( !kmkernel->askToGoOnline() ) return; Vacation *vac = new Vacation( TQT_TQOBJECT(this), true /* check only */ ); - connect( vac, TQT_SIGNAL(scriptActive(bool)), TQT_SLOT(updateVactionScriptqStatus(bool)) ); + connect( vac, TQT_SIGNAL(scriptActive(bool)), TQT_SLOT(updateVactionScripStatus(bool)) ); } void KMMainWidget::slotEditVacation() @@ -1731,7 +1731,7 @@ void KMMainWidget::slotEditVacation() return; mVacation = new Vacation( TQT_TQOBJECT(this) ); - connect( mVacation, TQT_SIGNAL(scriptActive(bool)), TQT_SLOT(updateVactionScriptqStatus(bool)) ); + connect( mVacation, TQT_SIGNAL(scriptActive(bool)), TQT_SLOT(updateVactionScripStatus(bool)) ); if ( mVacation->isUsable() ) { connect( mVacation, TQT_SIGNAL(result(bool)), mVacation, TQT_SLOT(deleteLater()) ); } else { @@ -1903,10 +1903,10 @@ void KMMainWidget::slotSaveAttachments() saveCommand->start(); } -void KMMainWidget::slotOnlinetqStatus() +void KMMainWidget::slotOnlineStatus() { // KMKernel will emit a signal when we toggle the network state that is caught by - // KMMainWidget::slotUpdateOnlinetqStatus to update our GUI + // KMMainWidget::slotUpdateOnlineStatus to update our GUI if ( GlobalSettings::self()->networkState() == GlobalSettings::EnumNetworkState::Online ) { // if online; then toggle and set it offline. kmkernel->stopNetworkJobs(); @@ -1916,7 +1916,7 @@ void KMMainWidget::slotOnlinetqStatus() } } -void KMMainWidget::slotUpdateOnlinetqStatus( GlobalSettings::EnumNetworkState::type ) +void KMMainWidget::slotUpdateOnlineStatus( GlobalSettings::EnumNetworkState::type ) { if ( GlobalSettings::self()->networkState() == GlobalSettings::EnumNetworkState::Online ) actionCollection()->action( "online_status" )->setText( i18n("Work Offline") ); @@ -2239,37 +2239,37 @@ void KMMainWidget::slotReplaceMsgByUnencryptedVersion() //----------------------------------------------------------------------------- void KMMainWidget::slotSetThreadStatusNew() { - mHeaders->setThreadtqStatus(KMMsgStatusNew); + mHeaders->setThreadStatus(KMMsgStatusNew); } //----------------------------------------------------------------------------- void KMMainWidget::slotSetThreadStatusUnread() { - mHeaders->setThreadtqStatus(KMMsgStatusUnread); + mHeaders->setThreadStatus(KMMsgStatusUnread); } //----------------------------------------------------------------------------- void KMMainWidget::slotSetThreadStatusFlag() { - mHeaders->setThreadtqStatus(KMMsgStatusFlag, true); + mHeaders->setThreadStatus(KMMsgStatusFlag, true); } //----------------------------------------------------------------------------- void KMMainWidget::slotSetThreadStatusRead() { - mHeaders->setThreadtqStatus(KMMsgStatusRead); + mHeaders->setThreadStatus(KMMsgStatusRead); } //----------------------------------------------------------------------------- void KMMainWidget::slotSetThreadStatusTodo() { - mHeaders->setThreadtqStatus(KMMsgStatusTodo, true); + mHeaders->setThreadStatus(KMMsgStatusTodo, true); } //----------------------------------------------------------------------------- void KMMainWidget::slotSetThreadStatusWatched() { - mHeaders->setThreadtqStatus(KMMsgStatusWatched, true); + mHeaders->setThreadStatus(KMMsgStatusWatched, true); if (mWatchThreadAction->isChecked()) { mIgnoreThreadAction->setChecked(false); } @@ -2278,7 +2278,7 @@ void KMMainWidget::slotSetThreadStatusWatched() //----------------------------------------------------------------------------- void KMMainWidget::slotSetThreadStatusIgnored() { - mHeaders->setThreadtqStatus(KMMsgStatusIgnored, true); + mHeaders->setThreadStatus(KMMsgStatusIgnored, true); if (mIgnoreThreadAction->isChecked()) { mWatchThreadAction->setChecked(false); } @@ -2690,7 +2690,7 @@ void KMMainWidget::setupActions() TQT_SLOT(slotSendQueued()), actionCollection(), "send_queued"); (void) new KAction( i18n("Online Status (unknown)"), "online_status", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotOnlinetqStatus()), actionCollection(), "online_status"); + TQT_SLOT(slotOnlineStatus()), actionCollection(), "online_status"); KActionMenu *sendActionMenu = new KActionMenu( i18n("Send Queued Messages Via"), "mail_send_via", actionCollection(), @@ -3402,7 +3402,7 @@ void KMMainWidget::updateMessageActions() actionCollection()->action( "go_prev_unread_message" )->setEnabled( enable_goto_unread ); actionCollection()->action( "send_queued" )->setEnabled( kmkernel->outboxFolder()->count() > 0 ); actionCollection()->action( "send_queued_via" )->setEnabled( kmkernel->outboxFolder()->count() > 0 ); - slotUpdateOnlinetqStatus( static_cast<GlobalSettingsBase::EnumNetworkState::type>( GlobalSettings::self()->networkState() ) ); + slotUpdateOnlineStatus( static_cast<GlobalSettingsBase::EnumNetworkState::type>( GlobalSettings::self()->networkState() ) ); if (action( "edit_undo" )) action( "edit_undo" )->setEnabled( mHeaders->canUndo() ); @@ -3993,14 +3993,14 @@ void KMMainWidget::slotRequestFullSearchFromQuickSearch() assert( mSearchWin ); KMSearchPattern pattern; pattern.append( KMSearchRule::createInstance( "<message>", KMSearchRule::FuncContains, mQuickSearchLine->currentSearchTerm() ) ); - int status = mQuickSearchLine->currentqStatus(); + int status = mQuickSearchLine->currenStatus(); if ( status != 0 ) { - pattern.append( new KMSearchRuletqStatus( status ) ); + pattern.append( new KMSearchRuleStatus( status ) ); } mSearchWin->setSearchPattern( pattern ); } -void KMMainWidget::updateVactionScriptqStatus(bool active) +void KMMainWidget::updateVactionScripStatus(bool active) { mVacationIndicatorActive = active; if ( active ) { |