From 716a5de8870d7c02bb4d0aed72f30291b17b763a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:59:01 -0600 Subject: Remove additional unneeded tq method conversions --- kmail/kmmainwidget.cpp | 68 +++++++++++++++++++++++++------------------------- 1 file changed, 34 insertions(+), 34 deletions(-) (limited to 'kmail/kmmainwidget.cpp') diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp index 36556a1d..392f348b 100644 --- a/kmail/kmmainwidget.cpp +++ b/kmail/kmmainwidget.cpp @@ -287,13 +287,13 @@ void KMMainWidget::destruct() //----------------------------------------------------------------------------- void KMMainWidget::readPreConfig(void) { - const KConfigGroup tqgeometry( KMKernel::config(), "Geometry" ); + const KConfigGroup geometry( KMKernel::config(), "Geometry" ); const KConfigGroup reader( KMKernel::config(), "Reader" ); - mLongFolderList = tqgeometry.readEntry( "FolderList", "long" ) != "short"; - mReaderWindowActive = tqgeometry.readEntry( "readerWindowMode", "below" ) != "hide"; - mReaderWindowBelow = tqgeometry.readEntry( "readerWindowMode", "below" ) == "below"; - mThreadPref = tqgeometry.readBoolEntry( "nestedMessages", false ); + mLongFolderList = geometry.readEntry( "FolderList", "long" ) != "short"; + mReaderWindowActive = geometry.readEntry( "readerWindowMode", "below" ) != "hide"; + mReaderWindowBelow = geometry.readEntry( "readerWindowMode", "below" ) == "below"; + mThreadPref = geometry.readBoolEntry( "nestedMessages", false ); mHtmlPref = reader.readBoolEntry( "htmlMail", false ); mHtmlLoadExtPref = reader.readBoolEntry( "htmlLoadExternal", false ); @@ -516,7 +516,7 @@ void KMMainWidget::writeConfig(void) { TQString s; KConfig *config = KMKernel::config(); - KConfigGroup tqgeometry( config, "Geometry" ); + KConfigGroup geometry( config, "Geometry" ); if (mMsgView) mMsgView->writeConfig(); @@ -527,24 +527,24 @@ void KMMainWidget::writeConfig(void) if ( mFavoriteFolderView ) mFavoriteFolderView->writeConfig(); - tqgeometry.writeEntry( "MainWin", this->tqgeometry().size() ); + geometry.writeEntry( "MainWin", this->geometry().size() ); const TQValueList widths = ( mLongFolderList ? mPanner1 : mPanner2 )->sizes(); const TQValueList heights = ( mLongFolderList ? mPanner2 : mPanner1 )->sizes(); - tqgeometry.writeEntry( "FolderPaneWidth", widths[0] ); - tqgeometry.writeEntry( "HeaderPaneWidth", widths[1] ); + geometry.writeEntry( "FolderPaneWidth", widths[0] ); + geometry.writeEntry( "HeaderPaneWidth", widths[1] ); // Only save when the widget is shown (to avoid saving a wrong value) if ( mSearchAndHeaders && mSearchAndHeaders->isShown() ) { - tqgeometry.writeEntry( "HeaderPaneHeight", heights[0] ); - tqgeometry.writeEntry( "ReaderPaneHeight", heights[1] ); + geometry.writeEntry( "HeaderPaneHeight", heights[0] ); + geometry.writeEntry( "ReaderPaneHeight", heights[1] ); } // save the state of the unread/total-columns - tqgeometry.writeEntry( "UnreadColumn", mFolderTree->unreadIndex() ); - tqgeometry.writeEntry( "TotalColumn", mFolderTree->totalIndex() ); - tqgeometry.writeEntry( "SizeColumn", mFolderTree->sizeIndex() ); + geometry.writeEntry( "UnreadColumn", mFolderTree->unreadIndex() ); + geometry.writeEntry( "TotalColumn", mFolderTree->totalIndex() ); + geometry.writeEntry( "SizeColumn", mFolderTree->sizeIndex() ); } @@ -950,7 +950,7 @@ void KMMainWidget::slotMailChecked( bool newMail, bool sendOnCheck, summary += "
" + i18n( "1 new message in %1", "%n new messages in %1", newInFolder.find( *it ).data() ) - .tqarg( folder->prettyURL() ); + .arg( folder->prettyURL() ); } } } @@ -965,7 +965,7 @@ void KMMainWidget::slotMailChecked( bool newMail, bool sendOnCheck, if ( GlobalSettings::self()->verboseNewMailNotification() ) { summary = i18n( "%1 is a list of the number of new messages per folder", "New mail arrived
%1" ) - .tqarg( summary ); + .arg( summary ); } else { summary = i18n( "New mail arrived" ); @@ -1097,7 +1097,7 @@ void KMMainWidget::modifyFolder( KMFolderTreeItem* folderItem ) KMFolder* folder = folderItem->folder(); KMFolderTree* folderTree = static_cast( folderItem->listView() ); KMFolderDialog props( folder, folder->parent(), folderTree, - i18n("Properties of Folder %1").tqarg( folder->label() ) ); + i18n("Properties of Folder %1").arg( folder->label() ) ); props.exec(); updateFolderMenu(); //Kolab issue 2152 @@ -1129,7 +1129,7 @@ void KMMainWidget::slotExpireFolder() KConfigGroupSaver saver(config, "General"); if (config->readBoolEntry("warn-before-expire", true)) { - str = i18n("Are you sure you want to expire the folder %1?").tqarg(TQStyleSheet::escape( mFolder->label() )); + str = i18n("Are you sure you want to expire the folder %1?").arg(TQStyleSheet::escape( mFolder->label() )); if (KMessageBox::warningContinueCancel(this, str, i18n("Expire Folder"), i18n("&Expire")) != KMessageBox::Continue) return; @@ -1152,7 +1152,7 @@ void KMMainWidget::slotEmptyFolder() TQString text = (isTrash) ? i18n("Are you sure you want to empty the trash folder?") : i18n("Are you sure you want to move all messages from " - "folder %1 to the trash?").tqarg( TQStyleSheet::escape( mFolder->label() ) ); + "folder %1 to the trash?").arg( TQStyleSheet::escape( mFolder->label() ) ); if (KMessageBox::warningContinueCancel(this, text, title, KGuiItem( title, "edittrash")) != KMessageBox::Continue) return; @@ -1170,7 +1170,7 @@ void KMMainWidget::slotEmptyFolder() if (mMsgView) mMsgView->clearCache(); if ( !isTrash ) - BroadcastStatus::instance()->seStatusMsg(i18n("Moved all messages to the trash")); + BroadcastStatus::instance()->setStatusMsg(i18n("Moved all messages to the trash")); updateMessageActions(); @@ -1209,14 +1209,14 @@ void KMMainWidget::slotRemoveFolder() title = i18n("Delete Search"); str = i18n("Are you sure you want to delete the search %1?
" "Any messages it shows will still be available in their original folder.") - .tqarg( TQStyleSheet::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("Are you sure you want to delete the empty folder " "%1?") - .tqarg( TQStyleSheet::escape( mFolder->label() ) ); + .arg( TQStyleSheet::escape( mFolder->label() ) ); } else { str = i18n("Are you sure you want to delete the empty folder " @@ -1224,7 +1224,7 @@ void KMMainWidget::slotRemoveFolder() "not be empty and their contents will be discarded as well. " "

