1 files changed, 15 insertions, 15 deletions

diff --git a/kmail/urlhandlermanager.cpp b/kmail/urlhandlermanager.cpp
index d788add0..e1707b1b 100644
--- a/kmail/urlhandlermanager.cpp
+++ b/kmail/urlhandlermanager.cpp
@@ -20,11 +20,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.
@@ -53,7 +53,7 @@
 #include <algorithm>
 using std::for_each;
 using std::remove;
-using std::find;
+using std::tqfind;
 
 KMail::URLHandlerManager * KMail::URLHandlerManager::self = 0;
 
@@ -116,7 +116,7 @@ namespace {
     bool handleContextMenuRequest( const KURL &, const TQPoint &, KMReaderWin * ) const {
       return false;
     }
-    TQString statusBarMessage( const KURL &, KMReaderWin * ) const { return TQString::null; }
+    TQString statusBarMessage( const KURL &, KMReaderWin * ) const { return TQString(); }
   };
 
   class AttachmentURLHandler : public KMail::URLHandler {
@@ -274,7 +274,7 @@ TQString KMail::URLHandlerManager::BodyPartURLHandlerManager::statusBarMessage(
   TQString path;
   partNode * node = partNodeFromXKMailUrl( url, w, &path );
   if ( !node )
-    return TQString::null;
+    return TQString();
 
   KMail::PartNodeBodyPart part( *node, w->overrideCodec() );
   for ( BodyPartHandlerList::const_iterator it = mHandlers.begin() ; it != mHandlers.end() ; ++it ) {
@@ -282,7 +282,7 @@ TQString KMail::URLHandlerManager::BodyPartURLHandlerManager::statusBarMessage(
     if ( !msg.isEmpty() )
       return msg;
   }
-  return TQString::null;
+  return TQString();
 }
 
 //
@@ -377,7 +377,7 @@ TQString KMail::URLHandlerManager::statusBarMessage( const KURL & url, KMReaderW
     if ( !msg.isEmpty() )
       return msg;
   }
-  return TQString::null;
+  return TQString();
 }
 
 
@@ -495,7 +495,7 @@ namespace {
       if ( url.path() == "showAttachmentQuicklist" )
         return i18n( "Show attachment list" );
     }
-    return TQString::null ;
+    return TQString() ;
   }
 }
 
@@ -532,7 +532,7 @@ namespace {
           }
         }
       }
-      return TQString::null ;
+      return TQString() ;
   }
 
 }
@@ -560,7 +560,7 @@ namespace {
   TQString SMimeURLHandler::statusBarMessage( const KURL & url, KMReaderWin * ) const {
     TQString displayName, libName, keyId;
     if ( !foundSMIMEData( url.path() + '#' + url.ref(), displayName, libName, keyId ) )
-      return TQString::null;
+      return TQString();
     return i18n("Show certificate 0x%1").arg( keyId );
   }
 }
@@ -578,7 +578,7 @@ namespace {
 namespace {
   TQString MailToURLHandler::statusBarMessage( const KURL & url, KMReaderWin * ) const {
     if ( url.protocol() != "mailto" )
-      return TQString::null;
+      return TQString();
     return KMMessage::decodeMailtoUrl( url.url() );
   }
 }
@@ -605,7 +605,7 @@ namespace {
   {
     bool inHeader = false;
     const TQString place = url.queryItem( "place" ).lower();
-    if ( place != TQString::null ) {
+    if ( place != TQString() ) {
       inHeader = ( place == "header" );
     }
     return inHeader;
@@ -682,7 +682,7 @@ namespace {
   {
     partNode * node = partNodeForUrl( url, w );
     if ( !node )
-      return TQString::null;
+      return TQString();
 
     const KMMessagePart & msgPart = node->msgPart();
     TQString name = msgPart.fileName();
@@ -752,7 +752,7 @@ namespace {
 namespace {
   bool FallBackURLHandler::handleClick( const KURL & url, KMReaderWin * w ) const {
     if ( w )
-      w->emitUrlClicked( url, Qt::LeftButton );
+      w->emitUrlClicked( url, TQt::LeftButton );
     return true;
   }