diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:53:50 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:53:50 +0000 |
commit | 7be55ffa061c026e35e2d6a0effe1161ddb0d41f (patch) | |
tree | 8474f9b444b2756228600050f07a7ff25de532b2 /kmail/kmmainwidget.cpp | |
parent | f587f20a6d09f1729dd0a8c1cd8ee0110aec7451 (diff) | |
download | tdepim-7be55ffa061c026e35e2d6a0effe1161ddb0d41f.tar.gz tdepim-7be55ffa061c026e35e2d6a0effe1161ddb0d41f.zip |
Trinity Qt initial conversion
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1157655 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kmail/kmmainwidget.cpp')
-rw-r--r-- | kmail/kmmainwidget.cpp | 820 |
1 files changed, 410 insertions, 410 deletions
diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp index 2876e3b03..0b847ba64 100644 --- a/kmail/kmmainwidget.cpp +++ b/kmail/kmmainwidget.cpp @@ -13,13 +13,13 @@ #endif #undef Unsorted // X headers... -#include <qaccel.h> -#include <qlayout.h> -#include <qhbox.h> -#include <qvbox.h> -#include <qpopupmenu.h> -#include <qpushbutton.h> -#include <qptrlist.h> +#include <tqaccel.h> +#include <tqlayout.h> +#include <tqhbox.h> +#include <tqvbox.h> +#include <tqpopupmenu.h> +#include <tqpushbutton.h> +#include <tqptrlist.h> #include <kopenwith.h> @@ -45,7 +45,7 @@ #include <kaccel.h> #include <kstringhandler.h> -#include <qvaluevector.h> +#include <tqvaluevector.h> #include "globalsettings.h" #include "kcursorsaver.h" @@ -81,7 +81,7 @@ using KMail::ImapAccountBase; using KMail::Vacation; #include "favoritefolderview.h" -#include <qsignalmapper.h> +#include <tqsignalmapper.h> #include "subscriptiondialog.h" using KMail::SubscriptionDialog; @@ -129,21 +129,21 @@ using KMime::Types::AddrSpecList; using KPIM::ProgressManager; #include "managesievescriptsdialog.h" -#include <qstylesheet.h> +#include <tqstylesheet.h> #include "customtemplates.h" #include "customtemplates_kfg.h" #include "kmmainwidget.moc" -QValueList<KMMainWidget*>* KMMainWidget::s_mainWidgetList = 0; -static KStaticDeleter<QValueList<KMMainWidget*> > mwlsd; +TQValueList<KMMainWidget*>* KMMainWidget::s_mainWidgetList = 0; +static KStaticDeleter<TQValueList<KMMainWidget*> > mwlsd; //----------------------------------------------------------------------------- -KMMainWidget::KMMainWidget(QWidget *parent, const char *name, +KMMainWidget::KMMainWidget(TQWidget *parent, const char *name, KXMLGUIClient *aGUIClient, KActionCollection *actionCollection, KConfig* config ) : - QWidget(parent, name), + TQWidget(parent, name), mFavoritesCheckMailAction( 0 ), mFavoriteFolderView( 0 ), mFolderView( 0 ), @@ -170,7 +170,7 @@ KMMainWidget::KMMainWidget(QWidget *parent, const char *name, mSystemTray = 0; mDestructed = false; mActionCollection = actionCollection; - mTopLayout = new QVBoxLayout(this); + mTopLayout = new TQVBoxLayout(this); mFilterMenuActions.setAutoDelete(true); mFilterTBarActions.setAutoDelete(false); mFilterCommands.setAutoDelete(true); @@ -191,7 +191,7 @@ KMMainWidget::KMMainWidget(QWidget *parent, const char *name, mToolbarActionSeparator = new KActionSeparator( actionCollection ); if( !s_mainWidgetList ) - mwlsd.setObject( s_mainWidgetList, new QValueList<KMMainWidget*>() ); + mwlsd.setObject( s_mainWidgetList, new TQValueList<KMMainWidget*>() ); s_mainWidgetList->append( this ); mPanner1Sep << 1 << 1; @@ -208,39 +208,39 @@ KMMainWidget::KMMainWidget(QWidget *parent, const char *name, activatePanners(); - QTimer::singleShot( 0, this, SLOT( slotShowStartupFolder() )); + TQTimer::singleShot( 0, this, TQT_SLOT( slotShowStartupFolder() )); - connect( kmkernel->acctMgr(), SIGNAL( checkedMail( bool, bool, const QMap<QString, int> & ) ), - this, SLOT( slotMailChecked( bool, bool, const QMap<QString, int> & ) ) ); + connect( kmkernel->acctMgr(), TQT_SIGNAL( checkedMail( bool, bool, const TQMap<TQString, int> & ) ), + this, TQT_SLOT( slotMailChecked( bool, bool, const TQMap<TQString, int> & ) ) ); - connect( kmkernel->acctMgr(), SIGNAL( accountAdded( KMAccount* ) ), - this, SLOT( initializeIMAPActions() ) ); - connect( kmkernel->acctMgr(), SIGNAL( accountRemoved( KMAccount* ) ), - this, SLOT( initializeIMAPActions() ) ); + connect( kmkernel->acctMgr(), TQT_SIGNAL( accountAdded( KMAccount* ) ), + this, TQT_SLOT( initializeIMAPActions() ) ); + connect( kmkernel->acctMgr(), TQT_SIGNAL( accountRemoved( KMAccount* ) ), + this, TQT_SLOT( initializeIMAPActions() ) ); - connect(kmkernel, SIGNAL( configChanged() ), - this, SLOT( slotConfigChanged() )); + connect(kmkernel, TQT_SIGNAL( configChanged() ), + this, TQT_SLOT( slotConfigChanged() )); // display the full path to the folder in the caption - connect(mFolderTree, SIGNAL(currentChanged(QListViewItem*)), - this, SLOT(slotChangeCaption(QListViewItem*))); - connect(mFolderTree, SIGNAL(selectionChanged()), - SLOT(updateFolderMenu()) ); + connect(mFolderTree, TQT_SIGNAL(currentChanged(TQListViewItem*)), + this, TQT_SLOT(slotChangeCaption(TQListViewItem*))); + connect(mFolderTree, TQT_SIGNAL(selectionChanged()), + TQT_SLOT(updateFolderMenu()) ); - connect(kmkernel->folderMgr(), SIGNAL(folderRemoved(KMFolder*)), - this, SLOT(slotFolderRemoved(KMFolder*))); + connect(kmkernel->folderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)), + this, TQT_SLOT(slotFolderRemoved(KMFolder*))); - connect(kmkernel->imapFolderMgr(), SIGNAL(folderRemoved(KMFolder*)), - this, SLOT(slotFolderRemoved(KMFolder*))); + connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)), + this, TQT_SLOT(slotFolderRemoved(KMFolder*))); - connect(kmkernel->dimapFolderMgr(), SIGNAL(folderRemoved(KMFolder*)), - this, SLOT(slotFolderRemoved(KMFolder*))); + connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)), + this, TQT_SLOT(slotFolderRemoved(KMFolder*))); - connect(kmkernel->searchFolderMgr(), SIGNAL(folderRemoved(KMFolder*)), - this, SLOT(slotFolderRemoved(KMFolder*))); + connect(kmkernel->searchFolderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)), + this, TQT_SLOT(slotFolderRemoved(KMFolder*))); - connect( kmkernel, SIGNAL( onlineStatusChanged( GlobalSettings::EnumNetworkState::type ) ), - this, SLOT( slotUpdateOnlineStatus( GlobalSettings::EnumNetworkState::type ) ) ); + connect( kmkernel, TQT_SIGNAL( onlineStatusChanged( GlobalSettings::EnumNetworkState::type ) ), + this, TQT_SLOT( slotUpdateOnlineStatus( GlobalSettings::EnumNetworkState::type ) ) ); toggleSystemTray(); @@ -250,11 +250,11 @@ KMMainWidget::KMMainWidget(QWidget *parent, const char *name, KMainWindow *mainWin = dynamic_cast<KMainWindow*>(topLevelWidget()); KStatusBar *sb = mainWin ? mainWin->statusBar() : 0; - mVacationScriptIndicator = new KStatusBarLabel( QString(), 0, sb ); + mVacationScriptIndicator = new KStatusBarLabel( TQString(), 0, sb ); mVacationScriptIndicator->hide(); - connect( mVacationScriptIndicator, SIGNAL(itemReleased(int)), SLOT(slotEditVacation()) ); + connect( mVacationScriptIndicator, TQT_SIGNAL(itemReleased(int)), TQT_SLOT(slotEditVacation()) ); if ( GlobalSettings::checkOutOfOfficeOnStartup() ) - QTimer::singleShot( 0, this, SLOT(slotCheckVacation()) ); + TQTimer::singleShot( 0, this, TQT_SLOT(slotCheckVacation()) ); } @@ -347,8 +347,8 @@ void KMMainWidget::readConfig(void) bool oldFolderQuickSearch = mEnableFolderQuickSearch; bool oldQuickSearch = mEnableQuickSearch; - QString str; - QSize siz; + TQString str; + TQSize siz; if (mStartupDone) { @@ -377,7 +377,7 @@ void KMMainWidget::readConfig(void) { // area for config group "Geometry" KConfigGroupSaver saver(config, "Geometry"); // size of the mainwin - QSize defaultSize(750,560); + TQSize defaultSize(750,560); siz = config->readSizeEntry("MainWin", &defaultSize); if (!siz.isEmpty()) resize(siz); @@ -391,8 +391,8 @@ void KMMainWidget::readConfig(void) mPanner1Sep.clear(); mPanner2Sep.clear(); - QValueList<int> & widths = mLongFolderList ? mPanner1Sep : mPanner2Sep ; - QValueList<int> & heights = mLongFolderList ? mPanner2Sep : mPanner1Sep ; + TQValueList<int> & widths = mLongFolderList ? mPanner1Sep : mPanner2Sep ; + TQValueList<int> & heights = mLongFolderList ? mPanner2Sep : mPanner1Sep ; widths << folderW << headerW; heights << headerH << readerH; @@ -455,7 +455,7 @@ void KMMainWidget::readConfig(void) if ( mFolderViewSplitter && !GlobalSettings::self()->folderViewSplitterPosition().isEmpty() ) { mFolderViewSplitter->setSizes( GlobalSettings::self()->folderViewSplitterPosition() ); } else { - QValueList<int> defaults; + TQValueList<int> defaults; defaults << (int)(height() * 0.2) << (int)(height() * 0.8); mFolderViewSplitter->setSizes( defaults ); } @@ -477,7 +477,7 @@ void KMMainWidget::readConfig(void) bool check = config->readBoolEntry("checkmail-startup", false); if (check) // do it after building the kmmainwin, so that the progressdialog is available - QTimer::singleShot( 0, this, SLOT( slotCheckMail() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( slotCheckMail() ) ); } } @@ -524,7 +524,7 @@ void KMMainWidget::readConfig(void) //----------------------------------------------------------------------------- void KMMainWidget::writeConfig(void) { - QString s; + TQString s; KConfig *config = KMKernel::config(); KConfigGroup geometry( config, "Geometry" ); @@ -539,8 +539,8 @@ void KMMainWidget::writeConfig(void) geometry.writeEntry( "MainWin", this->geometry().size() ); - const QValueList<int> widths = ( mLongFolderList ? mPanner1 : mPanner2 )->sizes(); - const QValueList<int> heights = ( mLongFolderList ? mPanner2 : mPanner1 )->sizes(); + const TQValueList<int> widths = ( mLongFolderList ? mPanner1 : mPanner2 )->sizes(); + const TQValueList<int> heights = ( mLongFolderList ? mPanner2 : mPanner1 )->sizes(); geometry.writeEntry( "FolderPaneWidth", widths[0] ); geometry.writeEntry( "HeaderPaneWidth", widths[1] ); @@ -562,17 +562,17 @@ void KMMainWidget::writeConfig(void) void KMMainWidget::createWidgets(void) { // Create the splitters according to the layout settings - QWidget *headerParent = 0, + TQWidget *headerParent = 0, *mimeParent = 0, *messageParent = 0; const bool opaqueResize = KGlobalSettings::opaqueResize(); if ( mLongFolderList ) { // superior splitter: folder tree vs. rest // inferior splitter: headers vs. message vs. mime tree - mPanner1 = new QSplitter( Qt::Horizontal, this, "panner 1" ); + mPanner1 = new TQSplitter( Qt::Horizontal, this, "panner 1" ); mPanner1->setOpaqueResize( opaqueResize ); Qt::Orientation orientation = mReaderWindowBelow ? Qt::Vertical : Qt::Horizontal; - mPanner2 = new QSplitter( orientation, mPanner1, "panner 2" ); + mPanner2 = new TQSplitter( orientation, mPanner1, "panner 2" ); mPanner2->setOpaqueResize( opaqueResize ); mPanner2->setChildrenCollapsible( false ); mFolderViewParent = mPanner1; @@ -580,10 +580,10 @@ void KMMainWidget::createWidgets(void) } else /* !mLongFolderList */ { // superior splitter: ( folder tree + headers ) vs. message vs. mime // inferior splitter: folder tree vs. headers - mPanner1 = new QSplitter( Qt::Vertical, this, "panner 1" ); + mPanner1 = new TQSplitter( Qt::Vertical, this, "panner 1" ); mPanner1->setOpaqueResize( opaqueResize ); mPanner1->setChildrenCollapsible( false ); - mPanner2 = new QSplitter( Qt::Horizontal, mPanner1, "panner 2" ); + mPanner2 = new TQSplitter( Qt::Horizontal, mPanner1, "panner 2" ); mPanner2->setOpaqueResize( opaqueResize ); headerParent = mFolderViewParent = mPanner2; mimeParent = messageParent = mPanner1; @@ -604,11 +604,11 @@ void KMMainWidget::createWidgets(void) #ifndef NDEBUG headerParent->dumpObjectTree(); #endif - mSearchAndHeaders = new QVBox( headerParent ); + mSearchAndHeaders = new TQVBox( headerParent ); mSearchToolBar = new KToolBar( mSearchAndHeaders, "search toolbar"); mSearchToolBar->setMovingEnabled(false); mSearchToolBar->boxLayout()->setSpacing( KDialog::spacingHint() ); - QLabel *label = new QLabel( i18n("S&earch:"), mSearchToolBar, "kde toolbar widget" ); + TQLabel *label = new TQLabel( i18n("S&earch:"), mSearchToolBar, "kde toolbar widget" ); mHeaders = new KMHeaders(this, mSearchAndHeaders, "headers"); @@ -620,26 +620,26 @@ void KMMainWidget::createWidgets(void) actionCollection(), "headers quick search line" ); #endif label->setBuddy( mQuickSearchLine ); - connect( mQuickSearchLine, SIGNAL( requestFullSearch() ), - this, SLOT( slotRequestFullSearchFromQuickSearch() ) ); + connect( mQuickSearchLine, TQT_SIGNAL( requestFullSearch() ), + this, TQT_SLOT( slotRequestFullSearchFromQuickSearch() ) ); mSearchToolBar->setStretchableWidget( mQuickSearchLine ); - connect( mHeaders, SIGNAL( messageListUpdated() ), - mQuickSearchLine, SLOT( updateSearch() ) ); + connect( mHeaders, TQT_SIGNAL( messageListUpdated() ), + mQuickSearchLine, TQT_SLOT( updateSearch() ) ); if ( !GlobalSettings::self()->quickSearchActive() ) mSearchToolBar->hide(); if (mReaderWindowActive) { - connect(mHeaders, SIGNAL(selected(KMMessage*)), - this, SLOT(slotMsgSelected(KMMessage*))); - } - connect(mHeaders, SIGNAL(activated(KMMessage*)), - this, SLOT(slotMsgActivated(KMMessage*))); - connect( mHeaders, SIGNAL( selectionChanged() ), - SLOT( startUpdateMessageActionsTimer() ) ); - QAccel *accel = actionCollection()->kaccel(); + connect(mHeaders, TQT_SIGNAL(selected(KMMessage*)), + this, TQT_SLOT(slotMsgSelected(KMMessage*))); + } + connect(mHeaders, TQT_SIGNAL(activated(KMMessage*)), + this, TQT_SLOT(slotMsgActivated(KMMessage*))); + connect( mHeaders, TQT_SIGNAL( selectionChanged() ), + TQT_SLOT( startUpdateMessageActionsTimer() ) ); + TQAccel *accel = actionCollection()->kaccel(); accel->connectItem(accel->insertItem(SHIFT+Key_Left), - mHeaders, SLOT(selectPrevMessage())); + mHeaders, TQT_SLOT(selectPrevMessage())); accel->connectItem(accel->insertItem(SHIFT+Key_Right), - mHeaders, SLOT(selectNextMessage())); + mHeaders, TQT_SLOT(selectNextMessage())); if (mReaderWindowActive) { mMsgView = new KMReaderWin(messageParent, this, actionCollection(), 0 ); @@ -647,24 +647,24 @@ void KMMainWidget::createWidgets(void) mMsgActions->setMessageView( mMsgView ); } - connect(mMsgView, SIGNAL(replaceMsgByUnencryptedVersion()), - this, SLOT(slotReplaceMsgByUnencryptedVersion())); - connect(mMsgView, SIGNAL(popupMenu(KMMessage&,const KURL&,const QPoint&)), - this, SLOT(slotMsgPopup(KMMessage&,const KURL&,const QPoint&))); - connect(mMsgView, SIGNAL(urlClicked(const KURL&,int)), - mMsgView, SLOT(slotUrlClicked())); - connect(mHeaders, SIGNAL(maybeDeleting()), - mMsgView, SLOT(clearCache())); - connect(mMsgView, SIGNAL(noDrag()), - mHeaders, SLOT(slotNoDrag())); + connect(mMsgView, TQT_SIGNAL(replaceMsgByUnencryptedVersion()), + this, TQT_SLOT(slotReplaceMsgByUnencryptedVersion())); + connect(mMsgView, TQT_SIGNAL(popupMenu(KMMessage&,const KURL&,const TQPoint&)), + this, TQT_SLOT(slotMsgPopup(KMMessage&,const KURL&,const TQPoint&))); + connect(mMsgView, TQT_SIGNAL(urlClicked(const KURL&,int)), + mMsgView, TQT_SLOT(slotUrlClicked())); + connect(mHeaders, TQT_SIGNAL(maybeDeleting()), + mMsgView, TQT_SLOT(clearCache())); + connect(mMsgView, TQT_SIGNAL(noDrag()), + mHeaders, TQT_SLOT(slotNoDrag())); accel->connectItem(accel->insertItem(Key_Up), - mMsgView, SLOT(slotScrollUp())); + mMsgView, TQT_SLOT(slotScrollUp())); accel->connectItem(accel->insertItem(Key_Down), - mMsgView, SLOT(slotScrollDown())); + mMsgView, TQT_SLOT(slotScrollDown())); accel->connectItem(accel->insertItem(Key_Prior), - mMsgView, SLOT(slotScrollPrior())); + mMsgView, TQT_SLOT(slotScrollPrior())); accel->connectItem(accel->insertItem(Key_Next), - mMsgView, SLOT(slotScrollNext())); + mMsgView, TQT_SLOT(slotScrollNext())); } else { mMsgView = NULL; } @@ -672,43 +672,43 @@ void KMMainWidget::createWidgets(void) KAction *action; action = new KAction( i18n("Move Message to Folder"), Key_M, this, - SLOT(slotMoveMsg()), actionCollection(), + TQT_SLOT(slotMoveMsg()), actionCollection(), "move_message_to_folder" ); action->plugAccel( actionCollection()->kaccel() ); action = new KAction( i18n("Copy Message to Folder"), Key_C, this, - SLOT(slotCopyMsg()), actionCollection(), + TQT_SLOT(slotCopyMsg()), actionCollection(), "copy_message_to_folder" ); action->plugAccel( actionCollection()->kaccel() ); action = new KAction( i18n("Jump to Folder"), Key_J, this, - SLOT(slotJumpToFolder()), actionCollection(), + TQT_SLOT(slotJumpToFolder()), actionCollection(), "jump_to_folder" ); action->plugAccel( actionCollection()->kaccel() ); // create list of folders - mFolderViewSplitter = new QSplitter( Qt::Vertical, mFolderViewParent ); + mFolderViewSplitter = new TQSplitter( Qt::Vertical, mFolderViewParent ); mFolderViewSplitter->setOpaqueResize( KGlobalSettings::opaqueResize() ); mFavoriteFolderView = new KMail::FavoriteFolderView( this, mFolderViewSplitter ); if ( mFavoritesCheckMailAction ) - connect( mFavoritesCheckMailAction, SIGNAL(activated()), mFavoriteFolderView, SLOT(checkMail()) ); - QWidget *folderTreeParent = mFolderViewParent; + connect( mFavoritesCheckMailAction, TQT_SIGNAL(activated()), mFavoriteFolderView, TQT_SLOT(checkMail()) ); + TQWidget *folderTreeParent = mFolderViewParent; if ( GlobalSettings::enableFavoriteFolderView() ) { folderTreeParent = mFolderViewSplitter; mFolderView = mFolderViewSplitter; } // the "folder tree" consists of a quicksearch input field and the tree itself - mSearchAndTree = new QVBox(folderTreeParent); - mFolderQuickSearch = new QHBox(mSearchAndTree); - QPushButton *clear = new QPushButton(QApplication::reverseLayout() + mSearchAndTree = new TQVBox(folderTreeParent); + mFolderQuickSearch = new TQHBox(mSearchAndTree); + TQPushButton *clear = new TQPushButton(TQApplication::reverseLayout() ? SmallIcon("clear_left") : SmallIcon("locationbar_erase"), "", mFolderQuickSearch); clear->setFlat(true); KListViewSearchLine *search = new KListViewSearchLine(mFolderQuickSearch); mFolderTree = new KMFolderTree(this, mSearchAndTree, "folderTree"); search->setListView(mFolderTree); - connect(clear, SIGNAL(clicked()), search, SLOT(clear())); + connect(clear, TQT_SIGNAL(clicked()), search, TQT_SLOT(clear())); if ( !GlobalSettings::enableFolderQuickSearch() ) { mFolderQuickSearch->hide(); @@ -717,72 +717,72 @@ void KMMainWidget::createWidgets(void) if ( !GlobalSettings::enableFavoriteFolderView() ) { mFolderView = mSearchAndTree; } - connect( mFolderTree, SIGNAL(folderSelected(KMFolder*)), - mFavoriteFolderView, SLOT(folderTreeSelectionChanged(KMFolder*)) ); - - connect(mFolderTree, SIGNAL(folderSelected(KMFolder*)), - this, SLOT(folderSelected(KMFolder*))); - connect( mFolderTree, SIGNAL( folderSelected( KMFolder* ) ), - mQuickSearchLine, SLOT( reset() ) ); - connect(mFolderTree, SIGNAL(folderSelectedUnread(KMFolder*)), - this, SLOT(folderSelectedUnread(KMFolder*))); - connect(mFolderTree, SIGNAL(folderDrop(KMFolder*)), - this, SLOT(slotMoveMsgToFolder(KMFolder*))); - connect(mFolderTree, SIGNAL(folderDropCopy(KMFolder*)), - this, SLOT(slotCopyMsgToFolder(KMFolder*))); - connect(mFolderTree, SIGNAL(columnsChanged()), - this, SLOT(slotFolderTreeColumnsChanged())); + connect( mFolderTree, TQT_SIGNAL(folderSelected(KMFolder*)), + mFavoriteFolderView, TQT_SLOT(folderTreeSelectionChanged(KMFolder*)) ); + + connect(mFolderTree, TQT_SIGNAL(folderSelected(KMFolder*)), + this, TQT_SLOT(folderSelected(KMFolder*))); + connect( mFolderTree, TQT_SIGNAL( folderSelected( KMFolder* ) ), + mQuickSearchLine, TQT_SLOT( reset() ) ); + connect(mFolderTree, TQT_SIGNAL(folderSelectedUnread(KMFolder*)), + this, TQT_SLOT(folderSelectedUnread(KMFolder*))); + connect(mFolderTree, TQT_SIGNAL(folderDrop(KMFolder*)), + this, TQT_SLOT(slotMoveMsgToFolder(KMFolder*))); + connect(mFolderTree, TQT_SIGNAL(folderDropCopy(KMFolder*)), + this, TQT_SLOT(slotCopyMsgToFolder(KMFolder*))); + connect(mFolderTree, TQT_SIGNAL(columnsChanged()), + this, TQT_SLOT(slotFolderTreeColumnsChanged())); if ( mFavoriteFolderView ) { - connect( mFavoriteFolderView, SIGNAL(folderDrop(KMFolder*)), SLOT(slotMoveMsgToFolder(KMFolder*)) ); - connect( mFavoriteFolderView, SIGNAL(folderDropCopy(KMFolder*)), SLOT(slotCopyMsgToFolder(KMFolder*)) ); + connect( mFavoriteFolderView, TQT_SIGNAL(folderDrop(KMFolder*)), TQT_SLOT(slotMoveMsgToFolder(KMFolder*)) ); + connect( mFavoriteFolderView, TQT_SIGNAL(folderDropCopy(KMFolder*)), TQT_SLOT(slotCopyMsgToFolder(KMFolder*)) ); } //Commands not worthy of menu items, but that deserve configurable keybindings mRemoveDuplicatesAction = new KAction( i18n("Remove Duplicate Messages"), CTRL+Key_Asterisk, this, - SLOT(removeDuplicates()), actionCollection(), "remove_duplicate_messages"); + TQT_SLOT(removeDuplicates()), actionCollection(), "remove_duplicate_messages"); action->plugAccel( actionCollection()->kaccel() ); action = new KAction( i18n("Abort Current Operation"), Key_Escape, ProgressManager::instance(), - SLOT(slotAbortAll()), actionCollection(), "cancel" ); + TQT_SLOT(slotAbortAll()), actionCollection(), "cancel" ); action->plugAccel( actionCollection()->kaccel() ); action = new KAction( i18n("Focus on Next Folder"), CTRL+Key_Right, mFolderTree, - SLOT(incCurrentFolder()), actionCollection(), "inc_current_folder"); + TQT_SLOT(incCurrentFolder()), actionCollection(), "inc_current_folder"); action->plugAccel( actionCollection()->kaccel() ); action = new KAction( i18n("Focus on Previous Folder"), CTRL+Key_Left, mFolderTree, - SLOT(decCurrentFolder()), actionCollection(), "dec_current_folder"); + TQT_SLOT(decCurrentFolder()), actionCollection(), "dec_current_folder"); action->plugAccel( actionCollection()->kaccel() ); action = new KAction( i18n("Select Folder with Focus"), CTRL+Key_Space, mFolderTree, - SLOT(selectCurrentFolder()), actionCollection(), "select_current_folder"); + TQT_SLOT(selectCurrentFolder()), actionCollection(), "select_current_folder"); action->plugAccel( actionCollection()->kaccel() ); action = new KAction( i18n("Focus on Next Message"), ALT+Key_Right, mHeaders, - SLOT(incCurrentMessage()), actionCollection(), "inc_current_message"); + TQT_SLOT(incCurrentMessage()), actionCollection(), "inc_current_message"); action->plugAccel( actionCollection()->kaccel() ); action = new KAction( i18n("Focus on Previous Message"), ALT+Key_Left, mHeaders, - SLOT(decCurrentMessage()), actionCollection(), "dec_current_message"); + TQT_SLOT(decCurrentMessage()), actionCollection(), "dec_current_message"); action->plugAccel( actionCollection()->kaccel() ); action = new KAction( i18n("Select Message with Focus"), ALT+Key_Space, mHeaders, - SLOT( selectCurrentMessage() ), actionCollection(), "select_current_message"); + TQT_SLOT( selectCurrentMessage() ), actionCollection(), "select_current_message"); action->plugAccel( actionCollection()->kaccel() ); - connect( kmkernel->outboxFolder(), SIGNAL( msgRemoved(int, QString) ), - SLOT( startUpdateMessageActionsTimer() ) ); - connect( kmkernel->outboxFolder(), SIGNAL( msgAdded(int) ), - SLOT( startUpdateMessageActionsTimer() ) ); + connect( kmkernel->outboxFolder(), TQT_SIGNAL( msgRemoved(int, TQString) ), + TQT_SLOT( startUpdateMessageActionsTimer() ) ); + connect( kmkernel->outboxFolder(), TQT_SIGNAL( msgAdded(int) ), + TQT_SLOT( startUpdateMessageActionsTimer() ) ); } @@ -790,45 +790,45 @@ void KMMainWidget::createWidgets(void) void KMMainWidget::activatePanners(void) { if (mMsgView) { - QObject::disconnect( mMsgView->copyAction(), - SIGNAL( activated() ), - mMsgView, SLOT( slotCopySelectedText() )); + TQObject::disconnect( mMsgView->copyAction(), + TQT_SIGNAL( activated() ), + mMsgView, TQT_SLOT( slotCopySelectedText() )); } setupFolderView(); if ( mLongFolderList ) { - mSearchAndHeaders->reparent( mPanner2, 0, QPoint( 0, 0 ) ); + mSearchAndHeaders->reparent( mPanner2, 0, TQPoint( 0, 0 ) ); if (mMsgView) { - mMsgView->reparent( mPanner2, 0, QPoint( 0, 0 ) ); + mMsgView->reparent( mPanner2, 0, TQPoint( 0, 0 ) ); mPanner2->moveToLast( mMsgView ); } mFolderViewParent = mPanner1; - mFolderView->reparent( mFolderViewParent, 0, QPoint( 0, 0 ) ); + mFolderView->reparent( mFolderViewParent, 0, TQPoint( 0, 0 ) ); mPanner1->moveToLast( mPanner2 ); mPanner1->setSizes( mPanner1Sep ); - mPanner1->setResizeMode( mFolderView, QSplitter::KeepSize ); + mPanner1->setResizeMode( mFolderView, TQSplitter::KeepSize ); mPanner2->setSizes( mPanner2Sep ); - mPanner2->setResizeMode( mSearchAndHeaders, QSplitter::KeepSize ); + mPanner2->setResizeMode( mSearchAndHeaders, TQSplitter::KeepSize ); } else /* !mLongFolderList */ { mFolderViewParent = mPanner2; - mFolderView->reparent( mFolderViewParent, 0, QPoint( 0, 0 ) ); - mSearchAndHeaders->reparent( mPanner2, 0, QPoint( 0, 0 ) ); + mFolderView->reparent( mFolderViewParent, 0, TQPoint( 0, 0 ) ); + mSearchAndHeaders->reparent( mPanner2, 0, TQPoint( 0, 0 ) ); mPanner2->moveToLast( mSearchAndHeaders ); mPanner1->moveToFirst( mPanner2 ); if (mMsgView) { - mMsgView->reparent( mPanner1, 0, QPoint( 0, 0 ) ); + mMsgView->reparent( mPanner1, 0, TQPoint( 0, 0 ) ); mPanner1->moveToLast( mMsgView ); } mPanner1->setSizes( mPanner1Sep ); mPanner2->setSizes( mPanner2Sep ); - mPanner1->setResizeMode( mPanner2, QSplitter::KeepSize ); - mPanner2->setResizeMode( mFolderView, QSplitter::KeepSize ); + mPanner1->setResizeMode( mPanner2, TQSplitter::KeepSize ); + mPanner2->setResizeMode( mFolderView, TQSplitter::KeepSize ); } if (mMsgView) { - QObject::connect( mMsgView->copyAction(), - SIGNAL( activated() ), - mMsgView, SLOT( slotCopySelectedText() )); + TQObject::connect( mMsgView->copyAction(), + TQT_SIGNAL( activated() ), + mMsgView, TQT_SLOT( slotCopySelectedText() )); } } @@ -836,14 +836,14 @@ void KMMainWidget::activatePanners(void) //----------------------------------------------------------------------------- void KMMainWidget::hide() { - QWidget::hide(); + TQWidget::hide(); } //----------------------------------------------------------------------------- void KMMainWidget::show() { - QWidget::show(); + TQWidget::show(); } //------------------------------------------------------------------------- @@ -852,8 +852,8 @@ void KMMainWidget::slotSearch() if(!mSearchWin) { mSearchWin = new SearchWindow(this, "Search", mFolder, false); - connect(mSearchWin, SIGNAL(destroyed()), - this, SLOT(slotSearchClosed())); + connect(mSearchWin, TQT_SIGNAL(destroyed()), + this, TQT_SLOT(slotSearchClosed())); } else { @@ -943,7 +943,7 @@ void KMMainWidget::slotCheckOneAccount(int item) //----------------------------------------------------------------------------- void KMMainWidget::slotMailChecked( bool newMail, bool sendOnCheck, - const QMap<QString, int> & newInFolder ) + const TQMap<TQString, int> & newInFolder ) { const bool sendOnAll = GlobalSettings::self()->sendOnCheck() == GlobalSettings::EnumSendOnCheck::SendOnAllChecks; @@ -955,14 +955,14 @@ void KMMainWidget::slotMailChecked( bool newMail, bool sendOnCheck, if ( !newMail || newInFolder.isEmpty() ) return; - kapp->dcopClient()->emitDCOPSignal( "unreadCountChanged()", QByteArray() ); + kapp->dcopClient()->emitDCOPSignal( "unreadCountChanged()", TQByteArray() ); // build summary for new mail message bool showNotification = false; - QString summary; - QStringList keys( newInFolder.keys() ); + TQString summary; + TQStringList keys( newInFolder.keys() ); keys.sort(); - for ( QStringList::const_iterator it = keys.begin(); + for ( TQStringList::const_iterator it = keys.begin(); it != keys.end(); ++it ) { kdDebug(5006) << newInFolder.find( *it ).data() << " new message(s) in " @@ -1053,7 +1053,7 @@ void KMMainWidget::slotShowNewFromTemplate() for ( int idx = 0; idx<mTemplateFolder->count(); ++idx ) { KMMsgBase *mb = mTemplateFolder->getMsgBase( idx ); - QString subj = mb->subject(); + TQString subj = mb->subject(); if ( subj.isEmpty() ) subj = i18n("No Subject"); mTemplateMenu->popupMenu()->insertItem( KStringHandler::rsqueeze( subj.replace( "&", "&&" ) ), idx ); @@ -1133,7 +1133,7 @@ void KMMainWidget::modifyFolder( KMFolderTreeItem* folderItem ) //----------------------------------------------------------------------------- void KMMainWidget::slotExpireFolder() { - QString str; + TQString str; bool canBeExpired = true; if (!mFolder) return; @@ -1154,7 +1154,7 @@ void KMMainWidget::slotExpireFolder() KConfigGroupSaver saver(config, "General"); if (config->readBoolEntry("warn-before-expire", true)) { - str = i18n("<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>").arg(QStyleSheet::escape( mFolder->label() )); + str = i18n("<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>").arg(TQStyleSheet::escape( mFolder->label() )); if (KMessageBox::warningContinueCancel(this, str, i18n("Expire Folder"), i18n("&Expire")) != KMessageBox::Continue) return; @@ -1166,18 +1166,18 @@ void KMMainWidget::slotExpireFolder() //----------------------------------------------------------------------------- void KMMainWidget::slotEmptyFolder() { - QString str; + TQString str; if (!mFolder) return; bool isTrash = kmkernel->folderIsTrash(mFolder); if (mConfirmEmpty) { - QString title = (isTrash) ? i18n("Empty Trash") : i18n("Move to Trash"); - QString text = (isTrash) ? + TQString title = (isTrash) ? i18n("Empty Trash") : i18n("Move to Trash"); + TQString text = (isTrash) ? i18n("Are you sure you want to empty the trash folder?") : i18n("<qt>Are you sure you want to move all messages from " - "folder <b>%1</b> to the trash?</qt>").arg( QStyleSheet::escape( mFolder->label() ) ); + "folder <b>%1</b> to the trash?</qt>").arg( TQStyleSheet::escape( mFolder->label() ) ); if (KMessageBox::warningContinueCancel(this, text, title, KGuiItem( title, "edittrash")) != KMessageBox::Continue) return; @@ -1208,26 +1208,26 @@ void KMMainWidget::slotEmptyFolder() //----------------------------------------------------------------------------- void KMMainWidget::slotRemoveFolder() { - QString str; - QDir dir; + TQString str; + TQDir dir; if ( !mFolder ) return; if ( mFolder->isSystemFolder() ) return; if ( mFolder->isReadOnly() ) return; - QString title; + TQString title; if ( mFolder->folderType() == KMFolderTypeSearch ) { title = i18n("Delete Search"); str = i18n("<qt>Are you sure you want to delete the search <b>%1</b>?<br>" "Any messages it shows will still be available in their original folder.</qt>") - .arg( QStyleSheet::escape( mFolder->label() ) ); + .arg( TQStyleSheet::escape( mFolder->label() ) ); } else { title = i18n("Delete Folder"); if ( mFolder->count() == 0 ) { if ( !mFolder->child() || mFolder->child()->isEmpty() ) { str = i18n("<qt>Are you sure you want to delete the empty folder " "<b>%1</b>?</qt>") - .arg( QStyleSheet::escape( mFolder->label() ) ); + .arg( TQStyleSheet::escape( mFolder->label() ) ); } else { str = i18n("<qt>Are you sure you want to delete the empty folder " @@ -1235,7 +1235,7 @@ void KMMainWidget::slotRemoveFolder() "not be empty and their contents will be discarded as well. " "<p><b>Beware</b> that discarded messages are not saved " "into your Trash folder and are permanently deleted.</qt>") - .arg( QStyleSheet::escape( mFolder->label() ) ); + .arg( TQStyleSheet::escape( mFolder->label() ) ); } } else { if ( !mFolder->child() || mFolder->child()->isEmpty() ) { @@ -1243,14 +1243,14 @@ void KMMainWidget::slotRemoveFolder() "<b>%1</b>, discarding its contents? " "<p><b>Beware</b> that discarded messages are not saved " "into your Trash folder and are permanently deleted.</qt>") - .arg( QStyleSheet::escape( mFolder->label() ) ); + .arg( TQStyleSheet::escape( mFolder->label() ) ); } else { str = i18n("<qt>Are you sure you want to delete the folder <b>%1</b> " "and all its subfolders, discarding their contents? " "<p><b>Beware</b> that discarded messages are not saved " "into your Trash folder and are permanently deleted.</qt>") - .arg( QStyleSheet::escape( mFolder->label() ) ); + .arg( TQStyleSheet::escape( mFolder->label() ) ); } } } @@ -1304,7 +1304,7 @@ void KMMainWidget::slotCompactFolder() KCursorSaver busy(KBusyPtr::busy()); mFolder->compact( KMFolder::CompactNow ); // setCurrentItemByIndex will override the statusbar message, so save/restore it - QString statusMsg = BroadcastStatus::instance()->statusMsg(); + TQString statusMsg = BroadcastStatus::instance()->statusMsg(); mHeaders->setCurrentItemByIndex(idx); BroadcastStatus::instance()->setStatusMsg( statusMsg ); } @@ -1549,8 +1549,8 @@ void KMMainWidget::slotRedirectMsg() //----------------------------------------------------------------------------- void KMMainWidget::slotCustomReplyToMsg( int tid ) { - QString text = mMsgView? mMsgView->copyText() : ""; - QString tmpl = mCustomTemplates[ tid ]; + TQString text = mMsgView? mMsgView->copyText() : ""; + TQString tmpl = mCustomTemplates[ tid ]; kdDebug() << "Reply with template: " << tmpl << " (" << tid << ")" << endl; KMCommand *command = new KMCustomReplyToCommand( this, mHeaders->currentMsg(), @@ -1563,8 +1563,8 @@ void KMMainWidget::slotCustomReplyToMsg( int tid ) //----------------------------------------------------------------------------- void KMMainWidget::slotCustomReplyAllToMsg( int tid ) { - QString text = mMsgView? mMsgView->copyText() : ""; - QString tmpl = mCustomTemplates[ tid ]; + TQString text = mMsgView? mMsgView->copyText() : ""; + TQString tmpl = mCustomTemplates[ tid ]; kdDebug() << "Reply to All with template: " << tmpl << " (" << tid << ")" << endl; KMCommand *command = new KMCustomReplyAllToCommand( this, mHeaders->currentMsg(), @@ -1577,7 +1577,7 @@ void KMMainWidget::slotCustomReplyAllToMsg( int tid ) //----------------------------------------------------------------------------- void KMMainWidget::slotCustomForwardMsg( int tid ) { - QString tmpl = mCustomTemplates[ tid ]; + TQString tmpl = mCustomTemplates[ tid ]; kdDebug() << "Forward with template: " << tmpl << " (" << tid << ")" << endl; KMMessageList* selected = mHeaders->selectedMsgs(); KMCommand *command = 0L; @@ -1652,9 +1652,9 @@ void KMMainWidget::slotToFilter() void KMMainWidget::updateListFilterAction() { //Proxy the mListFilterAction to update the action text - QCString name; - QString value; - QString lname = MailingList::name( mHeaders->currentMsg(), name, value ); + TQCString name; + TQString value; + TQString lname = MailingList::name( mHeaders->currentMsg(), name, value ); mListFilterAction->setText( i18n("Filter on Mailing-List...") ); if ( lname.isNull() ) mListFilterAction->setEnabled( false ); @@ -1741,7 +1741,7 @@ void KMMainWidget::slotCheckVacation() return; Vacation *vac = new Vacation( this, true /* check only */ ); - connect( vac, SIGNAL(scriptActive(bool)), SLOT(updateVactionScriptStatus(bool)) ); + connect( vac, TQT_SIGNAL(scriptActive(bool)), TQT_SLOT(updateVactionScriptStatus(bool)) ); } void KMMainWidget::slotEditVacation() @@ -1754,18 +1754,18 @@ void KMMainWidget::slotEditVacation() return; mVacation = new Vacation( this ); - connect( mVacation, SIGNAL(scriptActive(bool)), SLOT(updateVactionScriptStatus(bool)) ); + connect( mVacation, TQT_SIGNAL(scriptActive(bool)), TQT_SLOT(updateVactionScriptStatus(bool)) ); if ( mVacation->isUsable() ) { - connect( mVacation, SIGNAL(result(bool)), mVacation, SLOT(deleteLater()) ); + connect( mVacation, TQT_SIGNAL(result(bool)), mVacation, TQT_SLOT(deleteLater()) ); } else { - QString msg = i18n("KMail's Out of Office Reply functionality relies on " + TQString msg = i18n("KMail's Out of Office Reply functionality relies on " "server-side filtering. You have not yet configured an " "IMAP server for this.\n" "You can do this on the \"Filtering\" tab of the IMAP " "account configuration."); KMessageBox::sorry( this, msg, i18n("No Server-Side Filtering Configured") ); - delete mVacation; // QGuardedPtr sets itself to 0! + delete mVacation; // TQGuardedPtr sets itself to 0! } } @@ -1917,8 +1917,8 @@ void KMMainWidget::slotSendQueuedVia( int item ) return; } - QStringList availTransports= KMail::TransportManager::transportNames(); - QString customTransport = availTransports[ item ]; + TQStringList availTransports= KMail::TransportManager::transportNames(); + TQString customTransport = availTransports[ item ]; kmkernel->msgSender()->sendQueued( customTransport ); } @@ -2001,14 +2001,14 @@ void KMMainWidget::folderSelected( KMFolder* aFolder, bool forceJumpToUnread ) if ( newFolder ) writeFolderConfig(); if ( mFolder ) { - disconnect( mFolder, SIGNAL( changed() ), - this, SLOT( updateMarkAsReadAction() ) ); - disconnect( mFolder, SIGNAL( msgHeaderChanged( KMFolder*, int ) ), - this, SLOT( updateMarkAsReadAction() ) ); - disconnect( mFolder, SIGNAL( msgAdded( int ) ), - this, SLOT( updateMarkAsReadAction() ) ); - disconnect( mFolder, SIGNAL( msgRemoved( KMFolder * ) ), - this, SLOT( updateMarkAsReadAction() ) ); + disconnect( mFolder, TQT_SIGNAL( changed() ), + this, TQT_SLOT( updateMarkAsReadAction() ) ); + disconnect( mFolder, TQT_SIGNAL( msgHeaderChanged( KMFolder*, int ) ), + this, TQT_SLOT( updateMarkAsReadAction() ) ); + disconnect( mFolder, TQT_SIGNAL( msgAdded( int ) ), + this, TQT_SLOT( updateMarkAsReadAction() ) ); + disconnect( mFolder, TQT_SIGNAL( msgRemoved( KMFolder * ) ), + this, TQT_SLOT( updateMarkAsReadAction() ) ); } mFolder = aFolder; @@ -2025,8 +2025,8 @@ void KMMainWidget::folderSelected( KMFolder* aFolder, bool forceJumpToUnread ) imap->open("mainwidget"); // will be closed in the folderSelected slot // first get new headers before we select the folder imap->setSelected( true ); - connect( imap, SIGNAL( folderComplete( KMFolderImap*, bool ) ), - this, SLOT( folderSelected() ) ); + connect( imap, TQT_SIGNAL( folderComplete( KMFolderImap*, bool ) ), + this, TQT_SLOT( folderSelected() ) ); imap->getAndCheckFolder(); mHeaders->setFolder( 0 ); updateFolderMenu(); @@ -2034,27 +2034,27 @@ void KMMainWidget::folderSelected( KMFolder* aFolder, bool forceJumpToUnread ) // Set a timer to show a splash screen if fetching folder contents // takes more than the amount of seconds configured in the kmailrc (default 1000 msec) - mShowBusySplashTimer = new QTimer( this ); - connect( mShowBusySplashTimer, SIGNAL( timeout() ), this, SLOT( slotShowBusySplash() ) ); + mShowBusySplashTimer = new TQTimer( this ); + connect( mShowBusySplashTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotShowBusySplash() ) ); mShowBusySplashTimer->start( GlobalSettings::self()->folderLoadingTimeout(), true ); return; } else { // the folder is complete now - so go ahead - disconnect( imap, SIGNAL( folderComplete( KMFolderImap*, bool ) ), - this, SLOT( folderSelected() ) ); + disconnect( imap, TQT_SIGNAL( folderComplete( KMFolderImap*, bool ) ), + this, TQT_SLOT( folderSelected() ) ); forceJumpToUnread = mForceJumpToUnread; } } if ( mFolder ) { // == 0 -> pointing to toplevel ("Welcome to KMail") folder - connect( mFolder, SIGNAL( changed() ), - this, SLOT( updateMarkAsReadAction() ) ); - connect( mFolder, SIGNAL( msgHeaderChanged( KMFolder*, int ) ), - this, SLOT( updateMarkAsReadAction() ) ); - connect( mFolder, SIGNAL( msgAdded( int ) ), - this, SLOT( updateMarkAsReadAction() ) ); - connect( mFolder, SIGNAL( msgRemoved(KMFolder *) ), - this, SLOT( updateMarkAsReadAction() ) ); + connect( mFolder, TQT_SIGNAL( changed() ), + this, TQT_SLOT( updateMarkAsReadAction() ) ); + connect( mFolder, TQT_SIGNAL( msgHeaderChanged( KMFolder*, int ) ), + this, TQT_SLOT( updateMarkAsReadAction() ) ); + connect( mFolder, TQT_SIGNAL( msgAdded( int ) ), + this, TQT_SLOT( updateMarkAsReadAction() ) ); + connect( mFolder, TQT_SIGNAL( msgRemoved(KMFolder *) ), + this, TQT_SLOT( updateMarkAsReadAction() ) ); } readFolderConfig(); if (mMsgView) @@ -2108,8 +2108,8 @@ void KMMainWidget::slotMsgSelected(KMMessage *msg) } mJob = msg->parent()->createJob( msg, FolderJob::tGetMessage, 0, "STRUCTURE", mMsgView->attachmentStrategy() ); - connect(mJob, SIGNAL(messageRetrieved(KMMessage*)), - mMsgView, SLOT(slotMessageArrived(KMMessage*))); + connect(mJob, TQT_SIGNAL(messageRetrieved(KMMessage*)), + mMsgView, TQT_SLOT(slotMessageArrived(KMMessage*))); mJob->start(); } else { mMsgView->setMsg(msg); @@ -2130,7 +2130,7 @@ void KMMainWidget::slotMsgChanged() //----------------------------------------------------------------------------- void KMMainWidget::slotSelectFolder(KMFolder* folder) { - QListViewItem* item = mFolderTree->indexOfFolder(folder); + TQListViewItem* item = mFolderTree->indexOfFolder(folder); if ( item ) { mFolderTree->ensureItemVisible( item ); mFolderTree->doFolderSelected( item ); @@ -2162,8 +2162,8 @@ void KMMainWidget::slotReplaceMsgByUnencryptedVersion() KMMessage* newMsg = oldMsg->unencryptedMsg(); // adjust the message id { - QString msgId( oldMsg->msgId() ); - QString prefix("DecryptedMsg."); + TQString msgId( oldMsg->msgId() ); + TQString prefix("DecryptedMsg."); int oldIdx = msgId.find(prefix, 0, false); if( -1 == oldIdx ) { int leftAngle = msgId.findRev( '<' ); @@ -2172,7 +2172,7 @@ void KMMainWidget::slotReplaceMsgByUnencryptedVersion() else { // toggle between "DecryptedMsg." and "DeCryptedMsg." // to avoid same message id - QCharRef c = msgId[ oldIdx+2 ]; + TQCharRef c = msgId[ oldIdx+2 ]; if( 'C' == c ) c = 'c'; else @@ -2293,8 +2293,8 @@ void KMMainWidget::slotMsgActivated(KMMessage *msg) if ( !msg ) return; if ( msg->parent() && !msg->isComplete() ) { FolderJob *job = msg->parent()->createJob( msg ); - connect( job, SIGNAL( messageRetrieved( KMMessage* ) ), - SLOT( slotMsgActivated( KMMessage* ) ) ); + connect( job, TQT_SIGNAL( messageRetrieved( KMMessage* ) ), + TQT_SLOT( slotMsgActivated( KMMessage* ) ) ); job->start(); return; } @@ -2329,7 +2329,7 @@ void KMMainWidget::slotMarkAll() } //----------------------------------------------------------------------------- -void KMMainWidget::slotMsgPopup(KMMessage&, const KURL &aUrl, const QPoint& aPoint) +void KMMainWidget::slotMsgPopup(KMMessage&, const KURL &aUrl, const TQPoint& aPoint) { KPopupMenu * menu = new KPopupMenu; updateMessageMenu(); @@ -2438,11 +2438,11 @@ void KMMainWidget::slotMsgPopup(KMMessage&, const KURL &aUrl, const QPoint& aPoi //----------------------------------------------------------------------------- void KMMainWidget::getAccountMenu() { - QStringList actList; + TQStringList actList; mActMenu->clear(); actList = kmkernel->acctMgr()->getAccounts(); - QStringList::Iterator it; + TQStringList::Iterator it; int id = 0; for(it = actList.begin(); it != actList.end() ; ++it, id++) mActMenu->insertItem((*it).replace("&", "&&"), id); @@ -2451,11 +2451,11 @@ void KMMainWidget::getAccountMenu() //----------------------------------------------------------------------------- void KMMainWidget::getTransportMenu() { - QStringList availTransports; + TQStringList availTransports; mSendMenu->clear(); availTransports = KMail::TransportManager::transportNames(); - QStringList::Iterator it; + TQStringList::Iterator it; int id = 0; for(it = availTransports.begin(); it != availTransports.end() ; ++it, id++) mSendMenu->insertItem((*it).replace("&", "&&"), id); @@ -2465,7 +2465,7 @@ void KMMainWidget::getTransportMenu() void KMMainWidget::updateCustomTemplateMenus() { if ( !mCustomTemplateActions.isEmpty() ) { - QPtrList<KAction>::iterator ait = mCustomTemplateActions.begin(); + TQPtrList<KAction>::iterator ait = mCustomTemplateActions.begin(); for ( ; ait != mCustomTemplateActions.end() ; ++ait ) { (*ait)->unplugAll(); delete (*ait); @@ -2485,32 +2485,32 @@ void KMMainWidget::updateCustomTemplateMenus() new KActionMenu( i18n("Forward With Custom Template"), "mail_custom_forward", actionCollection(), "custom_forward" ); - QSignalMapper *mCustomForwardMapper = new QSignalMapper( this ); - connect( mCustomForwardMapper, SIGNAL( mapped( int ) ), - this, SLOT( slotCustomForwardMsg( int ) ) ); + TQSignalMapper *mCustomForwardMapper = new TQSignalMapper( this ); + connect( mCustomForwardMapper, TQT_SIGNAL( mapped( int ) ), + this, TQT_SLOT( slotCustomForwardMsg( int ) ) ); mForwardActionMenu->insert( mCustomForwardActionMenu ); mCustomReplyActionMenu = new KActionMenu( i18n("Reply With Custom Template"), "mail_custom_reply", actionCollection(), "custom_reply" ); - QSignalMapper *mCustomReplyMapper = new QSignalMapper( this ); - connect( mCustomReplyMapper, SIGNAL( mapped( int ) ), - this, SLOT( slotCustomReplyToMsg( int ) ) ); + TQSignalMapper *mCustomReplyMapper = new TQSignalMapper( this ); + connect( mCustomReplyMapper, TQT_SIGNAL( mapped( int ) ), + this, TQT_SLOT( slotCustomReplyToMsg( int ) ) ); mMsgActions->replyMenu()->insert( mCustomReplyActionMenu ); mCustomReplyAllActionMenu = new KActionMenu( i18n("Reply to All With Custom Template"), "mail_custom_reply_all", actionCollection(), "custom_reply_all" ); - QSignalMapper *mCustomReplyAllMapper = new QSignalMapper( this ); - connect( mCustomReplyAllMapper, SIGNAL( mapped( int ) ), - this, SLOT( slotCustomReplyAllToMsg( int ) ) ); + TQSignalMapper *mCustomReplyAllMapper = new TQSignalMapper( this ); + connect( mCustomReplyAllMapper, TQT_SIGNAL( mapped( int ) ), + this, TQT_SLOT( slotCustomReplyAllToMsg( int ) ) ); mMsgActions->replyMenu()->insert( mCustomReplyAllActionMenu ); mCustomTemplates.clear(); - QStringList list = GlobalSettingsBase::self()->customTemplates(); - QStringList::iterator it = list.begin(); + TQStringList list = GlobalSettingsBase::self()->customTemplates(); + TQStringList::iterator it = list.begin(); int idx = 0; int replyc = 0; int replyallc = 0; @@ -2525,7 +2525,7 @@ void KMMainWidget::updateCustomTemplateMenus() action = new KAction( (*it).replace( "&", "&&" ), KShortcut( t.shortcut() ), mCustomReplyMapper, - SLOT( map() ), + TQT_SLOT( map() ), actionCollection(), (*it).utf8() ); mCustomReplyMapper->setMapping( action, idx ); @@ -2537,7 +2537,7 @@ void KMMainWidget::updateCustomTemplateMenus() action = new KAction( (*it).replace( "&", "&&" ), KShortcut( t.shortcut() ), mCustomReplyAllMapper, - SLOT( map() ), + TQT_SLOT( map() ), actionCollection(), (*it).utf8() ); mCustomReplyAllMapper->setMapping( action, idx ); @@ -2549,7 +2549,7 @@ void KMMainWidget::updateCustomTemplateMenus() action = new KAction( (*it).replace( "&", "&&" ), KShortcut( t.shortcut() ), mCustomForwardMapper, - SLOT( map() ), + TQT_SLOT( map() ), actionCollection(), (*it).utf8() ); mCustomForwardMapper->setMapping( action, idx ); @@ -2561,7 +2561,7 @@ void KMMainWidget::updateCustomTemplateMenus() action = new KAction( (*it).replace( "&", "&&" ), KShortcut::null(), mCustomReplyMapper, - SLOT( map() ), + TQT_SLOT( map() ), actionCollection(), (*it).utf8() ); mCustomReplyMapper->setMapping( action, idx ); @@ -2571,7 +2571,7 @@ void KMMainWidget::updateCustomTemplateMenus() action = new KAction( (*it).replace( "&", "&&" ), KShortcut::null(), mCustomReplyAllMapper, - SLOT( map() ), + TQT_SLOT( map() ), actionCollection(), (*it).utf8() ); mCustomReplyAllMapper->setMapping( action, idx ); @@ -2581,7 +2581,7 @@ void KMMainWidget::updateCustomTemplateMenus() action = new KAction( (*it).replace( "&", "&&" ), KShortcut::null(), mCustomForwardMapper, - SLOT( map() ), + TQT_SLOT( map() ), actionCollection(), (*it).utf8() ); mCustomForwardMapper->setMapping( action, idx ); @@ -2621,53 +2621,53 @@ void KMMainWidget::setupActions() //----- File Menu mSaveAsAction = new KAction( i18n("Save &As..."), "filesave", KStdAccel::shortcut(KStdAccel::Save), - this, SLOT(slotSaveMsg()), actionCollection(), "file_save_as" ); + this, TQT_SLOT(slotSaveMsg()), actionCollection(), "file_save_as" ); - mOpenAction = KStdAction::open( this, SLOT( slotOpenMsg() ), + mOpenAction = KStdAction::open( this, TQT_SLOT( slotOpenMsg() ), actionCollection() ); (void) new KAction( i18n("&Compact All Folders"), 0, - this, SLOT(slotCompactAll()), + this, TQT_SLOT(slotCompactAll()), actionCollection(), "compact_all_folders" ); (void) new KAction( i18n("&Expire All Folders"), 0, - this, SLOT(slotExpireAll()), + this, TQT_SLOT(slotExpireAll()), actionCollection(), "expire_all_folders" ); (void) new KAction( i18n("&Refresh Local IMAP Cache"), "refresh", - this, SLOT(slotInvalidateIMAPFolders()), + this, TQT_SLOT(slotInvalidateIMAPFolders()), actionCollection(), "file_invalidate_imap_cache" ); (void) new KAction( i18n("Empty All &Trash Folders"), 0, - KMKernel::self(), SLOT(slotEmptyTrash()), + KMKernel::self(), TQT_SLOT(slotEmptyTrash()), actionCollection(), "empty_trash" ); (void) new KAction( i18n("Check &Mail"), "mail_get", CTRL+Key_L, - this, SLOT(slotCheckMail()), + this, TQT_SLOT(slotCheckMail()), actionCollection(), "check_mail" ); mFavoritesCheckMailAction = new KAction( i18n("Check Mail in Favorite Folders"), "mail_get", CTRL+SHIFT+Key_L, 0, 0, actionCollection(), "favorite_check_mail" ); if ( mFavoriteFolderView ) - connect( mFavoritesCheckMailAction, SIGNAL(activated()), mFavoriteFolderView, SLOT(checkMail()) ); + connect( mFavoritesCheckMailAction, TQT_SIGNAL(activated()), mFavoriteFolderView, TQT_SLOT(checkMail()) ); KActionMenu *actActionMenu = new KActionMenu( i18n("Check Mail &In"), "mail_get", actionCollection(), "check_mail_in" ); actActionMenu->setDelayed(true); //needed for checking "all accounts" - connect(actActionMenu,SIGNAL(activated()),this,SLOT(slotCheckMail())); + connect(actActionMenu,TQT_SIGNAL(activated()),this,TQT_SLOT(slotCheckMail())); mActMenu = actActionMenu->popupMenu(); - connect(mActMenu,SIGNAL(activated(int)),this,SLOT(slotCheckOneAccount(int))); - connect(mActMenu,SIGNAL(aboutToShow()),this,SLOT(getAccountMenu())); + connect(mActMenu,TQT_SIGNAL(activated(int)),this,TQT_SLOT(slotCheckOneAccount(int))); + connect(mActMenu,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(getAccountMenu())); (void) new KAction( i18n("&Send Queued Messages"), "mail_send", 0, this, - SLOT(slotSendQueued()), actionCollection(), "send_queued"); + TQT_SLOT(slotSendQueued()), actionCollection(), "send_queued"); (void) new KAction( i18n("Online Status (unknown)"), "online_status", 0, this, - SLOT(slotOnlineStatus()), actionCollection(), "online_status"); + TQT_SLOT(slotOnlineStatus()), actionCollection(), "online_status"); KActionMenu *sendActionMenu = new KActionMenu( i18n("Send Queued Messages Via"), "mail_send_via", actionCollection(), @@ -2675,56 +2675,56 @@ void KMMainWidget::setupActions() sendActionMenu->setDelayed(true); mSendMenu = sendActionMenu->popupMenu(); - connect(mSendMenu,SIGNAL(activated(int)), this, SLOT(slotSendQueuedVia(int))); - connect(mSendMenu,SIGNAL(aboutToShow()),this,SLOT(getTransportMenu())); + connect(mSendMenu,TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSendQueuedVia(int))); + connect(mSendMenu,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(getTransportMenu())); KAction *act; //----- Tools menu if (parent()->inherits("KMMainWin")) { act = new KAction( i18n("&Address Book..."), "contents", 0, this, - SLOT(slotAddrBook()), actionCollection(), "addressbook" ); + TQT_SLOT(slotAddrBook()), actionCollection(), "addressbook" ); if (KStandardDirs::findExe("kaddressbook").isEmpty()) act->setEnabled(false); } act = new KAction( i18n("Certificate Manager..."), "pgp-keys", 0, this, - SLOT(slotStartCertManager()), actionCollection(), "tools_start_certman"); + TQT_SLOT(slotStartCertManager()), actionCollection(), "tools_start_certman"); // disable action if no certman binary is around if (KStandardDirs::findExe("kleopatra").isEmpty()) act->setEnabled(false); act = new KAction( i18n("GnuPG Log Viewer..."), "pgp-keys", 0, this, - SLOT(slotStartWatchGnuPG()), actionCollection(), "tools_start_kwatchgnupg"); + TQT_SLOT(slotStartWatchGnuPG()), actionCollection(), "tools_start_kwatchgnupg"); // disable action if no kwatchgnupg binary is around if (KStandardDirs::findExe("kwatchgnupg").isEmpty()) act->setEnabled(false); act = new KAction( i18n("&Import Messages..."), "fileopen", 0, this, - SLOT(slotImport()), actionCollection(), "import" ); + TQT_SLOT(slotImport()), actionCollection(), "import" ); if (KStandardDirs::findExe("kmailcvt").isEmpty()) act->setEnabled(false); #if !defined(NDEBUG) (void) new KAction( i18n("&Debug Sieve..."), - "idea", 0, this, SLOT(slotDebugSieve()), + "idea", 0, this, TQT_SLOT(slotDebugSieve()), actionCollection(), "tools_debug_sieve" ); #endif if ( GlobalSettings::allowOutOfOfficeSettings() ) { (void) new KAction( i18n("Edit \"Out of Office\" Replies..."), - "configure", 0, this, SLOT(slotEditVacation()), + "configure", 0, this, TQT_SLOT(slotEditVacation()), actionCollection(), "tools_edit_vacation" ); } (void) new KAction( i18n("Filter &Log Viewer..."), 0, this, - SLOT(slotFilterLogViewer()), actionCollection(), "filter_log_viewer" ); + TQT_SLOT(slotFilterLogViewer()), actionCollection(), "filter_log_viewer" ); (void) new KAction( i18n("&Anti-Spam Wizard..."), 0, this, - SLOT(slotAntiSpamWizard()), actionCollection(), "antiSpamWizard" ); + TQT_SLOT(slotAntiSpamWizard()), actionCollection(), "antiSpamWizard" ); (void) new KAction( i18n("&Anti-Virus Wizard..."), 0, this, - SLOT(slotAntiVirusWizard()), actionCollection(), "antiVirusWizard" ); + TQT_SLOT(slotAntiVirusWizard()), actionCollection(), "antiVirusWizard" ); //----- Edit Menu mTrashAction = new KAction( KGuiItem( i18n("&Move to Trash"), "edittrash", i18n("Move message to trashcan") ), - Key_Delete, this, SLOT(slotTrashMsg()), + Key_Delete, this, TQT_SLOT(slotTrashMsg()), actionCollection(), "move_to_trash" ); /* The delete action is nowhere in the gui, by default, so we need to make @@ -2732,105 +2732,105 @@ void KMMainWidget::setupActions() * XMLGui construction or manual ->plug(). This is only a problem when run * as a part, though. */ mDeleteAction = new KAction( i18n("&Delete"), "editdelete", SHIFT+Key_Delete, this, - SLOT(slotDeleteMsg()), actionCollection(), "delete" ); + TQT_SLOT(slotDeleteMsg()), actionCollection(), "delete" ); mDeleteAction->plugAccel( actionCollection()->kaccel() ); mTrashThreadAction = new KAction( KGuiItem( i18n("M&ove Thread to Trash"), "edittrash", i18n("Move thread to trashcan") ), - CTRL+Key_Delete, this, SLOT(slotTrashThread()), + CTRL+Key_Delete, this, TQT_SLOT(slotTrashThread()), actionCollection(), "move_thread_to_trash" ); mDeleteThreadAction = new KAction( i18n("Delete T&hread"), "editdelete", CTRL+SHIFT+Key_Delete, this, - SLOT(slotDeleteThread()), actionCollection(), "delete_thread" ); + TQT_SLOT(slotDeleteThread()), actionCollection(), "delete_thread" ); (void) new KAction( i18n("&Find Messages..."), "mail_find", Key_S, this, - SLOT(slotRequestFullSearchFromQuickSearch()), actionCollection(), "search_messages" ); + TQT_SLOT(slotRequestFullSearchFromQuickSearch()), actionCollection(), "search_messages" ); mFindInMessageAction = new KAction( i18n("&Find in Message..."), "find", KStdAccel::shortcut(KStdAccel::Find), this, - SLOT(slotFind()), actionCollection(), "find_in_messages" ); + TQT_SLOT(slotFind()), actionCollection(), "find_in_messages" ); (void) new KAction( i18n("Select &All Messages"), KStdAccel::selectAll(), this, - SLOT(slotMarkAll()), actionCollection(), "mark_all_messages" ); + TQT_SLOT(slotMarkAll()), actionCollection(), "mark_all_messages" ); //----- Folder Menu mNewFolderAction = new KAction( i18n("&New Folder..."), "folder_new", 0, mFolderTree, - SLOT(addChildFolder()), actionCollection(), "new_folder" ); + TQT_SLOT(addChildFolder()), actionCollection(), "new_folder" ); mModifyFolderAction = new KAction( i18n("&Properties"), "configure", 0, this, - SLOT(slotModifyFolder()), actionCollection(), "modify" ); + TQT_SLOT(slotModifyFolder()), actionCollection(), "modify" ); mFolderMailingListPropertiesAction = new KAction( i18n("&Mailing List Management..."), - /*"folder_mailinglist_properties",*/ 0, this, SLOT( slotFolderMailingListProperties() ), + /*"folder_mailinglist_properties",*/ 0, this, TQT_SLOT( slotFolderMailingListProperties() ), actionCollection(), "folder_mailinglist_properties" ); mFolderShortCutCommandAction = new KAction( i18n("&Assign Shortcut..."), "configure_shortcuts", - 0, this, SLOT( slotFolderShortcutCommand() ), actionCollection(), + 0, this, TQT_SLOT( slotFolderShortcutCommand() ), actionCollection(), "folder_shortcut_command" ); mMarkAllAsReadAction = new KAction( i18n("Mark All Messages as &Read"), "goto", 0, this, - SLOT(slotMarkAllAsRead()), actionCollection(), "mark_all_as_read" ); + TQT_SLOT(slotMarkAllAsRead()), actionCollection(), "mark_all_as_read" ); - mExpireFolderAction = new KAction(i18n("&Expiration Settings"), 0, this, SLOT(slotExpireFolder()), + mExpireFolderAction = new KAction(i18n("&Expiration Settings"), 0, this, TQT_SLOT(slotExpireFolder()), actionCollection(), "expire"); mCompactFolderAction = new KAction( i18n("&Compact Folder"), 0, this, - SLOT(slotCompactFolder()), actionCollection(), "compact" ); + TQT_SLOT(slotCompactFolder()), actionCollection(), "compact" ); mRefreshFolderAction = new KAction( i18n("Check Mail &in This Folder"), "reload", KStdAccel::shortcut( KStdAccel::Reload ), this, - SLOT(slotRefreshFolder()), + TQT_SLOT(slotRefreshFolder()), actionCollection(), "refresh_folder" ); mTroubleshootFolderAction = 0; // set in initializeIMAPActions mEmptyFolderAction = new KAction( "foo" /*set in updateFolderMenu*/, "edittrash", 0, this, - SLOT(slotEmptyFolder()), actionCollection(), "empty" ); + TQT_SLOT(slotEmptyFolder()), actionCollection(), "empty" ); mRemoveFolderAction = new KAction( "foo" /*set in updateFolderMenu*/, "editdelete", 0, this, - SLOT(slotRemoveFolder()), actionCollection(), "delete_folder" ); + TQT_SLOT(slotRemoveFolder()), actionCollection(), "delete_folder" ); mPreferHtmlAction = new KToggleAction( i18n("Prefer &HTML to Plain Text"), 0, this, - SLOT(slotOverrideHtml()), actionCollection(), "prefer_html" ); + TQT_SLOT(slotOverrideHtml()), actionCollection(), "prefer_html" ); mPreferHtmlLoadExtAction = new KToggleAction( i18n("Load E&xternal References"), 0, this, - SLOT(slotOverrideHtmlLoadExt()), actionCollection(), "prefer_html_external_refs" ); + TQT_SLOT(slotOverrideHtmlLoadExt()), actionCollection(), "prefer_html_external_refs" ); mThreadMessagesAction = new KToggleAction( i18n("&Thread Messages"), 0, this, - SLOT(slotOverrideThread()), actionCollection(), "thread_messages" ); + TQT_SLOT(slotOverrideThread()), actionCollection(), "thread_messages" ); mThreadBySubjectAction = new KToggleAction( i18n("Thread Messages also by &Subject"), 0, this, - SLOT(slotToggleSubjectThreading()), actionCollection(), "thread_messages_by_subject" ); + TQT_SLOT(slotToggleSubjectThreading()), actionCollection(), "thread_messages_by_subject" ); new KAction( i18n("Copy Folder"), "editcopy", SHIFT+CTRL+Key_C, folderTree(), - SLOT(copyFolder()), actionCollection(), "copy_folder" ); + TQT_SLOT(copyFolder()), actionCollection(), "copy_folder" ); new KAction( i18n("Cut Folder"), "editcut", SHIFT+CTRL+Key_X, folderTree(), - SLOT(cutFolder()), actionCollection(), "cut_folder" ); + TQT_SLOT(cutFolder()), actionCollection(), "cut_folder" ); new KAction( i18n("Paste Folder"), "editpaste", SHIFT+CTRL+Key_V, folderTree(), - SLOT(pasteFolder()), actionCollection(), "paste_folder" ); + TQT_SLOT(pasteFolder()), actionCollection(), "paste_folder" ); new KAction( i18n("Copy Messages"), "editcopy", ALT+CTRL+Key_C, headers(), - SLOT(copyMessages()), actionCollection(), "copy_messages" ); + TQT_SLOT(copyMessages()), actionCollection(), "copy_messages" ); new KAction( i18n("Cut Messages"), "editcut", ALT+CTRL+Key_X, headers(), - SLOT(cutMessages()), actionCollection(), "cut_messages" ); + TQT_SLOT(cutMessages()), actionCollection(), "cut_messages" ); new KAction( i18n("Paste Messages"), "editpaste", ALT+CTRL+Key_V, headers(), - SLOT(pasteMessages()), actionCollection(), "paste_messages" ); + TQT_SLOT(pasteMessages()), actionCollection(), "paste_messages" ); //----- Message Menu (void) new KAction( i18n("&New Message..."), "mail_new", KStdAccel::shortcut(KStdAccel::New), this, - SLOT(slotCompose()), actionCollection(), "new_message" ); + TQT_SLOT(slotCompose()), actionCollection(), "new_message" ); mTemplateMenu = new KActionMenu( i18n("New Message From &Template"), "filenew", actionCollection(), "new_from_template" ); mTemplateMenu->setDelayed( true ); - connect( mTemplateMenu->popupMenu(), SIGNAL( aboutToShow() ), this, - SLOT( slotShowNewFromTemplate() ) ); - connect( mTemplateMenu->popupMenu(), SIGNAL( activated(int) ), this, - SLOT( slotNewFromTemplate(int) ) ); + connect( mTemplateMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, + TQT_SLOT( slotShowNewFromTemplate() ) ); + connect( mTemplateMenu->popupMenu(), TQT_SIGNAL( activated(int) ), this, + TQT_SLOT( slotNewFromTemplate(int) ) ); KAction* newToML = new KAction( i18n("New Message t&o Mailing-List..."), "mail_post_to", CTRL+SHIFT+Key_N, this, - SLOT(slotPostToML()), actionCollection(), "post_message" ); + TQT_SLOT(slotPostToML()), actionCollection(), "post_message" ); newToML->plugAccel( actionCollection()->kaccel() ); mForwardActionMenu = new KActionMenu( i18n("Message->","&Forward"), @@ -2839,25 +2839,25 @@ void KMMainWidget::setupActions() mForwardInlineAction = new KAction( i18n("&Inline..."), "mail_forward", 0, this, - SLOT(slotForwardInlineMsg()), + TQT_SLOT(slotForwardInlineMsg()), actionCollection(), "message_forward_inline" ); mForwardAttachedAction = new KAction( i18n("Message->Forward->","As &Attachment..."), "mail_forward", 0, this, - SLOT(slotForwardAttachedMsg()), + TQT_SLOT(slotForwardAttachedMsg()), actionCollection(), "message_forward_as_attachment" ); mForwardDigestAction = new KAction( i18n("Message->Forward->","As Di&gest..."), "mail_forward", 0, this, - SLOT(slotForwardDigestMsg()), + TQT_SLOT(slotForwardDigestMsg()), actionCollection(), "message_forward_as_digest" ); mRedirectAction = new KAction( i18n("Message->Forward->","&Redirect..."), "mail_forward", Key_E, this, - SLOT(slotRedirectMsg()), + TQT_SLOT(slotRedirectMsg()), actionCollection(), "message_forward_redirect" ); @@ -2867,53 +2867,53 @@ void KMMainWidget::setupActions() mForwardActionMenu->insert( mForwardAttachedAction ); mForwardInlineAction->setShortcut( Key_F ); mForwardAttachedAction->setShortcut( SHIFT+Key_F ); - connect( mForwardActionMenu, SIGNAL(activated()), this, - SLOT(slotForwardInlineMsg()) ); + connect( mForwardActionMenu, TQT_SIGNAL(activated()), this, + TQT_SLOT(slotForwardInlineMsg()) ); } else { mForwardActionMenu->insert( mForwardAttachedAction ); mForwardActionMenu->insert( mForwardInlineAction ); mForwardInlineAction->setShortcut( SHIFT+Key_F ); mForwardAttachedAction->setShortcut( Key_F ); - connect( mForwardActionMenu, SIGNAL(activated()), this, - SLOT(slotForwardAttachedMsg()) ); + connect( mForwardActionMenu, TQT_SIGNAL(activated()), this, + TQT_SLOT(slotForwardAttachedMsg()) ); } mForwardActionMenu->insert( mForwardDigestAction ); mForwardActionMenu->insert( mRedirectAction ); mSendAgainAction = new KAction( i18n("Send A&gain..."), 0, this, - SLOT(slotResendMsg()), actionCollection(), "send_again" ); + TQT_SLOT(slotResendMsg()), actionCollection(), "send_again" ); //----- Create filter actions mFilterMenu = new KActionMenu( i18n("&Create Filter"), "filter", actionCollection(), "create_filter" ); - connect( mFilterMenu, SIGNAL(activated()), this, - SLOT(slotFilter()) ); + connect( mFilterMenu, TQT_SIGNAL(activated()), this, + TQT_SLOT(slotFilter()) ); mSubjectFilterAction = new KAction( i18n("Filter on &Subject..."), 0, this, - SLOT(slotSubjectFilter()), + TQT_SLOT(slotSubjectFilter()), actionCollection(), "subject_filter"); mFilterMenu->insert( mSubjectFilterAction ); mFromFilterAction = new KAction( i18n("Filter on &From..."), 0, this, - SLOT(slotFromFilter()), + TQT_SLOT(slotFromFilter()), actionCollection(), "from_filter"); mFilterMenu->insert( mFromFilterAction ); mToFilterAction = new KAction( i18n("Filter on &To..."), 0, this, - SLOT(slotToFilter()), + TQT_SLOT(slotToFilter()), actionCollection(), "to_filter"); mFilterMenu->insert( mToFilterAction ); mListFilterAction = new KAction( i18n("Filter on Mailing-&List..."), 0, this, - SLOT(slotMailingListFilter()), actionCollection(), + TQT_SLOT(slotMailingListFilter()), actionCollection(), "mlist_filter"); mFilterMenu->insert( mListFilterAction ); - mPrintAction = KStdAction::print (this, SLOT(slotPrintMsg()), actionCollection()); + mPrintAction = KStdAction::print (this, TQT_SLOT(slotPrintMsg()), actionCollection()); mUseAction = new KAction( i18n("New Message From &Template"), "filenew", - Key_N, this, SLOT( slotUseTemplate() ), + Key_N, this, TQT_SLOT( slotUseTemplate() ), actionCollection(), "use_template" ); mUseAction->plugAccel( actionCollection()->kaccel() ); @@ -2923,19 +2923,19 @@ void KMMainWidget::setupActions() mMarkThreadAsReadAction = new KAction(KGuiItem(i18n("Mark Thread as &Read"), "kmmsgread", i18n("Mark all messages in the selected thread as read")), - 0, this, SLOT(slotSetThreadStatusRead()), + 0, this, TQT_SLOT(slotSetThreadStatusRead()), actionCollection(), "thread_read"); mThreadStatusMenu->insert( mMarkThreadAsReadAction ); mMarkThreadAsNewAction = new KAction(KGuiItem(i18n("Mark Thread as &New"), "kmmsgnew", i18n("Mark all messages in the selected thread as new")), - 0, this, SLOT(slotSetThreadStatusNew()), + 0, this, TQT_SLOT(slotSetThreadStatusNew()), actionCollection(), "thread_new"); mThreadStatusMenu->insert( mMarkThreadAsNewAction ); mMarkThreadAsUnreadAction = new KAction(KGuiItem(i18n("Mark Thread as &Unread"), "kmmsgunseen", i18n("Mark all messages in the selected thread as unread")), - 0, this, SLOT(slotSetThreadStatusUnread()), + 0, this, TQT_SLOT(slotSetThreadStatusUnread()), actionCollection(), "thread_unread"); mThreadStatusMenu->insert( mMarkThreadAsUnreadAction ); @@ -2943,24 +2943,24 @@ void KMMainWidget::setupActions() //----- "Mark Thread" toggle actions mToggleThreadFlagAction = new KToggleAction(i18n("Mark Thread as &Important"), "mail_flag", - 0, this, SLOT(slotSetThreadStatusFlag()), + 0, this, TQT_SLOT(slotSetThreadStatusFlag()), actionCollection(), "thread_flag"); mToggleThreadFlagAction->setCheckedState( i18n("Remove &Important Thread Mark") ); mThreadStatusMenu->insert( mToggleThreadFlagAction ); mToggleThreadTodoAction = new KToggleAction(i18n("Mark Thread as &Action Item"), "mail_todo", - 0, this, SLOT(slotSetThreadStatusTodo()), + 0, this, TQT_SLOT(slotSetThreadStatusTodo()), actionCollection(), "thread_todo"); mToggleThreadTodoAction->setCheckedState( i18n("Remove &Action Item Thread Mark") ); mThreadStatusMenu->insert( mToggleThreadTodoAction ); //------- "Watch and ignore thread" actions mWatchThreadAction = new KToggleAction(i18n("&Watch Thread"), "kmmsgwatched", - 0, this, SLOT(slotSetThreadStatusWatched()), + 0, this, TQT_SLOT(slotSetThreadStatusWatched()), actionCollection(), "thread_watched"); mIgnoreThreadAction = new KToggleAction(i18n("&Ignore Thread"), "mail_ignore", - 0, this, SLOT(slotSetThreadStatusIgnored()), + 0, this, TQT_SLOT(slotSetThreadStatusIgnored()), actionCollection(), "thread_ignored"); mThreadStatusMenu->insert( new KActionSeparator( this ) ); @@ -2968,7 +2968,7 @@ void KMMainWidget::setupActions() mThreadStatusMenu->insert( mIgnoreThreadAction ); mSaveAttachmentsAction = new KAction( i18n("Save A&ttachments..."), "attach", - 0, this, SLOT(slotSaveAttachments()), + 0, this, TQT_SLOT(slotSaveAttachments()), actionCollection(), "file_save_attachments" ); mMoveActionMenu = new KActionMenu( i18n("&Move To" ), @@ -2979,7 +2979,7 @@ void KMMainWidget::setupActions() mApplyAllFiltersAction = new KAction( i18n("Appl&y All Filters"), "filter", CTRL+Key_J, this, - SLOT(slotApplyFilters()), + TQT_SLOT(slotApplyFilters()), actionCollection(), "apply_filters" ); mApplyFilterActionsMenu = new KActionMenu( i18n("A&pply Filter" ), @@ -2994,158 +2994,158 @@ void KMMainWidget::setupActions() unreadMenu->setToolTip( i18n("Choose how to display the count of unread messages") ); mUnreadColumnToggle = new KRadioAction( i18n("View->Unread Count", "View in &Separate Column"), 0, this, - SLOT(slotToggleUnread()), + TQT_SLOT(slotToggleUnread()), actionCollection(), "view_unread_column" ); mUnreadColumnToggle->setExclusiveGroup( "view_unread_group" ); unreadMenu->insert( mUnreadColumnToggle ); mUnreadTextToggle = new KRadioAction( i18n("View->Unread Count", "View After &Folder Name"), 0, this, - SLOT(slotToggleUnread()), + TQT_SLOT(slotToggleUnread()), actionCollection(), "view_unread_text" ); mUnreadTextToggle->setExclusiveGroup( "view_unread_group" ); unreadMenu->insert( mUnreadTextToggle ); // toggle for total column mTotalColumnToggle = new KToggleAction( i18n("View->", "&Total Column"), 0, this, - SLOT(slotToggleTotalColumn()), + TQT_SLOT(slotToggleTotalColumn()), actionCollection(), "view_columns_total" ); mTotalColumnToggle->setToolTip( i18n("Toggle display of column showing the " "total number of messages in folders.") ); mSizeColumnToggle = new KToggleAction( i18n("View->", "&Size Column"), 0, this, - SLOT(slotToggleSizeColumn()), + TQT_SLOT(slotToggleSizeColumn()), actionCollection(), "view_columns_size" ); mSizeColumnToggle->setToolTip( i18n("Toggle display of column showing the " "total size of messages in folders.") ); - (void)new KAction( KGuiItem( i18n("View->","&Expand Thread"), QString::null, + (void)new KAction( KGuiItem( i18n("View->","&Expand Thread"), TQString::null, i18n("Expand the current thread") ), Key_Period, this, - SLOT(slotExpandThread()), + TQT_SLOT(slotExpandThread()), actionCollection(), "expand_thread" ); - (void)new KAction( KGuiItem( i18n("View->","&Collapse Thread"), QString::null, + (void)new KAction( KGuiItem( i18n("View->","&Collapse Thread"), TQString::null, i18n("Collapse the current thread") ), Key_Comma, this, - SLOT(slotCollapseThread()), + TQT_SLOT(slotCollapseThread()), actionCollection(), "collapse_thread" ); - (void)new KAction( KGuiItem( i18n("View->","Ex&pand All Threads"), QString::null, + (void)new KAction( KGuiItem( i18n("View->","Ex&pand All Threads"), TQString::null, i18n("Expand all threads in the current folder") ), CTRL+Key_Period, this, - SLOT(slotExpandAllThreads()), + TQT_SLOT(slotExpandAllThreads()), actionCollection(), "expand_all_threads" ); - (void)new KAction( KGuiItem( i18n("View->","C&ollapse All Threads"), QString::null, + (void)new KAction( KGuiItem( i18n("View->","C&ollapse All Threads"), TQString::null, i18n("Collapse all threads in the current folder") ), CTRL+Key_Comma, this, - SLOT(slotCollapseAllThreads()), + TQT_SLOT(slotCollapseAllThreads()), actionCollection(), "collapse_all_threads" ); mViewSourceAction = new KAction( i18n("&View Source"), Key_V, this, - SLOT(slotShowMsgSrc()), actionCollection(), + TQT_SLOT(slotShowMsgSrc()), actionCollection(), "view_source" ); KAction* dukeOfMonmoth = new KAction( i18n("&Display Message"), Key_Return, this, - SLOT( slotDisplayCurrentMessage() ), actionCollection(), + TQT_SLOT( slotDisplayCurrentMessage() ), actionCollection(), "display_message" ); dukeOfMonmoth->plugAccel( actionCollection()->kaccel() ); //----- Go Menu - new KAction( KGuiItem( i18n("&Next Message"), QString::null, + new KAction( KGuiItem( i18n("&Next Message"), TQString::null, i18n("Go to the next message") ), - "N;Right", this, SLOT(slotNextMessage()), + "N;Right", this, TQT_SLOT(slotNextMessage()), actionCollection(), "go_next_message" ); new KAction( KGuiItem( i18n("Next &Unread Message"), - QApplication::reverseLayout() ? "previous" : "next", + TQApplication::reverseLayout() ? "previous" : "next", i18n("Go to the next unread message") ), - Key_Plus, this, SLOT(slotNextUnreadMessage()), + Key_Plus, this, TQT_SLOT(slotNextUnreadMessage()), actionCollection(), "go_next_unread_message" ); /* ### needs better support from folders: - new KAction( KGuiItem( i18n("Next &Important Message"), QString::null, + new KAction( KGuiItem( i18n("Next &Important Message"), TQString::null, i18n("Go to the next important message") ), - 0, this, SLOT(slotNextImportantMessage()), + 0, this, TQT_SLOT(slotNextImportantMessage()), actionCollection(), "go_next_important_message" ); */ - new KAction( KGuiItem( i18n("&Previous Message"), QString::null, + new KAction( KGuiItem( i18n("&Previous Message"), TQString::null, i18n("Go to the previous message") ), - "P;Left", this, SLOT(slotPrevMessage()), + "P;Left", this, TQT_SLOT(slotPrevMessage()), actionCollection(), "go_prev_message" ); new KAction( KGuiItem( i18n("Previous Unread &Message"), - QApplication::reverseLayout() ? "next" : "previous", + TQApplication::reverseLayout() ? "next" : "previous", i18n("Go to the previous unread message") ), - Key_Minus, this, SLOT(slotPrevUnreadMessage()), + Key_Minus, this, TQT_SLOT(slotPrevUnreadMessage()), actionCollection(), "go_prev_unread_message" ); /* needs better support from folders: - new KAction( KGuiItem( i18n("Previous I&mportant Message"), QString::null, + new KAction( KGuiItem( i18n("Previous I&mportant Message"), TQString::null, i18n("Go to the previous important message") ), - 0, this, SLOT(slotPrevImportantMessage()), + 0, this, TQT_SLOT(slotPrevImportantMessage()), actionCollection(), "go_prev_important_message" ); */ KAction *action = - new KAction( KGuiItem( i18n("Next Unread &Folder"), QString::null, + new KAction( KGuiItem( i18n("Next Unread &Folder"), TQString::null, i18n("Go to the next folder with unread messages") ), - ALT+Key_Plus, this, SLOT(slotNextUnreadFolder()), + ALT+Key_Plus, this, TQT_SLOT(slotNextUnreadFolder()), actionCollection(), "go_next_unread_folder" ); KShortcut shortcut = action->shortcut(); shortcut.append( KKey( CTRL+Key_Plus ) ); action->setShortcut( shortcut ); action = - new KAction( KGuiItem( i18n("Previous Unread F&older"), QString::null, + new KAction( KGuiItem( i18n("Previous Unread F&older"), TQString::null, i18n("Go to the previous folder with unread messages") ), - ALT+Key_Minus, this, SLOT(slotPrevUnreadFolder()), + ALT+Key_Minus, this, TQT_SLOT(slotPrevUnreadFolder()), actionCollection(), "go_prev_unread_folder" ); shortcut = action->shortcut(); shortcut.append( KKey( CTRL+Key_Minus ) ); action->setShortcut( shortcut ); - new KAction( KGuiItem( i18n("Go->","Next Unread &Text"), QString::null, + new KAction( KGuiItem( i18n("Go->","Next Unread &Text"), TQString::null, i18n("Go to the next unread text"), i18n("Scroll down current message. " "If at end of current message, " "go to next unread message.") ), - Key_Space, this, SLOT(slotReadOn()), + Key_Space, this, TQT_SLOT(slotReadOn()), actionCollection(), "go_next_unread_text" ); //----- Settings Menu (void) new KAction( i18n("Configure &Filters..."), 0, this, - SLOT(slotFilter()), actionCollection(), "filter" ); + TQT_SLOT(slotFilter()), actionCollection(), "filter" ); (void) new KAction( i18n("Configure &POP Filters..."), 0, this, - SLOT(slotPopFilter()), actionCollection(), "popFilter" ); + TQT_SLOT(slotPopFilter()), actionCollection(), "popFilter" ); (void) new KAction( i18n("Manage &Sieve Scripts..."), 0, this, - SLOT(slotManageSieveScripts()), actionCollection(), "sieveFilters" ); + TQT_SLOT(slotManageSieveScripts()), actionCollection(), "sieveFilters" ); (void) new KAction( KGuiItem( i18n("KMail &Introduction"), 0, i18n("Display KMail's Welcome Page") ), - 0, this, SLOT(slotIntro()), + 0, this, TQT_SLOT(slotIntro()), actionCollection(), "help_kmail_welcomepage" ); // ----- Standard Actions -// KStdAction::configureNotifications(this, SLOT(slotEditNotifications()), actionCollection()); +// KStdAction::configureNotifications(this, TQT_SLOT(slotEditNotifications()), actionCollection()); (void) new KAction( i18n("Configure &Notifications..."), "knotify", 0, this, - SLOT(slotEditNotifications()), actionCollection(), + TQT_SLOT(slotEditNotifications()), actionCollection(), "kmail_configure_notifications" ); -// KStdAction::preferences(this, SLOT(slotSettings()), actionCollection()); +// KStdAction::preferences(this, TQT_SLOT(slotSettings()), actionCollection()); (void) new KAction( i18n("&Configure KMail..."), "configure", 0, kmkernel, - SLOT(slotShowConfigurationDialog()), actionCollection(), + TQT_SLOT(slotShowConfigurationDialog()), actionCollection(), "kmail_configure_kmail" ); - KStdAction::undo(this, SLOT(slotUndo()), actionCollection(), "kmail_undo"); + KStdAction::undo(this, TQT_SLOT(slotUndo()), actionCollection(), "kmail_undo"); - KStdAction::tipOfDay( this, SLOT( slotShowTip() ), actionCollection() ); + KStdAction::tipOfDay( this, TQT_SLOT( slotShowTip() ), actionCollection() ); - menutimer = new QTimer( this, "menutimer" ); - connect( menutimer, SIGNAL( timeout() ), SLOT( updateMessageActions() ) ); + menutimer = new TQTimer( this, "menutimer" ); + connect( menutimer, TQT_SIGNAL( timeout() ), TQT_SLOT( updateMessageActions() ) ); connect( kmkernel->undoStack(), - SIGNAL( undoStackChanged() ), this, SLOT( slotUpdateUndo() )); + TQT_SIGNAL( undoStackChanged() ), this, TQT_SLOT( slotUpdateUndo() )); initializeIMAPActions( false ); // don't set state, config not read yet updateMessageActions(); @@ -3155,7 +3155,7 @@ void KMMainWidget::setupActions() void KMMainWidget::setupForwardingActionsList() { - QPtrList<KAction> mForwardActionList; + TQPtrList<KAction> mForwardActionList; if ( GlobalSettings::self()->forwardingInlineByDefault() ) { mGUIClient->unplugActionList( "forward_action_list" ); mForwardActionList.append( mForwardInlineAction ); @@ -3284,10 +3284,10 @@ void KMMainWidget::startUpdateMessageActionsTimer() void KMMainWidget::updateMessageActions() { int count = 0; - QPtrList<QListViewItem> selectedItems; + TQPtrList<TQListViewItem> selectedItems; if ( mFolder ) { - for (QListViewItem *item = mHeaders->firstChild(); item; item = item->itemBelow()) + for (TQListViewItem *item = mHeaders->firstChild(); item; item = item->itemBelow()) if (item->isSelected() ) selectedItems.append(item); if ( selectedItems.isEmpty() && mFolder->count() ) // there will always be one in mMsgView @@ -3306,9 +3306,9 @@ void KMMainWidget::updateMessageActions() bool allSelectedInCommonThread = false; if ( mHeaders->isThreaded() && count > 1 ) { allSelectedInCommonThread = true; - for ( QPtrListIterator<QListViewItem> it( selectedItems ) ; + for ( TQPtrListIterator<TQListViewItem> it( selectedItems ) ; it.current() ; ++ it ) { - QListViewItem * item = *it; + TQListViewItem * item = *it; if ( item->parent()==0 && item->childCount()==0 ) { allSelectedInCommonThread = false; break; @@ -3319,7 +3319,7 @@ void KMMainWidget::updateMessageActions() allSelectedInCommonThread = true; } - QListViewItem *curItemParent = mHeaders->currentItem(); + TQListViewItem *curItemParent = mHeaders->currentItem(); bool parent_thread = 0; if ( curItemParent && curItemParent->firstChild() != 0 ) parent_thread = 1; @@ -3454,7 +3454,7 @@ void KMMainWidget::updateFolderMenu() #ifdef MALLOC_DEBUG -static QString fmt(long n) { +static TQString fmt(long n) { char buf[32]; if(n > 1024*1024*1024) @@ -3465,7 +3465,7 @@ static QString fmt(long n) { sprintf(buf, "%0.2f KB", ((double)n)/1024.0); else sprintf(buf, "%ld Byte", n); - return QString(buf); + return TQString(buf); } #endif @@ -3474,7 +3474,7 @@ void KMMainWidget::slotMemInfo() { struct mallinfo mi; mi = mallinfo(); - QString s = QString("\nMALLOC - Info\n\n" + TQString s = TQString("\nMALLOC - Info\n\n" "Number of mmapped regions : %1\n" "Memory allocated in use : %2\n" "Memory allocated, not used: %3\n" @@ -3512,8 +3512,8 @@ void KMMainWidget::slotShowStartupFolder() mFolderTree->cleanupConfigFile(); } - connect( kmkernel->filterMgr(), SIGNAL( filterListUpdated() ), - this, SLOT( initializeFilterActions() )); + connect( kmkernel->filterMgr(), TQT_SIGNAL( filterListUpdated() ), + this, TQT_SLOT( initializeFilterActions() )); // plug shortcut filter actions now initializeFilterActions(); @@ -3521,7 +3521,7 @@ void KMMainWidget::slotShowStartupFolder() // plug folder shortcut actions initializeFolderShortcutActions(); - QString newFeaturesMD5 = KMReaderWin::newFeaturesMD5(); + TQString newFeaturesMD5 = KMReaderWin::newFeaturesMD5(); if ( kmkernel->firstStart() || GlobalSettings::self()->previousNewFeaturesMD5() != newFeaturesMD5 ) { GlobalSettings::self()->setPreviousNewFeaturesMD5( newFeaturesMD5 ); @@ -3544,16 +3544,16 @@ void KMMainWidget::slotShowStartupFolder() void KMMainWidget::slotShowTip() { - KTipDialog::showTip( this, QString::null, true ); + KTipDialog::showTip( this, TQString::null, true ); } //----------------------------------------------------------------------------- -void KMMainWidget::slotChangeCaption(QListViewItem * i) +void KMMainWidget::slotChangeCaption(TQListViewItem * i) { if ( !i ) return; // set the caption to the current full path - QStringList names; - for ( QListViewItem * item = i ; item ; item = item->parent() ) + TQStringList names; + for ( TQListViewItem * item = i ; item ; item = item->parent() ) names.prepend( item->text(0) ); emit captionChangeRequest( names.join( "/" ) ); } @@ -3565,29 +3565,29 @@ void KMMainWidget::removeDuplicates() return; KMFolder *oFolder = mFolder; mHeaders->setFolder(0); - QMap< QString, QValueList<int> > idMD5s; - QValueList<int> redundantIds; - QValueList<int>::Iterator kt; + TQMap< TQString, TQValueList<int> > idMD5s; + TQValueList<int> redundantIds; + TQValueList<int>::Iterator kt; mFolder->open("removedups"); for (int i = mFolder->count() - 1; i >= 0; --i) { - QString id = (*mFolder)[i]->msgIdMD5(); + TQString id = (*mFolder)[i]->msgIdMD5(); if ( !id.isEmpty() ) { - QString subjMD5 = (*mFolder)[i]->strippedSubjectMD5(); + TQString subjMD5 = (*mFolder)[i]->strippedSubjectMD5(); int other = -1; if ( idMD5s.contains(id) ) other = idMD5s[id].first(); else idMD5s[id].append( i ); if ( other != -1 ) { - QString otherSubjMD5 = (*mFolder)[other]->strippedSubjectMD5(); + TQString otherSubjMD5 = (*mFolder)[other]->strippedSubjectMD5(); if (otherSubjMD5 == subjMD5) idMD5s[id].append( i ); } } } - QMap< QString, QValueList<int> >::Iterator it; + TQMap< TQString, TQValueList<int> >::Iterator it; for ( it = idMD5s.begin(); it != idMD5s.end() ; ++it ) { - QValueList<int>::Iterator jt; + TQValueList<int>::Iterator jt; bool finished = false; for ( jt = (*it).begin(); jt != (*it).end() && !finished; ++jt ) if (!((*mFolder)[*jt]->isUnread())) { @@ -3609,7 +3609,7 @@ void KMMainWidget::removeDuplicates() mFolder->close("removedups"); mHeaders->setFolder(oFolder); - QString msg; + TQString msg; if ( numDuplicates ) msg = i18n("Removed %n duplicate message.", "Removed %n duplicate messages.", numDuplicates ); @@ -3654,8 +3654,8 @@ void KMMainWidget::initializeFolderShortcutActions() bool old = actionCollection()->isAutoConnectShortcuts(); actionCollection()->setAutoConnectShortcuts( true ); - QValueList< QGuardedPtr< KMFolder > > folders = kmkernel->allFolders(); - QValueList< QGuardedPtr< KMFolder > >::Iterator it = folders.begin(); + TQValueList< TQGuardedPtr< KMFolder > > folders = kmkernel->allFolders(); + TQValueList< TQGuardedPtr< KMFolder > >::Iterator it = folders.begin(); while ( it != folders.end() ) { KMFolder *folder = (*it); ++it; @@ -3668,28 +3668,28 @@ void KMMainWidget::initializeFolderShortcutActions() //----------------------------------------------------------------------------- void KMMainWidget::initializeFilterActions() { - QString filterName, normalizedName; + TQString filterName, normalizedName; KMMetaFilterActionCommand *filterCommand; KAction *filterAction = 0; clearFilterActions(); mApplyAllFiltersAction->plug(mApplyFilterActionsMenu->popupMenu()); bool addedSeparator = false; - QValueListConstIterator<KMFilter*> it = kmkernel->filterMgr()->filters().constBegin(); + TQValueListConstIterator<KMFilter*> it = kmkernel->filterMgr()->filters().constBegin(); for ( ;it != kmkernel->filterMgr()->filters().constEnd(); ++it ) { if (!(*it)->isEmpty() && (*it)->configureShortcut()) { - filterName = QString("Filter %1").arg((*it)->name()); + filterName = TQString("Filter %1").arg((*it)->name()); normalizedName = filterName.replace(" ", "_"); if (action(normalizedName.utf8())) continue; filterCommand = new KMMetaFilterActionCommand(*it, mHeaders, this); mFilterCommands.append(filterCommand); - QString as = i18n("Filter %1").arg((*it)->name()); - QString icon = (*it)->icon(); + TQString as = i18n("Filter %1").arg((*it)->name()); + TQString icon = (*it)->icon(); if ( icon.isEmpty() ) icon = "gear"; filterAction = new KAction(as, icon, (*it)->shortcut(), filterCommand, - SLOT(start()), actionCollection(), + TQT_SLOT(start()), actionCollection(), normalizedName.local8Bit()); if(!addedSeparator) { mApplyFilterActionsMenu->popupMenu()->insertSeparator(); @@ -3735,7 +3735,7 @@ void KMMainWidget::initializeIMAPActions( bool setState /* false the first time, if ( !mTroubleshootFolderAction ) { mTroubleshootFolderAction = new KAction( i18n("&Troubleshoot IMAP Cache..."), "wizard", 0, - this, SLOT(slotTroubleshootFolder()), actionCollection(), "troubleshoot_folder" ); + this, TQT_SLOT(slotTroubleshootFolder()), actionCollection(), "troubleshoot_folder" ); if ( setState ) updateFolderMenu(); // set initial state of the action } else { @@ -3767,20 +3767,20 @@ void KMMainWidget::slotShortcutChanged( KMFolder *folder ) FolderShortcutCommand *c = new FolderShortcutCommand( this, folder ); mFolderShortcutCommands.insert( folder->idString(), c ); - QString actionlabel = QString( "FolderShortcut %1").arg( folder->prettyURL() ); - QString actionname = QString( "FolderShortcut %1").arg( folder->idString() ); - QString normalizedName = actionname.replace(" ", "_"); + TQString actionlabel = TQString( "FolderShortcut %1").arg( folder->prettyURL() ); + TQString actionname = TQString( "FolderShortcut %1").arg( folder->idString() ); + TQString normalizedName = actionname.replace(" ", "_"); KAction* action = - new KAction(actionlabel, folder->shortcut(), c, SLOT(start()), + new KAction(actionlabel, folder->shortcut(), c, TQT_SLOT(start()), actionCollection(), normalizedName.local8Bit()); action->setIcon( folder->unreadIconPath() ); c->setAction( action ); // will be deleted along with the command } //----------------------------------------------------------------------------- -QString KMMainWidget::findCurrentImapPath() +TQString KMMainWidget::findCurrentImapPath() { - QString startPath; + TQString startPath; if (!mFolder) return startPath; if (mFolder->folderType() == KMFolderTypeImap) { @@ -3814,7 +3814,7 @@ void KMMainWidget::slotSubscriptionDialog() return; ImapAccountBase* account = findCurrentImapAccountBase(); if ( !account ) return; - const QString startPath = findCurrentImapPath(); + const TQString startPath = findCurrentImapPath(); // KSubscription sets "DestruciveClose" SubscriptionDialog * dialog = @@ -3832,7 +3832,7 @@ void KMMainWidget::slotLocalSubscriptionDialog() ImapAccountBase* account = findCurrentImapAccountBase(); if ( !account ) return; - const QString startPath = findCurrentImapPath(); + const TQString startPath = findCurrentImapPath(); // KSubscription sets "DestruciveClose" LocalSubscriptionDialog *dialog = new LocalSubscriptionDialog(this, i18n("Local Subscription"), account, startPath); @@ -3892,7 +3892,7 @@ void KMMainWidget::slotFilterLogViewer() //----------------------------------------------------------------------------- void KMMainWidget::updateFileMenu() { - QStringList actList = kmkernel->acctMgr()->getAccounts(); + TQStringList actList = kmkernel->acctMgr()->getAccounts(); actionCollection()->action("check_mail")->setEnabled( actList.size() > 0 ); actionCollection()->action("check_mail_in")->setEnabled( actList.size() > 0 ); @@ -3913,7 +3913,7 @@ KMSystemTray *KMMainWidget::systray() const } //----------------------------------------------------------------------------- -QString KMMainWidget::overrideEncoding() const +TQString KMMainWidget::overrideEncoding() const { if ( mMsgView ) return mMsgView->overrideEncoding(); @@ -3934,7 +3934,7 @@ void KMMainWidget::setupFolderView() { if ( GlobalSettings::self()->enableFavoriteFolderView() ) { mFolderView = mFolderViewSplitter; - mSearchAndTree->reparent( mFolderViewSplitter, 0, QPoint( 0, 0 ) ); + mSearchAndTree->reparent( mFolderViewSplitter, 0, TQPoint( 0, 0 ) ); mFolderViewSplitter->show(); mFavoriteFolderView->show(); } else { @@ -3942,7 +3942,7 @@ void KMMainWidget::setupFolderView() mFolderViewSplitter->hide(); mFavoriteFolderView->hide(); } - mFolderView->reparent( mFolderViewParent, 0, QPoint( 0, 0 ) ); + mFolderView->reparent( mFolderViewParent, 0, TQPoint( 0, 0 ) ); mFolderViewParent->moveToFirst( mFolderView ); mSearchAndTree->show(); } @@ -3970,7 +3970,7 @@ void KMMainWidget::updateVactionScriptStatus(bool active) if ( active ) { mVacationScriptIndicator->setText( i18n("Out of office reply active") ); mVacationScriptIndicator->setPaletteBackgroundColor( Qt::yellow ); - mVacationScriptIndicator->setCursor( QCursor( Qt::PointingHandCursor ) ); + mVacationScriptIndicator->setCursor( TQCursor( Qt::PointingHandCursor ) ); mVacationScriptIndicator->show(); } else { mVacationScriptIndicator->hide(); |