Beware that discarded messages are not saved " "into your Trash folder and are permanently deleted.") - .tqarg( TQStyleSheet::escape( mFolder->label() ) ); + .arg( TQStyleSheet::escape( mFolder->label() ) ); } } else { if ( !mFolder->child() || mFolder->child()->isEmpty() ) { @@ -1232,14 +1232,14 @@ void KMMainWidget::slotRemoveFolder() "%1, discarding its contents? " "

Beware that discarded messages are not saved " "into your Trash folder and are permanently deleted.") - .tqarg( TQStyleSheet::escape( mFolder->label() ) ); + .arg( TQStyleSheet::escape( mFolder->label() ) ); } else { str = i18n("Are you sure you want to delete the folder %1 " "and all its subfolders, discarding their contents? " "

Beware that discarded messages are not saved " "into your Trash folder and are permanently deleted.") - .tqarg( TQStyleSheet::escape( mFolder->label() ) ); + .arg( TQStyleSheet::escape( mFolder->label() ) ); } } } @@ -1270,7 +1270,7 @@ void KMMainWidget::slotCompactFolder() // setCurrentItemByIndex will override the statusbar message, so save/restore it TQString statusMsg = BroadcastStatus::instance()->statusMsg(); mHeaders->setCurrentItemByIndex(idx); - BroadcastStatus::instance()->seStatusMsg( statusMsg ); + BroadcastStatus::instance()->setStatusMsg( statusMsg ); } } @@ -1636,7 +1636,7 @@ void KMMainWidget::updateListFilterAction() mListFilterAction->setEnabled( false ); else { mListFilterAction->setEnabled( true ); - mListFilterAction->setText( i18n( "Filter on Mailing-List %1..." ).tqarg( lname ) ); + mListFilterAction->setText( i18n( "Filter on Mailing-List %1..." ).arg( lname ) ); } } @@ -3514,8 +3514,8 @@ void KMMainWidget::slotMemInfo() { "Memory allocated, not used: %3\n" "Memory total allocated : %4\n" "Max. freeable memory : %5\n") - .tqarg(mi.hblks).tqarg(fmt(mi.uordblks)).tqarg(fmt(mi.fordblks)) - .tqarg(fmt(mi.arena)).tqarg(fmt(mi.keepcost)); + .arg(mi.hblks).arg(fmt(mi.uordblks)).arg(fmt(mi.fordblks)) + .arg(fmt(mi.arena)).arg(fmt(mi.keepcost)); KMessageBox::information(0, s, "Malloc information", s); #endif } @@ -3649,7 +3649,7 @@ void KMMainWidget::removeDuplicates() "Removed %n duplicate messages.", numDuplicates ); else msg = i18n("No duplicate messages found."); - BroadcastStatus::instance()->seStatusMsg( msg ); + BroadcastStatus::instance()->setStatusMsg( msg ); } @@ -3712,13 +3712,13 @@ void KMMainWidget::initializeFilterActions() TQValueListConstIterator it = kmkernel->filterMgr()->filters().constBegin(); for ( ;it != kmkernel->filterMgr()->filters().constEnd(); ++it ) { if (!(*it)->isEmpty() && (*it)->configureShortcut()) { - filterName = TQString("Filter %1").tqarg((*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); - TQString as = i18n("Filter %1").tqarg((*it)->name()); + TQString as = i18n("Filter %1").arg((*it)->name()); TQString icon = (*it)->icon(); if ( icon.isEmpty() ) icon = "gear"; @@ -3801,8 +3801,8 @@ void KMMainWidget::slotShortcutChanged( KMFolder *folder ) FolderShortcutCommand *c = new FolderShortcutCommand( this, folder ); mFolderShortcutCommands.insert( folder->idString(), c ); - TQString actionlabel = TQString( "FolderShortcut %1").tqarg( folder->prettyURL() ); - TQString actionname = TQString( "FolderShortcut %1").tqarg( folder->idString() ); + 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, TQT_SLOT(start()), -- cgit v1.2.3