summaryrefslogtreecommitdiffstats
path: root/kmail/mailinglist-magic.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kmail/mailinglist-magic.cpp')
-rw-r--r--kmail/mailinglist-magic.cpp40
1 files changed, 20 insertions, 20 deletions
diff --git a/kmail/mailinglist-magic.cpp b/kmail/mailinglist-magic.cpp
index 3c9efd147..0b646e94a 100644
--- a/kmail/mailinglist-magic.cpp
+++ b/kmail/mailinglist-magic.cpp
@@ -31,10 +31,10 @@ static TQString check_sender(const KMMessage *message,
{
header_name = "Sender";
header_value = header;
- header = header.mid( 6, header.tqfind( '@' ) - 6 );
+ header = header.mid( 6, header.find( '@' ) - 6 );
} else {
- int index = header.tqfind( "-owner@ " );
+ int index = header.find( "-owner@ " );
if ( index == -1 )
return TQString();
@@ -52,12 +52,12 @@ static TQString check_x_beenthere(const KMMessage *message,
TQString &header_value )
{
TQString header = message->headerField( "X-BeenThere" );
- if ( header.isNull() || header.tqfind( '@' ) == -1 )
+ if ( header.isNull() || header.find( '@' ) == -1 )
return TQString();
header_name = "X-BeenThere";
header_value = header;
- header.truncate( header.tqfind( '@' ) );
+ header.truncate( header.find( '@' ) );
return header;
}
@@ -68,13 +68,13 @@ static TQString check_delivered_to(const KMMessage *message,
{
TQString header = message->headerField( "Delivered-To" );
if ( header.isNull() || header.left(13 ) != "mailing list"
- || header.tqfind( '@' ) == -1 )
+ || header.find( '@' ) == -1 )
return TQString();
header_name = "Delivered-To";
header_value = header;
- return header.mid( 13, header.tqfind( '@' ) - 13 );
+ return header.mid( 13, header.find( '@' ) - 13 );
}
/* X-Mailing-List: <?([^@]+) */
@@ -86,15 +86,15 @@ static TQString check_x_mailing_list(const KMMessage *message,
if ( header.isEmpty() )
return TQString();
- if ( header.tqfind( '@' ) < 1 )
+ if ( header.find( '@' ) < 1 )
return TQString();
header_name = "X-Mailing-List";
header_value = header;
if ( header[0] == '<' )
- header = header.mid(1, header.tqfind( '@' ) - 1);
+ header = header.mid(1, header.find( '@' ) - 1);
else
- header.truncate( header.tqfind( '@' ) );
+ header.truncate( header.find( '@' ) );
return header;
}
@@ -108,11 +108,11 @@ static TQString check_list_id(const KMMessage *message,
if ( header.isEmpty() )
return TQString();
- lAnglePos = header.tqfind( '<' );
+ lAnglePos = header.find( '<' );
if ( lAnglePos < 0 )
return TQString();
- firstDotPos = header.tqfind( '.', lAnglePos );
+ firstDotPos = header.find( '.', lAnglePos );
if ( firstDotPos < 0 )
return TQString();
@@ -132,14 +132,14 @@ static TQString check_list_post(const KMMessage *message,
if ( header.isEmpty() )
return TQString();
- int lAnglePos = header.tqfind( "<mailto:" );
+ int lAnglePos = header.find( "<mailto:" );
if ( lAnglePos < 0 )
return TQString();
header_name = "List-Post";
header_value = header;
header = header.mid( lAnglePos + 8, header.length());
- header.truncate( header.tqfind('@') );
+ header.truncate( header.find('@') );
return header;
}
@@ -152,12 +152,12 @@ static TQString check_mailing_list(const KMMessage *message,
if ( header.isEmpty() )
return TQString();
- if (header.left( 5 ) != "list " || header.tqfind( '@' ) < 5 )
+ if (header.left( 5 ) != "list " || header.find( '@' ) < 5 )
return TQString();
header_name = "Mailing-List";
header_value = header;
- header = header.mid(5, header.tqfind( '@' ) - 5);
+ header = header.mid(5, header.find( '@' ) - 5);
return header;
}
@@ -170,12 +170,12 @@ static TQString check_x_loop(const KMMessage *message,
if ( header.isEmpty() )
return TQString();
- if (header.tqfind( '@' ) < 2 )
+ if (header.find( '@' ) < 2 )
return TQString();
header_name = "X-Loop";
header_value = header;
- header.truncate(header.tqfind( '@' ));
+ header.truncate(header.find( '@' ));
return header;
}
@@ -189,7 +189,7 @@ static TQString check_x_ml_name(const KMMessage *message,
header_name = "X-ML-Name";
header_value = header;
- header.truncate(header.tqfind( '@' ));
+ header.truncate(header.find( '@' ));
return header;
}
@@ -218,8 +218,8 @@ headerToAddress( const TQString& header )
if ( header.isEmpty() )
return addr;
- while ( (start = header.tqfind( "<", start )) != -1 ) {
- if ( (end = header.tqfind( ">", ++start ) ) == -1 ) {
+ while ( (start = header.find( "<", start )) != -1 ) {
+ if ( (end = header.find( ">", ++start ) ) == -1 ) {
kdDebug(5006)<<k_funcinfo<<"Serious mailing list header parsing error !"<<endl;
return addr;
}