summaryrefslogtreecommitdiffstats
path: root/kmail/kmmainwidget.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kmail/kmmainwidget.cpp')
-rw-r--r--kmail/kmmainwidget.cpp44
1 files changed, 22 insertions, 22 deletions
diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp
index fd41d4a8..a32c61c9 100644
--- a/kmail/kmmainwidget.cpp
+++ b/kmail/kmmainwidget.cpp
@@ -939,7 +939,7 @@ void KMMainWidget::slotMailChecked( bool newMail, bool sendOnCheck,
for ( TQStringList::const_iterator it = keys.begin();
it != keys.end();
++it ) {
- kdDebug(5006) << newInFolder.tqfind( *it ).data() << " new message(s) in "
+ kdDebug(5006) << newInFolder.find( *it ).data() << " new message(s) in "
<< *it << endl;
KMFolder *folder = kmkernel->findFolderById( *it );
@@ -949,7 +949,7 @@ void KMMainWidget::slotMailChecked( bool newMail, bool sendOnCheck,
if ( GlobalSettings::self()->verboseNewMailNotification() ) {
summary += "<br>" + i18n( "1 new message in %1",
"%n new messages in %1",
- newInFolder.tqfind( *it ).data() )
+ newInFolder.find( *it ).data() )
.tqarg( folder->prettyURL() );
}
}
@@ -1028,7 +1028,7 @@ void KMMainWidget::slotShowNewFromTemplate()
TQString subj = mb->subject();
if ( subj.isEmpty() ) subj = i18n("No Subject");
mTemplateMenu->popupMenu()->insertItem(
- KStringHandler::rsqueeze( subj.tqreplace( "&", "&&" ) ), idx );
+ KStringHandler::rsqueeze( subj.replace( "&", "&&" ) ), idx );
}
}
@@ -2165,7 +2165,7 @@ void KMMainWidget::slotSelectFolder(KMFolder* folder)
//-----------------------------------------------------------------------------
void KMMainWidget::slotSelectMessage(KMMessage* msg)
{
- int idx = mFolder->tqfind(msg);
+ int idx = mFolder->find(msg);
if (idx != -1) {
mHeaders->setCurrentMsg(idx);
if (mMsgView)
@@ -2189,9 +2189,9 @@ void KMMainWidget::slotReplaceMsgByUnencryptedVersion()
{
TQString msgId( oldMsg->msgId() );
TQString prefix("DecryptedMsg.");
- int oldIdx = msgId.tqfind(prefix, 0, false);
+ int oldIdx = msgId.find(prefix, 0, false);
if( -1 == oldIdx ) {
- int leftAngle = msgId.tqfindRev( '<' );
+ int leftAngle = msgId.findRev( '<' );
msgId = msgId.insert( (-1 == leftAngle) ? 0 : ++leftAngle, prefix );
}
else {
@@ -2210,12 +2210,12 @@ void KMMainWidget::slotReplaceMsgByUnencryptedVersion()
kdDebug(5006) << "KMMainWidget - adding unencrypted message to folder" << endl;
mFolder->addMsg( newMsg );
/* Figure out its index in the folder for selecting. This must be count()-1,
- * since we append. Be safe and do tqfind, though, just in case. */
- int newMsgIdx = mFolder->tqfind( newMsg );
+ * since we append. Be safe and do find, though, just in case. */
+ int newMsgIdx = mFolder->find( newMsg );
Q_ASSERT( newMsgIdx != -1 );
/* we need this unget, to have the message displayed correctly initially */
mFolder->unGetMsg( newMsgIdx );
- int idx = mFolder->tqfind( oldMsg );
+ int idx = mFolder->find( oldMsg );
Q_ASSERT( idx != -1 );
/* only select here, so the old one is not un-Gotten before, which would
* render the pointer we hold invalid so that find would fail */
@@ -2468,7 +2468,7 @@ void KMMainWidget::getAccountMenu()
TQStringList::Iterator it;
int id = 0;
for(it = actList.begin(); it != actList.end() ; ++it, id++)
- mActMenu->insertItem((*it).tqreplace("&", "&&"), id);
+ mActMenu->insertItem((*it).replace("&", "&&"), id);
}
//-----------------------------------------------------------------------------
@@ -2481,7 +2481,7 @@ void KMMainWidget::getTransportMenu()
TQStringList::Iterator it;
int id = 0;
for(it = availTransports.begin(); it != availTransports.end() ; ++it, id++)
- mSendMenu->insertItem((*it).tqreplace("&", "&&"), id);
+ mSendMenu->insertItem((*it).replace("&", "&&"), id);
}
//-----------------------------------------------------------------------------
@@ -2545,7 +2545,7 @@ void KMMainWidget::updateCustomTemplateMenus()
KAction *action;
switch ( t.type() ) {
case CustomTemplates::TReply:
- action = new KAction( (*it).tqreplace( "&", "&&" ),
+ action = new KAction( (*it).replace( "&", "&&" ),
KShortcut( t.shortcut() ),
mCustomReplyMapper,
TQT_SLOT( map() ),
@@ -2557,7 +2557,7 @@ void KMMainWidget::updateCustomTemplateMenus()
++replyc;
break;
case CustomTemplates::TReplyAll:
- action = new KAction( (*it).tqreplace( "&", "&&" ),
+ action = new KAction( (*it).replace( "&", "&&" ),
KShortcut( t.shortcut() ),
mCustomReplyAllMapper,
TQT_SLOT( map() ),
@@ -2569,7 +2569,7 @@ void KMMainWidget::updateCustomTemplateMenus()
++replyallc;
break;
case CustomTemplates::TForward:
- action = new KAction( (*it).tqreplace( "&", "&&" ),
+ action = new KAction( (*it).replace( "&", "&&" ),
KShortcut( t.shortcut() ),
mCustomForwardMapper,
TQT_SLOT( map() ),
@@ -2581,7 +2581,7 @@ void KMMainWidget::updateCustomTemplateMenus()
++forwardc;
break;
case CustomTemplates::TUniversal:
- action = new KAction( (*it).tqreplace( "&", "&&" ),
+ action = new KAction( (*it).replace( "&", "&&" ),
KShortcut::null(),
mCustomReplyMapper,
TQT_SLOT( map() ),
@@ -2591,7 +2591,7 @@ void KMMainWidget::updateCustomTemplateMenus()
mCustomReplyActionMenu->insert( action, idx );
mCustomTemplateActions.append( action );
++replyc;
- action = new KAction( (*it).tqreplace( "&", "&&" ),
+ action = new KAction( (*it).replace( "&", "&&" ),
KShortcut::null(),
mCustomReplyAllMapper,
TQT_SLOT( map() ),
@@ -2601,7 +2601,7 @@ void KMMainWidget::updateCustomTemplateMenus()
mCustomReplyAllActionMenu->insert( action, idx );
mCustomTemplateActions.append( action );
++replyallc;
- action = new KAction( (*it).tqreplace( "&", "&&" ),
+ action = new KAction( (*it).replace( "&", "&&" ),
KShortcut::null(),
mCustomForwardMapper,
TQT_SLOT( map() ),
@@ -2767,10 +2767,10 @@ void KMMainWidget::setupActions()
TQT_SLOT(slotDeleteThread()), actionCollection(), "delete_thread" );
- (void) new KAction( i18n("&Find Messages..."), "mail_tqfind", Key_S, TQT_TQOBJECT(this),
+ (void) new KAction( i18n("&Find Messages..."), "mail_find", Key_S, TQT_TQOBJECT(this),
TQT_SLOT(slotRequestFullSearchFromQuickSearch()), actionCollection(), "search_messages" );
- mFindInMessageAction = new KAction( i18n("&Find in Message..."), "tqfind", KStdAccel::shortcut(KStdAccel::Find), TQT_TQOBJECT(this),
+ mFindInMessageAction = new KAction( i18n("&Find in Message..."), "find", KStdAccel::shortcut(KStdAccel::Find), TQT_TQOBJECT(this),
TQT_SLOT(slotFind()), actionCollection(), "find_in_messages" );
(void) new KAction( i18n("Select &All Messages"), KStdAccel::selectAll(), TQT_TQOBJECT(this),
@@ -3608,7 +3608,7 @@ void KMMainWidget::removeDuplicates()
if ( !id.isEmpty() ) {
TQString subjMD5 = (*mFolder)[i]->strippedSubjectMD5();
int other = -1;
- if ( idMD5s.tqcontains(id) )
+ if ( idMD5s.contains(id) )
other = idMD5s[id].first();
else
idMD5s[id].append( i );
@@ -3713,7 +3713,7 @@ void KMMainWidget::initializeFilterActions()
for ( ;it != kmkernel->filterMgr()->filters().constEnd(); ++it ) {
if (!(*it)->isEmpty() && (*it)->configureShortcut()) {
filterName = TQString("Filter %1").tqarg((*it)->name());
- normalizedName = filterName.tqreplace(" ", "_");
+ normalizedName = filterName.replace(" ", "_");
if (action(normalizedName.utf8()))
continue;
filterCommand = new KMMetaFilterActionCommand(*it, mHeaders, this);
@@ -3803,7 +3803,7 @@ void KMMainWidget::slotShortcutChanged( KMFolder *folder )
TQString actionlabel = TQString( "FolderShortcut %1").tqarg( folder->prettyURL() );
TQString actionname = TQString( "FolderShortcut %1").tqarg( folder->idString() );
- TQString normalizedName = actionname.tqreplace(" ", "_");
+ TQString normalizedName = actionname.replace(" ", "_");
KAction* action =
new KAction(actionlabel, folder->shortcut(), c, TQT_SLOT(start()),
actionCollection(), normalizedName.local8Bit());
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-24 23:57:41 +0000