summaryrefslogtreecommitdiffstats
path: root/kmail/kmcomposewin.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kmail/kmcomposewin.cpp')
-rw-r--r--kmail/kmcomposewin.cpp42
1 files changed, 21 insertions, 21 deletions
diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp
index 328bbe02..45daa0c3 100644
--- a/kmail/kmcomposewin.cpp
+++ b/kmail/kmcomposewin.cpp
@@ -557,7 +557,7 @@ void KMComposeWin::addAttachmentsAndSend(const KURL::List &urls, const TQString
connect(this, TQT_SIGNAL(attachmentAdded(const KURL&, bool)), TQT_SLOT(slotAttachedFile(const KURL&)));
for( KURL::List::ConstIterator itr = urls.begin(); itr != urls.end(); ++itr ) {
if (!addAttach( *itr ))
- mAttachFilesPending.remove(mAttachFilesPending.tqfind(*itr)); // only remove one copy of the url
+ mAttachFilesPending.remove(mAttachFilesPending.find(*itr)); // only remove one copy of the url
}
if (mAttachFilesPending.isEmpty() && mAttachFilesSend == how)
@@ -571,7 +571,7 @@ void KMComposeWin::slotAttachedFile(const KURL &url)
{
if (mAttachFilesPending.isEmpty())
return;
- mAttachFilesPending.remove(mAttachFilesPending.tqfind(url)); // only remove one copy of url
+ mAttachFilesPending.remove(mAttachFilesPending.find(url)); // only remove one copy of url
if (mAttachFilesPending.isEmpty())
{
send(mAttachFilesSend);
@@ -787,7 +787,7 @@ void KMComposeWin::writeConfig(void)
mAutoSpellCheckingAction->isChecked() );
TQStringList transportHistory = GlobalSettings::self()->transportHistory();
transportHistory.remove(mTransport->currentText());
- if (KMTransportInfo::availableTransports().tqfindIndex(mTransport
+ if (KMTransportInfo::availableTransports().findIndex(mTransport
->currentText()) == -1) {
transportHistory.prepend(mTransport->currentText());
}
@@ -1219,8 +1219,8 @@ void KMComposeWin::getTransportMenu()
int id = 0;
for(it = availTransports.begin(); it != availTransports.end() ; ++it, id++)
{
- mActNowMenu->insertItem((*it).tqreplace("&", "&&"), id);
- mActLaterMenu->insertItem((*it).tqreplace("&", "&&"), id);
+ mActNowMenu->insertItem((*it).replace("&", "&&"), id);
+ mActLaterMenu->insertItem((*it).replace("&", "&&"), id);
}
}
@@ -1695,8 +1695,8 @@ static TQString cleanedUpHeaderString( const TQString & s )
{
// remove invalid characters from the header strings
TQString res( s );
- res.tqreplace( '\r', "" );
- res.tqreplace( '\n', " " );
+ res.replace( '\r', "" );
+ res.replace( '\n', " " );
return res.stripWhiteSpace();
}
@@ -2773,7 +2773,7 @@ void KMComposeWin::slotAttachFile()
//-----------------------------------------------------------------------------
void KMComposeWin::slotAttachFileData(KIO::Job *job, const TQByteArray &data)
{
- TQMap<KIO::Job*, atmLoadData>::Iterator it = mMapAtmLoadData.tqfind(job);
+ TQMap<KIO::Job*, atmLoadData>::Iterator it = mMapAtmLoadData.find(job);
assert(it != mMapAtmLoadData.end());
TQBuffer buff((*it).data);
buff.open(IO_WriteOnly | IO_Append);
@@ -2785,10 +2785,10 @@ void KMComposeWin::slotAttachFileData(KIO::Job *job, const TQByteArray &data)
//-----------------------------------------------------------------------------
void KMComposeWin::slotAttachFileResult(KIO::Job *job)
{
- TQMap<KIO::Job*, atmLoadData>::Iterator it = mMapAtmLoadData.tqfind(job);
+ TQMap<KIO::Job*, atmLoadData>::Iterator it = mMapAtmLoadData.find(job);
assert(it != mMapAtmLoadData.end());
KURL attachURL;
- TQMap<KIO::Job*, KURL>::iterator jit = mAttachJobs.tqfind(job);
+ TQMap<KIO::Job*, KURL>::iterator jit = mAttachJobs.find(job);
bool attachURLfound = (jit != mAttachJobs.end());
if (attachURLfound)
{
@@ -2847,7 +2847,7 @@ void KMComposeWin::slotAttachFileResult(KIO::Job *job)
TQString ext;
if( !patterns.isEmpty() ) {
ext = patterns[0];
- int i = ext.tqfindRev( '.' );
+ int i = ext.findRev( '.' );
if( i == -1 )
ext.prepend( '.' );
else if( i > 0 )
@@ -2886,7 +2886,7 @@ void KMComposeWin::slotAttachFileResult(KIO::Job *job)
!kmkernel->msgSender()->sendQuotedPrintable());
kdDebug(5006) << "autodetected cte: " << msgPart->cteStr() << endl;
}
- int slash = mimeType.tqfind( '/' );
+ int slash = mimeType.find( '/' );
if( slash == -1 )
slash = mimeType.length();
msgPart->setTypeStr( mimeType.left( slash ).latin1() );
@@ -2998,7 +2998,7 @@ void KMComposeWin::slotInsertRecentFile(const KURL& u)
KConfigGroupSaver saver( config, "Composer" );
TQStringList urls = config->readListEntry( "recent-urls" );
TQStringList encodings = config->readListEntry( "recent-encodings" );
- int index = urls.tqfindIndex( u.prettyURL() );
+ int index = urls.findIndex( u.prettyURL() );
if (index != -1) {
TQString encoding = encodings[ index ];
ld.encoding = encoding.latin1();
@@ -3725,7 +3725,7 @@ TQString KMComposeWin::addQuotesToText(const TQString &inputText)
{
TQString answer = TQString( inputText );
TQString indentStr = quotePrefixName();
- answer.tqreplace( '\n', '\n' + indentStr);
+ answer.replace( '\n', '\n' + indentStr);
answer.prepend( indentStr );
answer += '\n';
return KMMessage::smartQuote( answer, GlobalSettings::self()->lineWrapWidth() );
@@ -3743,7 +3743,7 @@ TQString KMComposeWin::removeQuotesFromText(const TQString &inputText)
// now remove all remaining leading quotes
quotePrefix = '\n' + quotePrefixName();
rx = quotePrefix;
- s.tqreplace(rx, "\n");
+ s.replace(rx, "\n");
return s;
}
@@ -3918,7 +3918,7 @@ void KMComposeWin::slotUpdWinTitle(const TQString& text)
// newlines tend to become boxes.
if (text.isEmpty())
setCaption("("+i18n("unnamed")+")");
- else setCaption( s.tqreplace( TQChar('\n'), ' ' ) );
+ else setCaption( s.replace( TQChar('\n'), ' ' ) );
}
@@ -4605,15 +4605,15 @@ void KMComposeWin::slotCleanSpace()
// Squeeze tabs and spaces
TQRegExp squeeze( "[\t ]+" );
- s.tqreplace( squeeze, TQChar( ' ' ) );
+ s.replace( squeeze, TQChar( ' ' ) );
// Remove trailing whitespace
TQRegExp trailing( "\\s+$" );
- s.tqreplace( trailing, TQChar( '\n' ) );
+ s.replace( trailing, TQChar( '\n' ) );
// Single space lines
TQRegExp singleSpace( "[\n]{2,}" );
- s.tqreplace( singleSpace, TQChar( '\n' ) );
+ s.replace( singleSpace, TQChar( '\n' ) );
// Restore the signature
if ( restore )
@@ -4931,11 +4931,11 @@ void KMComposeWin::slotIdentityChanged( uint uoid )
}
mEditor->setText( edtText );
} else {
- const int pos = edtText.tqfind( mOldSigText );
+ const int pos = edtText.find( mOldSigText );
if ( pos >= 0 && !mOldSigText.isEmpty() ) {
const int oldLength = mOldSigText.length();
mOldSigText = "\n\n"+ ident.signature().rawText() + "\n"; // see insertSignature()
- edtText = edtText.tqreplace( pos, oldLength, mOldSigText );
+ edtText = edtText.replace( pos, oldLength, mOldSigText );
mEditor->setText( edtText );
} else {
insertSignature( Append );
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 23:30:40 +0000