summaryrefslogtreecommitdiffstats
path: root/kmail/searchjob.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kmail/searchjob.cpp')
-rw-r--r--kmail/searchjob.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/kmail/searchjob.cpp b/kmail/searchjob.cpp
index 50bf287d..cabae0fd 100644
--- a/kmail/searchjob.cpp
+++ b/kmail/searchjob.cpp
@@ -16,11 +16,11 @@
*
* In addition, as a special exception, the copyright holders give
* permission to link the code of this program with any edition of
- * the Qt library by Trolltech AS, Norway (or with modified versions
- * of Qt that use the same license as Qt), and distribute linked
+ * the TQt library by Trolltech AS, Norway (or with modified versions
+ * of TQt that use the same license as TQt), and distribute linked
* combinations including the two. You must obey the GNU General
* Public License in all respects for all of the code used other than
- * Qt. If you modify this file, you may extend this exception to
+ * TQt. If you modify this file, you may extend this exception to
* your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from
* your version.
@@ -80,7 +80,7 @@ void SearchJob::searchCompleteFolder()
TQString searchString = searchStringFromPattern( mSearchPattern );
if ( searchString.isEmpty() ) // skip imap search and download the messages
- return slotSearchData( 0, TQString::null );
+ return slotSearchData( 0, TQString() );
// do the IMAP search
KURL url = mAccount->getUrl();
@@ -305,7 +305,7 @@ void SearchJob::slotSearchMessageArrived( KMMessage* msg )
// imap and local search have to match
if ( mLocalSearchPattern->matches( msg ) &&
( mImapSearchHits.isEmpty() ||
- mImapSearchHits.find( TQString::number(msg->UID() ) ) != mImapSearchHits.end() ) ) {
+ mImapSearchHits.tqfind( TQString::number(msg->UID() ) ) != mImapSearchHits.end() ) ) {
TQ_UINT32 serNum = msg->getMsgSerNum();
mSearchSerNums.append( serNum );
matches = true;
@@ -313,7 +313,7 @@ void SearchJob::slotSearchMessageArrived( KMMessage* msg )
} else if ( mLocalSearchPattern->op() == KMSearchPattern::OpOr ) {
// imap or local search have to match
if ( mLocalSearchPattern->matches( msg ) ||
- mImapSearchHits.find( TQString::number(msg->UID()) ) != mImapSearchHits.end() ) {
+ mImapSearchHits.tqfind( TQString::number(msg->UID()) ) != mImapSearchHits.end() ) {
TQ_UINT32 serNum = msg->getMsgSerNum();
mSearchSerNums.append( serNum );
matches = true;
@@ -368,7 +368,7 @@ void SearchJob::searchSingleMessage()
if ( searchString.isEmpty() )
{
// no imap search
- slotSearchDataSingleMessage( 0, TQString::null );
+ slotSearchDataSingleMessage( 0, TQString() );
} else
{
// imap search