From 17e2ed52dbf8fac39a04331da02b9572e9e2e304 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 1 Mar 2012 13:35:40 -0600 Subject: Rename additional global TQt functions --- kmail/bodypartformatterfactory_p.h | 2 +- kmail/kmkernel.cpp | 2 +- kmail/kmmessage.cpp | 4 ++-- kmail/kmsearchpattern.cpp | 2 +- kmail/kmsender.cpp | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) (limited to 'kmail') diff --git a/kmail/bodypartformatterfactory_p.h b/kmail/bodypartformatterfactory_p.h index f18bc22a..088a17f2 100644 --- a/kmail/bodypartformatterfactory_p.h +++ b/kmail/bodypartformatterfactory_p.h @@ -47,7 +47,7 @@ namespace KMail { namespace BodyPartFormatterFactoryPrivate { struct ltstr { bool operator()( const char * s1, const char * s2 ) const { - return qstricmp( s1, s2 ) < 0; + return tqstricmp( s1, s2 ) < 0; } }; diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp index ef6ee4f7..2e204ab5 100644 --- a/kmail/kmkernel.cpp +++ b/kmail/kmkernel.cpp @@ -960,7 +960,7 @@ int KMKernel::dcopAddMessage( const TQString & foldername,const KURL & msgUrl, msg = 0; } } else { - //qDebug( "duplicate: " + msgId + "; subj: " + msg->subject() + ", from: " + msgId = msg->fromStrip()); + //tqDebug( "duplicate: " + msgId + "; subj: " + msg->subject() + ", from: " + msgId = msg->fromStrip()); retval = -4; } } else { diff --git a/kmail/kmmessage.cpp b/kmail/kmmessage.cpp index 469858a4..9ad91070 100644 --- a/kmail/kmmessage.cpp +++ b/kmail/kmmessage.cpp @@ -3050,9 +3050,9 @@ void applyHeadersToMessagePart( DwHeaders& headers, KMMessagePart* aPart ) DwParameter *param = ct.FirstParameter(); while(param) { - if (!qstricmp(param->Attribute().c_str(), "charset")) + if (!tqstricmp(param->Attribute().c_str(), "charset")) aPart->setCharset(TQCString(param->Value().c_str()).lower()); - else if (!qstrnicmp(param->Attribute().c_str(), "name*", 5)) + else if (!tqstrnicmp(param->Attribute().c_str(), "name*", 5)) aPart->setName(KMMsgBase::decodeRFC2231String(KMMsgBase::extractRFC2231HeaderField( param->Value().c_str(), "name" ))); else { additionalCTypeParams += ';'; diff --git a/kmail/kmsearchpattern.cpp b/kmail/kmsearchpattern.cpp index 1d6fd95d..630c6f13 100644 --- a/kmail/kmsearchpattern.cpp +++ b/kmail/kmsearchpattern.cpp @@ -148,7 +148,7 @@ KMSearchRule::Function KMSearchRule::configValueToFunc( const char * str ) { return FuncNone; for ( int i = 0 ; i < numFuncConfigNames ; ++i ) - if ( qstricmp( funcConfigNames[i], str ) == 0 ) return (Function)i; + if ( tqstricmp( funcConfigNames[i], str ) == 0 ) return (Function)i; return FuncNone; } diff --git a/kmail/kmsender.cpp b/kmail/kmsender.cpp index eec0d6e0..500cb7e7 100644 --- a/kmail/kmsender.cpp +++ b/kmail/kmsender.cpp @@ -266,8 +266,8 @@ static bool messageIsDispositionNotificationReport( KMMessage *msg ) DwMediaType& ct = msg->dwContentType(); DwParameter *param = ct.FirstParameter(); while( param ) { - if ( !qstricmp( param->Attribute().c_str(), "report-type") - && !qstricmp( param->Value().c_str(), "disposition-notification" ) ) + if ( !tqstricmp( param->Attribute().c_str(), "report-type") + && !tqstricmp( param->Value().c_str(), "disposition-notification" ) ) return true; else param = param->Next(); -- cgit v1.2.3