summaryrefslogtreecommitdiffstats
path: root/kmail/kmmainwidget.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kmail/kmmainwidget.cpp')
-rw-r--r--kmail/kmmainwidget.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp
index 89c50fd32..fd41d4a89 100644
--- a/kmail/kmmainwidget.cpp
+++ b/kmail/kmmainwidget.cpp
@@ -351,13 +351,13 @@ void KMMainWidget::readConfig(void)
readPreConfig();
mHeaders->refreshNestedState();
- bool tqlayoutChanged = ( oldLongFolderList != mLongFolderList )
+ bool layoutChanged = ( oldLongFolderList != mLongFolderList )
|| ( oldReaderWindowActive != mReaderWindowActive )
|| ( oldReaderWindowBelow != mReaderWindowBelow )
|| ( oldFavoriteFolderView != mEnableFavoriteFolderView );
- if( tqlayoutChanged ) {
+ if( layoutChanged ) {
hide();
// delete all panners
delete mPanner1; // will always delete the others
@@ -389,11 +389,11 @@ void KMMainWidget::readConfig(void)
widths << folderW << headerW;
heights << headerH << readerH;
- bool tqlayoutChanged = ( oldLongFolderList != mLongFolderList )
+ bool layoutChanged = ( oldLongFolderList != mLongFolderList )
|| ( oldReaderWindowActive != mReaderWindowActive )
|| ( oldReaderWindowBelow != mReaderWindowBelow );
- if (!mStartupDone || tqlayoutChanged )
+ if (!mStartupDone || layoutChanged )
{
/** unread / total columns
* as we have some dependencies in this widget
@@ -482,11 +482,11 @@ void KMMainWidget::readConfig(void)
// Update systray
toggleSystemTray();
- bool tqlayoutChanged = ( oldLongFolderList != mLongFolderList )
+ bool layoutChanged = ( oldLongFolderList != mLongFolderList )
|| ( oldReaderWindowActive != mReaderWindowActive )
|| ( oldReaderWindowBelow != mReaderWindowBelow )
|| ( oldFavoriteFolderView != mEnableFavoriteFolderView );
- if ( tqlayoutChanged ) {
+ if ( layoutChanged ) {
activatePanners();
}
@@ -1314,7 +1314,7 @@ void KMMainWidget::slotInvalidateIMAPFolders() {
"This will remove all changes that you have done "
"locally to your IMAP folders."),
i18n("Refresh IMAP Cache"), i18n("&Refresh") ) == KMessageBox::Continue )
- kmkernel->acctMgr()->tqinvalidateIMAPFolders();
+ kmkernel->acctMgr()->invalidateIMAPFolders();
}
//-----------------------------------------------------------------------------
@@ -2659,7 +2659,7 @@ void KMMainWidget::setupActions()
(void) new KAction( i18n("&Refresh Local IMAP Cache"), "refresh",
TQT_TQOBJECT(this), TQT_SLOT(slotInvalidateIMAPFolders()),
- actionCollection(), "file_tqinvalidate_imap_cache" );
+ actionCollection(), "file_invalidate_imap_cache" );
(void) new KAction( i18n("Empty All &Trash Folders"), 0,
KMKernel::self(), TQT_SLOT(slotEmptyTrash()),
@@ -3339,8 +3339,8 @@ void KMMainWidget::updateMessageActions()
}
TQListViewItem *curItemParent = mHeaders->currentItem();
- bool tqparent_thread = 0;
- if ( curItemParent && curItemParent->firstChild() != 0 ) tqparent_thread = 1;
+ bool parent_thread = 0;
+ if ( curItemParent && curItemParent->firstChild() != 0 ) parent_thread = 1;
bool mass_actions = count >= 1;
bool thread_actions = mass_actions && allSelectedInCommonThread &&
@@ -3376,7 +3376,7 @@ void KMMainWidget::updateMessageActions()
mFindInMessageAction->setEnabled( mass_actions && !kmkernel->folderIsTemplates( mFolder ) );
mForwardInlineAction->setEnabled( mass_actions && !kmkernel->folderIsTemplates( mFolder ));
mForwardAttachedAction->setEnabled( mass_actions && !kmkernel->folderIsTemplates( mFolder ) );
- mForwardDigestAction->setEnabled( ( count > 1 || tqparent_thread ) && !kmkernel->folderIsTemplates( mFolder ) );
+ mForwardDigestAction->setEnabled( ( count > 1 || parent_thread ) && !kmkernel->folderIsTemplates( mFolder ) );
forwardMenu()->setEnabled( mass_actions && !kmkernel->folderIsTemplates( mFolder ));